diff --git a/flake.lock b/flake.lock
index 75773cd..f5ce004 100755
--- a/flake.lock
+++ b/flake.lock
@@ -133,11 +133,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1701370547,
-        "narHash": "sha256-pCtPIcRnMMJOwAlNh5qTO00uw/PBThIIzjMCRcCyHYw=",
+        "lastModified": 1703023593,
+        "narHash": "sha256-M+Cw6vh7xCDmIhyVuEPNmaNVUwpmdFQq8zlsXZTKees=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "ec9421f82d922b7293ffd45a47f7abdee80038c6",
+        "rev": "bad853333d9021e7012adb9b8fbfe7a7003f26bc",
         "type": "github"
       },
       "original": {
@@ -203,11 +203,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701728041,
-        "narHash": "sha256-x0pyrI1vC8evVDxCxyO6olOyr4wlFg9+VS3C3p4xFYQ=",
+        "lastModified": 1703178811,
+        "narHash": "sha256-Orbqa8DvszYZ38XGWAs43hVs++czt2N6/Y0sFRLhJms=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ac7216918cd65f3824ba7817dea8f22e61221eaf",
+        "rev": "fb5ac0c870a1b3ffea70e02ab1720d991ce812ae",
         "type": "github"
       },
       "original": {
@@ -243,11 +243,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1701611132,
-        "narHash": "sha256-roFYOQhIrZ0DUlWbughOwHzx/PoEMrK0inJbFeuOySg=",
+        "lastModified": 1703207739,
+        "narHash": "sha256-KG8hgOj5OGm0kkS3PWEHCidv1IqgsT7+Cb48/IJhrrc=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "6a885e460cf8596aa23d6f043aa10219494f1da8",
+        "rev": "d8be07e1b418b71ff902fd05e2f7ad4e6cc4a10e",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1701336116,
-        "narHash": "sha256-kEmpezCR/FpITc6yMbAh4WrOCiT2zg5pSjnKrq51h5Y=",
+        "lastModified": 1702539185,
+        "narHash": "sha256-KnIRG5NMdLIpEkZTnN5zovNYc0hhXjAgv6pfd5Z4c7U=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "f5c27c6136db4d76c30e533c20517df6864c46ee",
+        "rev": "aa9d4729cbc99dabacb50e3994dcefb3ea0f7447",
         "type": "github"
       },
       "original": {
@@ -307,11 +307,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1701436327,
-        "narHash": "sha256-tRHbnoNI8SIM5O5xuxOmtSLnswEByzmnQcGGyNRjxsE=",
+        "lastModified": 1703013332,
+        "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "91050ea1e57e50388fa87a3302ba12d188ef723a",
+        "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6",
         "type": "github"
       },
       "original": {
@@ -345,11 +345,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1701724946,
-        "narHash": "sha256-U5Q21HDFz3Ba31bqYhB/mfiJKOSD0s2Dc4aeNG6CcXo=",
+        "lastModified": 1703189725,
+        "narHash": "sha256-jyuUb2W8/BAocmSVRxzwZjAG0IBicpKdMxIzQVzfPAM=",
         "owner": "wamserma",
         "repo": "flake-programs-sqlite",
-        "rev": "7d5f27049db2261da0b2da5a2fcc168ef9511ed2",
+        "rev": "20bdf3d48e601915ae594bd4038c2e21d5c4c39f",
         "type": "github"
       },
       "original": {
@@ -384,11 +384,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1701532764,
-        "narHash": "sha256-Jrizp/nITbul2HBIraQRDw5lyJnzTsj0K9wZUFYX2gg=",
+        "lastModified": 1703004037,
+        "narHash": "sha256-ceYPl/ML0kQBCUaOw0gG2TxHHEl4k9xivFpsdlKidIQ=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "17a452c5d58bb90057d49c7e3e613b5e6dc1c0f4",
+        "rev": "d14ac4912a9ab02f8b49b761e9e4b9ae836171af",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 729665e..cfd014e 100755
--- a/flake.nix
+++ b/flake.nix
@@ -25,32 +25,38 @@
     home-manager,
     ...
   } @ inputs: let
