Refactor Systems

systems/x86_64-linux/oni/default.nix

@@ -6,6 +6,18 @@ with lib;
   imports = [ ./hardware.nix ];
 
   networking.networkmanager.enable = true;
+  networking.hostName = "oni";
+  time.timeZone = "Europe/Berlin";
+  hardware.opengl.enable = true;
+
+  programs = {
+    dconf.enable = true;
+    droidcam.enable = true;
+    sysdig.enable = true;
+    xwayland.enable = true;
+  };
+
+  # System
 
   custom.system.boot.uefi.enable = true;
   custom.system.xdg.enable = true;
@@ -18,19 +30,11 @@ with lib;
   custom.hardware.printing.enable = true;
   custom.desktop.plasma.enable = true;
 
+  custom.system.ssh.enable = true;
+  custom.hardware.bluetooth.enable = true;
+  custom.programs.steam.enable = true;
+
+  # Users
   custom.user.jopejoe1.enable =true;
   custom.user.root.enable =true;
-
-  networking.hostName = "oni";
-
-  time.timeZone = "Europe/Berlin";
-  hardware.opengl.enable = true;
-
-  programs = {
-    dconf.enable = true;
-    droidcam.enable = true;
-    sysdig.enable = true;
-    xwayland.enable = true;
-  };
-
 }

systems/x86_64-linux/oni/hardware.nix

@@ -7,22 +7,11 @@ in
   imports = with nixos-hardware.nixosModules; [
     (modulesPath + "/installer/scan/not-detected.nix")
     common-cpu-amd
-    #common-gpu-nvidia
+    common-gpu-amd
     common-pc
     #common-pc-ssd
   ];
 
-  hardware.nvidia.prime = {
-    offload.enable = false;
-    sync.enable = false;
-
-    # Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
-    intelBusId = "PCI:0:2:0";
-
-    # Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
-    nvidiaBusId = "PCI:1:0:0";
-  };
-
   boot = {
     kernelPackages = pkgs.linuxPackages_zen;
 
@@ -60,6 +49,4 @@ in
 
   # high-resolution display
   hardware.video.hidpi.enable = lib.mkDefault true;
-
-  hardware.bluetooth.enable = true;
 }