moved an env config to configs

enabled users for nix
generated new hardware config to hopefully prevent emergency mode

6 files changed, 14 insertions, 10 deletions

diff --git a/machines/khad/configuration.nix b/machines/khad/configuration.nix
index 6f7e415..abc703b 100644
--- a/machines/khad/configuration.nix
+++ b/machines/khad/configuration.nix
@@ -32,6 +32,8 @@
     config.allowUnfree = true;
   };
 
+  environment.shellInit = ''export  NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/khad/configuration.nix"'';
+
   # Set your time zone.
   time.timeZone = "US/Mountain";
 
@@ -48,12 +50,12 @@
   # };
 
   # Enable the X11 windowing system.
-  # services.xserver.enable = true;
+  services.xserver.enable = true;
 
 
   # Enable the Plasma 5 Desktop Environment.
-  # services.xserver.displayManager.sddm.enable = true;
-  # services.xserver.desktopManager.plasma5.enable = true;
+  services.xserver.displayManager.sddm.enable = true;
+  services.xserver.desktopManager.plasma5.enable = true;
   
 
   # Configure keymap in X11
diff --git a/machines/khad/hardware-configuration.nix b/machines/khad/hardware-configuration.nix
index d1e49e9..dc32bab 100644
--- a/machines/khad/hardware-configuration.nix
+++ b/machines/khad/hardware-configuration.nix
@@ -8,7 +8,7 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "ehci_pci" "ahci" "usbhid" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
@@ -19,7 +19,7 @@
     };
 
   fileSystems."/boot" =
-    { device = "/dev/disk/by-uuid/0873-40C7";
+    { device = "/dev/disk/by-uuid/B741-9318";
       fsType = "vfat";
     };
 
@@ -28,13 +28,13 @@
       fsType = "ext4";
     };
 
-  fileSystems."/home/devinf/Drives" =
+  fileSystems."/home/defin/Drives" =
     { device = "/dev/disk/by-uuid/ba4e233d-d31a-4e5a-9054-0241bd58ba8e";
       fsType = "ext4";
     };
 
   swapDevices =
-    [ { device = "/dev/disk/by-uuid/74384a53-3895-4c6b-ba89-ff7ff82323a4"; }
+    [ { device = "/dev/disk/by-uuid/e75daaf1-d6c6-43c3-8a61-ff26b4304f71"; }
     ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
diff --git a/machines/zenbook/configuration.nix b/machines/zenbook/configuration.nix
index cf55eed..77e7fe6 100644
--- a/machines/zenbook/configuration.nix
+++ b/machines/zenbook/configuration.nix
@@ -17,6 +17,8 @@
     config.allowUnfree = true;
   };
 
+  environment.shellInit = ''export  NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"'';
+
   networking = {
     firewall = {
       # Open ports in the firewall.
diff --git a/modules/environment.nix b/modules/environment.nix
index 07bef00..6842a8c 100644
--- a/modules/environment.nix
+++ b/modules/environment.nix
@@ -1,7 +1,7 @@
 { config, lib, ... }: {
   environment = {
     # include user channels in NIX_PATH
-    shellInit = ''export  NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"'';
+    # shellInit = ''export  NIXPATH="/nix/var/nix/profiles/per-user/$USER/channels:nixos-config=/etc/nixos/machines/zenbook/configuration.nix"'';
     # List packages installed in system profile. To search, run:
     # $ nix search wget
     variables = {
diff --git a/modules/user-profiles/defin.nix b/modules/user-profiles/defin.nix
index 86152f6..36b3cbc 100644
--- a/modules/user-profiles/defin.nix
+++ b/modules/user-profiles/defin.nix
@@ -21,5 +21,5 @@
   };
 
 	# Allow to run nix
-	nix.settings.allowed-users = [ "defin" "root" ];
+	nix.settings.allowed-users = [ "defin" ];
 }
\ No newline at end of file
diff --git a/modules/user-profiles/root.nix b/modules/user-profiles/root.nix
index ea299c0..89f905c 100644
--- a/modules/user-profiles/root.nix
+++ b/modules/user-profiles/root.nix
@@ -16,5 +16,5 @@
   };
 
   # Allow to run nix
-  # nix.settings.allowed-users = [ "root" ];
+  nix.settings.allowed-users = [ "root" ];
 }