-    system = hostname:
+    system = hostname: isDesktop: let
+      opt = nixpkgs.lib.optionals;
+      dirFiles = dir: map (file: "${dir}/${file}") (builtins.attrNames (builtins.readDir dir));
+      hostHasFile = file: (builtins.pathExists "${self}/${hostname}/${file}");
+    in
       nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs self;
         };
+
         modules =
           [
-            ./common.nix
             "${self}/${hostname}/configuration.nix"
             "${self}/${hostname}/hardware-configuration.nix"
             inputs.nix-gaming.nixosModules.pipewireLowLatency
           ]
-          ++ nixpkgs.lib.optionals (builtins.pathExists "${self}/${hostname}/home-manager.nix") [
-            "${self}/${hostname}/home-manager.nix"
+          ++ dirFiles ./modules/common
+          ++ opt isDesktop dirFiles ./modules/common-desktop
+          ++ opt (hostHasFile "home-manager.nix") [
             home-manager.nixosModules.home-manager
+            "${self}/${hostname}/home-manager.nix"
           ]
-          ++ nixpkgs.lib.optionals (builtins.pathExists "${self}/${hostname}/stylix.nix") [
+          ++ opt (hostHasFile "stylix.nix") [
             stylix.nixosModules.stylix
             "${self}/${hostname}/stylix.nix"
           ];
       };
   in {
     nixosConfigurations = {
-      "quadraticpc" = system "quadraticpc";
-      "quadtop" = system "quadtop";
+      "quadraticpc" = system "quadraticpc" true;
+      "quadtop" = system "quadtop" true;
     };
 
     formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.alejandra;
diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix
index eeaa346..37469ad 100755
--- a/home-manager/vscode.nix
+++ b/home-manager/vscode.nix
@@ -66,8 +66,6 @@
       "[astro]" = {
         "editor.defaultFormatter" = "astro-build.astro-vscode";
       };
-      "prettier.trailingComma" = "none";
-      "prettier.useTabs" = true;
       "editor.minimap.enabled" = false;
       "diffEditor.ignoreTrimWhitespace" = false;
       "editor.unicodeHighlight.nonBasicASCII" = false;
@@ -84,9 +82,8 @@
       };
       "nix.enableLanguageServer" = true;
       "nix.serverPath" = lib.meta.getExe pkgs.nil;
-      "nix.serverSettings"."nil" = {
-        formatting.command = [(lib.meta.getExe pkgs.alejandra)];
-      };
+      "nix.formatterPath" = lib.meta.getExe pkgs.alejandra;
+      "indentRainbow.ignoreErrorLanguages" = ["*"];
     };
   };
 }
