From 88cc3e7e0765b5dd11b06db442ad46536342bba5 Mon Sep 17 00:00:00 2001
From: Raghuram Subramani <raghus2247@gmail.com>
Date: Thu, 1 Feb 2024 18:40:39 +0530
Subject: Updates (#1)

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* update

* .

* temp

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* .

* temp

* .

* .

* .

* update
---
 machines/x/configuration.nix          | 38 ++++++++++++++++++++++++++++++
 machines/x/hardware-configuration.nix | 27 +++++++++++++++++++++
 machines/x/home.nix                   | 44 +++++++++++++++++++++++++++++++++++
 machines/z/configuration.nix          | 26 ---------------------
 machines/z/hardware-configuration.nix | 27 ---------------------
 machines/z/home.nix                   | 20 ----------------
 6 files changed, 109 insertions(+), 73 deletions(-)
 create mode 100644 machines/x/configuration.nix
 create mode 100644 machines/x/hardware-configuration.nix
 create mode 100644 machines/x/home.nix
 delete mode 100644 machines/z/configuration.nix
 delete mode 100644 machines/z/hardware-configuration.nix
 delete mode 100644 machines/z/home.nix

(limited to 'machines')

diff --git a/machines/x/configuration.nix b/machines/x/configuration.nix
new file mode 100644
index 0000000..de93a4f
--- /dev/null
+++ b/machines/x/configuration.nix
@@ -0,0 +1,38 @@
+{ lib, inputs, pkgs, ... }:
+
+{
+  imports = [
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.default
+  ] ++ (map (path: ../../modules/${path}) [
+    "global.nix"
+    "compromyse.nix"
+    "desktop.nix"
+    "login.nix"
+    "fonts.nix"
+    "bluetooth.nix"
+    "audio.nix"
+    # "virtualization.nix"
+    # "nvidia.nix"
+  ]);
+
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  boot.loader.efi.efiSysMountPoint = "/boot/efi";
+
+  boot.extraModprobeConfig = "options kvm_intel nested=1";
+
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfreePredicate = _: true;
+
+  hardware.opengl.enable = true;
+
+  fileSystems."/data" = {
+    device = "/dev/sda";
+    fsType = "ext4";
+  };
+
+  networking.hostName = "x";
+
+  home-manager.users.compromyse = import ./home.nix;
+}
diff --git a/machines/x/hardware-configuration.nix b/machines/x/hardware-configuration.nix
new file mode 100644
index 0000000..aeb8272
--- /dev/null
+++ b/machines/x/hardware-configuration.nix
@@ -0,0 +1,27 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
+
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-intel" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" = {
+    device = "/dev/disk/by-uuid/347f3061-af46-40c7-aae3-fd4546cebb24";
+    fsType = "ext4";
+  };
+
+  fileSystems."/boot" = {
+    device = "/dev/disk/by-uuid/03DC-FCFF";
+    fsType = "vfat";
+  };
+
+  swapDevices = [ ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/machines/x/home.nix b/machines/x/home.nix
new file mode 100644
index 0000000..292495c
--- /dev/null
+++ b/machines/x/home.nix
@@ -0,0 +1,44 @@
+{ pkgs, ... }:
+
+{
+  nixpkgs.config.allowUnfree = true;
+
+  home = {
+    username = "compromyse";
+    homeDirectory = "/home/compromyse";
+  };
+
+  home.packages = with pkgs; [
+    wget
+
+    tmux
+    fzf
+    fd
+    ripgrep
+
+    cinnamon.nemo
+    mate.eom
+
+    # spotify
+    # firefox
+
+    # obs-studio
+
+    pavucontrol
+    blueman
+    brillo
+  ];
+
+  imports = (map (path: ../../config/${path}) [
+    "themes.nix"
+    "dotfiles.nix"
+    "git"
+    "nvim"
+    "alacritty"
+    "dwl.nix"
+    "bash.nix"
+    "fuzzel"
+  ]);
+
+  home.stateVersion = "23.11";
+}
diff --git a/machines/z/configuration.nix b/machines/z/configuration.nix
deleted file mode 100644
index 5af5c58..0000000
--- a/machines/z/configuration.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ lib, inputs, ... }:
-
-{
-  imports = [
-    ./hardware-configuration.nix
-    inputs.home-manager.nixosModules.default
-  ] ++ (map (path: ../../modules/${path}) [
-    "global.nix"
-    "compromyse.nix"
-  ]);
-
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
-
-  boot.extraModprobeConfig = "options kvm_intel nested=1";
-
-  fileSystems."/data" = {
-    device = "/dev/sda";
-    fsType = "ext4";
-  };
-
-  networking.hostName = "z";
-
-  home-manager.users.compromyse = import ./home.nix;
-}
diff --git a/machines/z/hardware-configuration.nix b/machines/z/hardware-configuration.nix
deleted file mode 100644
index aeb8272..0000000
--- a/machines/z/hardware-configuration.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ config, lib, pkgs, modulesPath, ... }:
-
-{
-  imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
-
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "sd_mod" ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-intel" ];
-  boot.extraModulePackages = [ ];
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/347f3061-af46-40c7-aae3-fd4546cebb24";
-    fsType = "ext4";
-  };
-
-  fileSystems."/boot" = {
-    device = "/dev/disk/by-uuid/03DC-FCFF";
-    fsType = "vfat";
-  };
-
-  swapDevices = [ ];
-
-  networking.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-}
diff --git a/machines/z/home.nix b/machines/z/home.nix
deleted file mode 100644
index 564d4d5..0000000
--- a/machines/z/home.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ pkgs, ... }:
-
-{
-
-  home = {
-    username = "compromyse";
-    homeDirectory = "/home/compromyse";
-  };
-
-  imports = [
-    ../../config/themes.nix
-    ../../config/alacritty
-  ];
-
-  home.packages = with pkgs; [
-    wget
-  ];
-
-  home.stateVersion = "23.11";
-}
-- 
cgit v1.2.3