module moving mostly done

systems/gerg-desktop/default.nix

@@ -1,170 +1,84 @@
 inputs: {
   pkgs,
   settings,
-  config,
   ...
 }: {
   imports = [
-    #	(import ../imports/boot.nix inputs)
-    #(import ../../imports/dwm.nix inputs)
+    (import ./refreshrate.nix inputs)
+    (import ./vfio.nix inputs)
+    (import ./parrot.nix inputs)
+    (import ./spicetify.nix inputs)
+    #(import ./mining.nix inputs)
+    (import ./zfs inputs)
+
     (import ../../imports/fonts.nix inputs)
     (import ../../imports/git.nix inputs)
-    (import ../../imports/packages.nix inputs)
-    (import ../../imports/parrot.nix inputs)
-    (import ../../imports/picom.nix inputs)
-    (import ../../imports/refreshrate.nix inputs)
     (import ../../imports/shells.nix inputs)
     (import ../../imports/theme.nix inputs)
-    (import ../../imports/vfio.nix inputs)
-    #   (import ../../imports/mining.nix inputs)
-    (import ../../imports/spicetify.nix inputs)
   ];
   system.stateVersion = "23.05";
 
   localModules = {
-    sxhkd.enable = true;
-    dwm.enable = true;
-    lightdm.enable = true;
-    autoLogin.enable = true;
+    X11Programs = {
+      sxhkd.enable = true;
+      picom.enable = true;
+    };
+    DE.dwm.enable = true;
+    DM = {
+      lightdm.enable = true;
+      autoLogin = true;
+    };
   };
+  services.xserver.videoDrivers = ["amdgpu"];
 
-  services.gvfs.enable = true; #gvfs for pcmanfm
-
-  environment.systemPackages = with pkgs; [
-    webcord # talk to people (gross)
-    bitwarden #store stuff
-    qbittorrent #steal stuff
-    networkmanagerapplet #gui connection control
-    vlc #play stuff
+  environment.systemPackages = [
+    pkgs.webcord # talk to people (gross)
+    pkgs.bitwarden #store stuff
+    pkgs.qbittorrent #steal stuff
+    pkgs.networkmanagerapplet #gui connection control
+    pkgs.pavucontrol #gui volume control
+    pkgs.pcmanfm #file manager
+    pkgs.librewolf #best browser
+    #pointless stuff
+    pkgs.cava #pretty audio
+    pkgs.pipes-rs # more fun things
+    pkgs.vlc #play stuff
   ];
   networking = {
     hostName = settings.hostname;
     hostId = "288b56db";
-  };
-  hardware.cpu.amd.updateMicrocode = true;
-  #user managment
-  users = {
-    users."${settings.username}" = {
-      uid = 1000;
-      isNormalUser = true;
-      extraGroups = ["wheel" "audio" "networkmanager"];
-    };
-  };
-  boot = {
-    zfs.devNodes = "/dev/disk/by-id/";
-    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-    kernelParams = ["nohibernate" "zfs.zfs_arc_max=17179869184"];
-    supportedFilesystems = ["zfs" "vfat"];
-    initrd = {
-      kernelModules = ["amdgpu" "dm_mod"];
-      availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod" "hid_generic"];
-      includeDefaultModules = false;
-    };
-    loader = {
-      efi = {
-        canTouchEfiVariables = false;
+    useDHCP = false;
+    dhcpcd.enable = false;
+    networkmanager.enable = false;
+    nameservers = ["1.1.1.1" "1.0.0.1"];
+    defaultGateway = "192.168.1.1";
+    interfaces = {
+      "enp11s0" = {
+        name = "eth0";
       };
-      generationsDir.copyKernels = true;
-      systemd-boot.enable = false;
-      grub = {
-        enable = true;
-        efiInstallAsRemovable = true;
-        version = 2;
-        copyKernels = true;
-        efiSupport = true;
-        zfsSupport = true;
-        mirroredBoots = [
+      "bridge0" = {
+        name = "bridge0";
+        ipv4.addresses = [
           {
-            path = "/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N0E";
-            devices = ["/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E"];
-          }
-          {
-            path = "/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N22";
-            devices = ["/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22"];
+            address = "192.168.1.4";
+            prefixLength = 24;
           }
         ];
       };
     };
+    bridges."bridge0".interfaces = ["eth0"];
   };
-  systemd.services.zfs-mount.enable = false;
-  services.zfs = {
-    autoScrub.enable = true;
-    trim.enable = true;
+  #user managment
+  users.users."${settings.username}" = {
+    uid = 1000;
+    isNormalUser = true;
+    extraGroups = ["wheel" "audio"];
   };
-  fileSystems."/" = {
-    device = "rpool/nixos/root";
-    fsType = "zfs";
-    options = ["X-mount.mkdir"];
+  boot = {
+    initrd = {
+      kernelModules = ["amdgpu"];
+      availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"];
+      includeDefaultModules = false;
+    };
   };
-
-  fileSystems."/home" = {
-    device = "rpool/nixos/home";
-    fsType = "zfs";
-    options = ["X-mount.mkdir"];
-  };
-
-  fileSystems."/var" = {
-    device = "rpool/nixos/var";
-    fsType = "zfs";
-    options = ["X-mount.mkdir"];
-  };
-
-  fileSystems."/var/lib" = {
-    device = "rpool/nixos/var/lib";
-    fsType = "zfs";
-    options = ["X-mount.mkdir"];
-  };
-
-  fileSystems."/var/log" = {
-    device = "rpool/nixos/var/log";
-    fsType = "zfs";
-    options = ["X-mount.mkdir"];
-  };
-
-  fileSystems."/boot" = {
-    device = "bpool/nixos/root";
-    fsType = "zfs";
-    options = ["X-mount.mkdir"];
-  };
-
-  fileSystems."/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N0E" = {
-    device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E-part2";
-    fsType = "vfat";
-    options = [
-      "X-mount.mkdir"
-      "x-systemd.idle-timout=1min"
-      "x-systemd.automount"
-      "noauto"
-      "nofail"
-    ];
-  };
-  fileSystems."/boot/efis/nvme-SHPP41-500GM_SSB4N6719101A4N22" = {
-    device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22-part2";
-    fsType = "vfat";
-    options = [
-      "X-mount.mkdir"
-      "x-systemd.idle-timout=1min"
-      "x-systemd.automount"
-      "noauto"
-      "nofail"
-    ];
-  };
-  swapDevices = [
-    {
-      device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N0E-part4";
-      discardPolicy = "both";
-      randomEncryption = {
-        enable = true;
-        allowDiscards = true;
-      };
-    }
-    {
-      device = "/dev/disk/by-id/nvme-SHPP41-500GM_SSB4N6719101A4N22-part4";
-      discardPolicy = "both";
-      randomEncryption = {
-        enable = true;
-        allowDiscards = true;
-      };
-    }
-  ];
 }