diff --git a/modules/common-desktop/desktop.nix b/modules/common-desktop/desktop.nix
new file mode 100644
index 0000000..ba29659
--- /dev/null
+++ b/modules/common-desktop/desktop.nix
@@ -0,0 +1,10 @@
+{
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+    layout = "us";
+  };
+}
diff --git a/modules/common-desktop/gamemode.nix b/modules/common-desktop/gamemode.nix
new file mode 100644
index 0000000..fa68294
--- /dev/null
+++ b/modules/common-desktop/gamemode.nix
@@ -0,0 +1,4 @@
+{
+  programs.gamemode.enable = true;
+  environment.sessionVariables.GAMEMODERUNEXEC = "nvidia-offload";
+}
diff --git a/modules/common-desktop/gnome.nix b/modules/common-desktop/gnome.nix
new file mode 100644
index 0000000..81864e3
--- /dev/null
+++ b/modules/common-desktop/gnome.nix
@@ -0,0 +1,13 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs.gnomeExtensions; [
+    caffeine
+    pop-shell
+    appindicator
+    search-light
+    blur-my-shell
+    just-perfection
+    burn-my-windows
+    fullscreen-avoider
+    compiz-windows-effect
+  ];
+}
diff --git a/modules/common-desktop/noisetorch.nix b/modules/common-desktop/noisetorch.nix
new file mode 100644
index 0000000..0c80a1d
--- /dev/null
+++ b/modules/common-desktop/noisetorch.nix
@@ -0,0 +1 @@
+{programs.noisetorch.enable = true;}
diff --git a/modules/common-desktop/opengl.nix b/modules/common-desktop/opengl.nix
new file mode 100644
index 0000000..a382b18
--- /dev/null
+++ b/modules/common-desktop/opengl.nix
@@ -0,0 +1,7 @@
+{
+  hardware.opengl = {
+    enable = true;
+    driSupport = true;
+    driSupport32Bit = true;
+  };
+}
diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix
new file mode 100644
index 0000000..5cce76b
--- /dev/null
+++ b/modules/common-desktop/packages.nix
@@ -0,0 +1,27 @@
+{pkgs, inputs, ...}: {
+  environment.systemPackages = with pkgs; [
+    fd
+    tldr
+    tuba
+    gimp
+    heroic
+    aspell
+    killall
+    ripgrep
+    hyfetch
+    inkscape
+    r2modman
+    pciutils
+    monophony
+    alejandra
+    grapejuice
+    impression
+    libreoffice
+    virt-manager
+    wl-clipboard
+    protontricks
+    android-studio
+    hunspellDicts.en_CA-large
+    inputs.nix-gaming.packages.${system}.wine-ge
+  ];
+}
diff --git a/modules/common-desktop/pipewire.nix b/modules/common-desktop/pipewire.nix
new file mode 100644
index 0000000..ef7f733
--- /dev/null
+++ b/modules/common-desktop/pipewire.nix
@@ -0,0 +1,12 @@
+{
+  services.pipewire = {
+    enable = true;
+    alsa = {
+      enable = true;
+      support32Bit = true;
+    };
+    pulse.enable = true;
+    lowLatency.enable = true;
+  };
+  hardware.pulseaudio.enable = false;
+}
diff --git a/modules/common-desktop/plymouth.nix b/modules/common-desktop/plymouth.nix
new file mode 100644
index 0000000..04e7852
--- /dev/null
+++ b/modules/common-desktop/plymouth.nix
@@ -0,0 +1 @@
+{boot.plymouth.enable = true;}
diff --git a/modules/common-desktop/print.nix b/modules/common-desktop/print.nix
new file mode 100644
index 0000000..340de7f
--- /dev/null
+++ b/modules/common-desktop/print.nix
@@ -0,0 +1,12 @@
+{
+  services = {
+    avahi = {
+      enable = true;
+      nssmdns4 = true;
+      openFirewall = true;
+    };
+
+    gpm.enable = true;
+    printing.enable = true;
+  };
+}
diff --git a/modules/common-desktop/state-version.nix b/modules/common-desktop/state-version.nix
new file mode 100644
index 0000000..05d82fa
--- /dev/null
+++ b/modules/common-desktop/state-version.nix
@@ -0,0 +1 @@
+{system.stateVersion = "23.05";}
diff --git a/modules/common-desktop/steam.nix b/modules/common-desktop/steam.nix
new file mode 100644
index 0000000..8907823
--- /dev/null
+++ b/modules/common-desktop/steam.nix
@@ -0,0 +1,12 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  programs.steam = {
+    enable = true;
+    package = pkgs.steam.override {
+      extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.system}.proton-ge}'";
+    };
+  };
+}
diff --git a/modules/common/auto-cpufreq.nix b/modules/common/auto-cpufreq.nix
new file mode 100644
index 0000000..5441086
--- /dev/null
+++ b/modules/common/auto-cpufreq.nix
@@ -0,0 +1 @@
+{services.auto-cpufreq.enable = true;}
diff --git a/modules/common/backup.nix b/modules/common/backup.nix
new file mode 100644
index 0000000..ff18edd
--- /dev/null
+++ b/modules/common/backup.nix
@@ -0,0 +1 @@
+{self, ...}: {environment.etc."backup".source = self;}
diff --git a/modules/common/boot.nix b/modules/common/boot.nix
new file mode 100644
index 0000000..f5e2778
--- /dev/null
+++ b/modules/common/boot.nix
@@ -0,0 +1,10 @@
+{pkgs, ...}: {
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+    kernelPackages = pkgs.linuxPackages_zen;
+    kernelParams = ["sysrq_always_enabled=1"];
+  };
+}
diff --git a/modules/common/command-not-found.nix b/modules/common/command-not-found.nix
new file mode 100644
index 0000000..634b337
--- /dev/null
+++ b/modules/common/command-not-found.nix
@@ -0,0 +1,8 @@
+{
+  inputs,
+  pkgs,
+  ...
+}: {
+  programs.command-not-found.dbPath = "/etc/programs.sqlite";
+  environment.etc."programs.sqlite".source = inputs.programsdb.packages.${pkgs.system}.programs-sqlite;
+}
diff --git a/modules/common/common-packages.nix b/modules/common/common-packages.nix
new file mode 100644
index 0000000..cf1b241
--- /dev/null
+++ b/modules/common/common-packages.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    micro
+    prettyping
+  ];
+}
diff --git a/modules/common/common.nix b/modules/common/common.nix
new file mode 100644
index 0000000..135b1a1
--- /dev/null
+++ b/modules/common/common.nix
@@ -0,0 +1,6 @@
+{
+  security.rtkit.enable = true;
+  nixpkgs.config.allowUnfree = true;
+  time.timeZone = "America/Toronto";
+  i18n.defaultLocale = "en_CA.UTF-8";
+}
diff --git a/modules/common/earlyoom.nix b/modules/common/earlyoom.nix
new file mode 100644
index 0000000..1e0d248
--- /dev/null
+++ b/modules/common/earlyoom.nix
@@ -0,0 +1,6 @@
+{
+  services.earlyoom = {
+    enable = true;
+    enableNotifications = true;
+  };
+}
diff --git a/modules/common/experimental.nix b/modules/common/experimental.nix
new file mode 100644
index 0000000..8e3b499
--- /dev/null
+++ b/modules/common/experimental.nix
@@ -0,0 +1 @@
+{nix.settings.experimental-features = ["nix-command" "flakes"];}
diff --git a/common.nix b/modules/common/fish.nix
old mode 100755
new mode 100644
similarity index 50%
rename from common.nix
rename to modules/common/fish.nix
index 54c0aaf..d34ad8a
--- a/common.nix
+++ b/modules/common/fish.nix
@@ -1,30 +1,11 @@
-{
-  pkgs,
-  self,
-  inputs,
-  ...
-}: {
-  # Shared configuration
-  programs = {
-    command-not-found.dbPath = "/etc/programs.sqlite";
-    fish.enable = true;
+{pkgs, ...}: {
+  programs.fish = {
+    enable = true;
+    interactiveShellInit = "neofetch";
   };
-
-  users = {
-    defaultUserShell = pkgs.fish;
-
-    users.quadradical = {
-      isNormalUser = true;
-      description = "QuadRadical";
-      extraGroups = ["networkmanager" "wheel" "wireshark" "libvirtd" "libvirt" "input" "kvm"];
-    };
-  };
-
   environment = {
-    etc = {
-      "programs.sqlite".source = inputs.programsdb.packages.${pkgs.system}.programs-sqlite;
-      "backup".source = self;
-    };
+    systemPackages = [pkgs.hyfetch];
+    sessionVariables.fish_greeting = "";
     shells = [pkgs.fish];
     shellAliases = {
       # Utility
@@ -32,6 +13,7 @@
       rm = "gio trash";
       free = "free -h";
       ping = "prettyping";
+      neofetch = "neowofetch";
       shutdown = "shutdown now";
 
       # Git
@@ -52,20 +34,6 @@
       config = "$EDITOR ~/.config/nixos/$(hostname)/configuration.nix";
       home-manager = "$EDITOR ~/.config/nixos/$(hostname)/home-manager.nix";
     };
-
-    systemPackages = with pkgs; [
-      micro
-      prettyping
-    ];
   };
-
-  documentation = {
-    info.enable = false;
-    nixos.enable = false;
-  };
-  security.rtkit.enable = true;
-  nixpkgs.config.allowUnfree = true;
-  time.timeZone = "America/Toronto";
-  i18n.defaultLocale = "en_CA.UTF-8";
-  nix.settings.experimental-features = ["nix-command" "flakes"];
+  users.defaultUserShell = pkgs.fish;
 }
diff --git a/modules/common/micro.nix b/modules/common/micro.nix
new file mode 100644
index 0000000..ea81633
--- /dev/null
+++ b/modules/common/micro.nix
@@ -0,0 +1,6 @@
+{pkgs, ...}: {
+  environment = {
+    systemPackages = [pkgs.micro];
+    sessionVariables.EDITOR = "micro";
+  };
+}
diff --git a/modules/common/network-manager.nix b/modules/common/network-manager.nix
new file mode 100644
index 0000000..72c095b
--- /dev/null
+++ b/modules/common/network-manager.nix
@@ -0,0 +1,6 @@
+{
+  networking.networkmanager = {
+    enable = true;
+    wifi.macAddress = "random";
+  };
+}
diff --git a/modules/common/nix-gaming.nix b/modules/common/nix-gaming.nix
new file mode 100644
index 0000000..5bea6f5
--- /dev/null
+++ b/modules/common/nix-gaming.nix
@@ -0,0 +1,6 @@
+{
+  nix.settings = {
+    substituters = ["https://nix-gaming.cachix.org"];
+    trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];
+  };
+}
diff --git a/modules/common/quadradical.nix b/modules/common/quadradical.nix
new file mode 100644
index 0000000..00feec8
--- /dev/null
+++ b/modules/common/quadradical.nix
@@ -0,0 +1,7 @@
+{
+  users.users.quadradical = {
+    isNormalUser = true;
+    description = "QuadRadical";
+    extraGroups = ["networkmanager" "wheel"];
+  };
+}
diff --git a/modules/common/remove-docs.nix b/modules/common/remove-docs.nix
new file mode 100644
index 0000000..a41fec9
--- /dev/null
+++ b/modules/common/remove-docs.nix
@@ -0,0 +1,7 @@
+{
+  documentation = {
+    doc.enable = false;
+    info.enable = false;
+    nixos.enable = false;
+  };
+}
diff --git a/modules/common/zram.nix b/modules/common/zram.nix
new file mode 100644
index 0000000..851c25b
--- /dev/null
+++ b/modules/common/zram.nix
@@ -0,0 +1,6 @@
+{
+  zramSwap = {
+    enable = true;
+    memoryPercent = 100;
+  };
+}
diff --git a/quadraticpc/configuration.nix b/quadraticpc/configuration.nix
index 75f547e..2a80e31 100755
--- a/quadraticpc/configuration.nix
+++ b/quadraticpc/configuration.nix
@@ -1,145 +1,4 @@
 {
-  pkgs,
-  inputs,
-  nixpkgs,
-  ...
-}: {
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    plymouth.enable = true;
-    kernelPackages = pkgs.linuxPackages_zen;
-    kernelParams = ["sysrq_always_enabled=1"];
-  };
-
-  hardware.opengl = {
-    enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
-  };
-
-  networking = {
-    hostName = "quadraticpc";
-    networkmanager.enable = true;
-  };
-
-  nix.settings = {
-    substituters = ["https://nix-gaming.cachix.org"];
-    trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];
-  };
-
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-24.8.6"
-  ];
-
-  services = {
-    earlyoom = {
-      enable = true;
-      enableNotifications = true;
-    };
-
-    xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-      layout = "us";
-    };
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      lowLatency.enable = true;
-    };
-
-    avahi = {
-      enable = true;
-      nssmdns = true;
-      openFirewall = true;
-    };
-
-    gpm.enable = true;
-    printing.enable = true;
-    auto-cpufreq.enable = true;
-  };
-
-  environment = {
-    shellAliases = {
-      neofetch = "neowofetch";
-    };
-
-    sessionVariables = {
-      MANGOHUD = "1";
-      EDITOR = "micro";
-      VISUAL = "micro";
-      fish_greeting = "";
-      NIXOS_OZONE_WL = "1";
-    };
-
-    systemPackages = with pkgs; ([
-        fd
-        tldr
-        tuba
-        gimp
-        heroic
-        aspell
-        nodejs
-        ntfs3g
-        killall
-        ripgrep
-        hyfetch
-        inkscape
-        r2modman
-        pciutils
-        alejandra
-        grapejuice
-        impression
-        libreoffice
-        virt-manager
-        wl-clipboard
-        protontricks
-        android-studio
-        nodePackages.pnpm
-        hunspellDicts.en_CA-large
-        inputs.nix-gaming.packages.${system}.wine-ge
-        inputs.nixpkgs-local.legacyPackages.${system}.monophony
-      ]
-      ++ (with gnomeExtensions; [
-        caffeine
-        pop-shell
-        appindicator
-        search-light
-        blur-my-shell
-        just-perfection
-        burn-my-windows
-        fullscreen-avoider
-        compiz-windows-effect
-      ]));
-  };
-
-  programs = {
-    steam = {
-      enable = true;
-      package = pkgs.steam.override {
-        extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.system}.proton-ge}'";
-      };
-    };
-    gamemode.enable = true;
-    noisetorch.enable = true;
-    fish.interactiveShellInit = "neofetch";
-  };
-
-  zramSwap = {
-    enable = true;
-    memoryPercent = 100;
-  };
-
-  system.stateVersion = "23.05";
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
   virtualisation.libvirtd.enable = true;
+  networking.hostName = "quadraticpc";
 }
diff --git a/quadtop/configuration.nix b/quadtop/configuration.nix
index 02550c1..ca661bc 100755
--- a/quadtop/configuration.nix
+++ b/quadtop/configuration.nix
@@ -1,166 +1,22 @@
 {
-  pkgs,
-  inputs,
-  nixpkgs,
-  ...
-}: {
-  boot = {
-    loader = {
-      systemd-boot.enable = true;
-      efi.canTouchEfiVariables = true;
-    };
-    plymouth.enable = true;
-    kernelPackages = pkgs.linuxPackages_zen;
-    kernelParams = ["sysrq_always_enabled=1"];
-  };
-
-  hardware = {
-    opengl = {
-      enable = true;
-      driSupport = true;
-      driSupport32Bit = true;
-    };
-
-    nvidia = {
-      prime = {
-        offload = {
-          enable = true;
-          enableOffloadCmd = true;
-        };
-
-        intelBusId = "PCI:00:02:0";
-        nvidiaBusId = "PCI:01:00:0";
+  hardware.nvidia = {
+    prime = {
+      offload = {
+        enable = true;
+        enableOffloadCmd = true;
       };
-      open = false;
-      nvidiaSettings = false;
-      modesetting.enable = true;
-      nvidiaPersistenced = true;
-      dynamicBoost.enable = true;
+
+      intelBusId = "PCI:00:02:0";
+      nvidiaBusId = "PCI:01:00:0";
     };
+    open = true;
+    nvidiaSettings = false;
+    modesetting.enable = true;
+    nvidiaPersistenced = true;
+    dynamicBoost.enable = true;
   };
 
-  networking = {
-    hostName = "quadtop";
-    networkmanager.enable = true;
-  };
-
-  nix.settings = {
-    substituters = ["https://nix-gaming.cachix.org"];
-    trusted-public-keys = ["nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="];
-  };
-
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-24.8.6"
-  ];
-
-  services = {
-    earlyoom = {
-      enable = true;
-      enableNotifications = true;
-    };
-
-    xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-      layout = "us";
-      videoDrivers = ["nvidia"];
-    };
-
-    pipewire = {
-      enable = true;
-      alsa.enable = true;
-      alsa.support32Bit = true;
-      pulse.enable = true;
-      lowLatency.enable = true;
-    };
-
-    avahi = {
-      enable = true;
-      nssmdns = true;
-      openFirewall = true;
-    };
-
-    gpm.enable = true;
-    printing.enable = true;
-    auto-cpufreq.enable = true;
-  };
-
-  environment = {
-    shellAliases = {
-      neofetch = "neowofetch";
-    };
-
-    sessionVariables = {
-      MANGOHUD = "1";
-      EDITOR = "micro";
-      VISUAL = "micro";
-      fish_greeting = "";
-      NIXOS_OZONE_WL = "1";
-      GAMEMODERUNEXEC = "nvidia-offload";
-    };
-
-    systemPackages = with pkgs; ([
-        fd
-        tldr
-        tuba
-        gimp
-        heroic
-        aspell
-        nodejs
-        ntfs3g
-        killall
-        ripgrep
-        hyfetch
-        inkscape
-        r2modman
-        pciutils
-        alejandra
-        grapejuice
-        impression
-        libreoffice
-        virt-manager
-        wl-clipboard
-        protontricks
-        android-studio
-        nodePackages.pnpm
-        hunspellDicts.en_CA-large
-        inputs.nix-gaming.packages.${system}.wine-ge
-        inputs.nixpkgs-local.legacyPackages.${system}.monophony
-      ]
-      ++ (with gnomeExtensions; [
-        caffeine
-        pop-shell
-        appindicator
-        search-light
-        blur-my-shell
-        just-perfection
-        burn-my-windows
-        fullscreen-avoider
-        compiz-windows-effect
-      ]));
-  };
-
-  programs = {
-    steam = {
-      enable = true;
-      package = pkgs.steam.override {
-        extraProfile = "export STEAM_EXTRA_COMPAT_TOOLS_PATHS='${inputs.nix-gaming.packages.${pkgs.system}.proton-ge}'";
-      };
-    };
-    gamemode.enable = true;
-    noisetorch.enable = true;
-    fish.interactiveShellInit = "neofetch";
-  };
-
-  zramSwap = {
-    enable = true;
-    memoryPercent = 100;
-  };
-
-  system.stateVersion = "23.05";
-
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
+  services.xserver.videoDrivers = ["nvidia"];
   virtualisation.libvirtd.enable = true;
+  networking.hostName = "quadtop";
 }
diff --git a/quadtop/home-manager.nix b/quadtop/home-manager.nix
index 35b2b38..6cafa53 100755
--- a/quadtop/home-manager.nix
+++ b/quadtop/home-manager.nix
@@ -1,28 +1,27 @@
 {inputs, ...}: {
-  home-manager.useGlobalPkgs = true;
-  home-manager.useUserPackages = true;
-  home-manager.extraSpecialArgs = {inherit inputs;};
-  home-manager.users.quadradical = {
-    home = {
-      username = "quadradical";
-      homeDirectory = "/home/quadradical";
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = {inherit inputs;};
+    users.quadradical = {
+      home = {
+        username = "quadradical";
+        homeDirectory = "/home/quadradical";
+      };
     };
+    sharedModules = [
+      {home.stateVersion = "23.11";}
+      ../home-manager/gtk.nix
+      ../home-manager/bat.nix
+      ../home-manager/eza.nix
+      ../home-manager/git.nix
+      ../home-manager/btop.nix
+      ../home-manager/vscode.nix
+      ../home-manager/direnv.nix
+      ../home-manager/firefox.nix
+      ../home-manager/neofetch.nix
+      ../home-manager/mangohud.nix
+      ../home-manager/sway.nix
+    ];
   };
-  home-manager.sharedModules = [
-    {
-      programs.home-manager.enable = true;
-      home.stateVersion = "23.11";
-    }
-    ../home-manager/gtk.nix
-    ../home-manager/bat.nix
-    ../home-manager/eza.nix
-    ../home-manager/git.nix
-    ../home-manager/btop.nix
-    ../home-manager/vscode.nix
-    ../home-manager/direnv.nix
-    ../home-manager/firefox.nix
-    ../home-manager/neofetch.nix
-    ../home-manager/mangohud.nix
-    ../home-manager/sway.nix
-  ];
 }