diff --git a/clients/quadphone/hardware-configuration.nix.nix b/clients/quadphone/hardware-configuration.nix.nix
deleted file mode 100644
index d4cb634..0000000
--- a/clients/quadphone/hardware-configuration.nix.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{inputs, ...}: {
-  imports = ["${inputs.sdm845}/nixos/profiles/boot/kernel/sdm845-mainline"];
-  hardware.graphics.enable32Bit = false;
-}
diff --git a/clients/quadphone/repart.nix b/clients/quadphone/repart.nix
deleted file mode 100644
index 362d344..0000000
--- a/clients/quadphone/repart.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  modulesPath,
-  pkgs,
-  config,
-  lib,
-  ...
-}: let
-  efiArch = pkgs.stdenv.hostPlatform.efiArch;
-in {
-  imports = ["${modulesPath}/image/repart.nix"];
-  boot.loader.grub.enable = false;
-
-  systemd.repart = {
-    enable = true;
-    partitions."03-root".Type = "root";
-  };
-  boot.initrd.systemd = {
-    enable = true;
-    root = "gpt-auto";
-  };
-  boot.initrd.supportedFilesystems.ext4 = true;
-
-  fileSystems."/".device = "/dev/disk/by-label/nixos";
-  fileSystems."/".fsType = "ext4";
-  fileSystems."/boot".device = "/dev/disk/by-label/ESP";
-  fileSystems."/boot".fsType = "vfat";
-  image.repart = {
-    name = "image";
-    partitions = {
-      "10-uboot-padding" = {
-        repartConfig = {
-          Type = "linux-generic";
-          Label = "uboot-padding";
-          SizeMinBytes = "10M";
-        };
-      };
-      "20-esp" = {
-        contents = {
-          "/EFI/EDK2-UEFI-SHELL/SHELL.EFI".source = "${pkgs.edk2-uefi-shell.overrideAttrs {env.NIX_CFLAGS_COMPILE = "-Wno-error=maybe-uninitialized";}}/shell.efi";
-          "/EFI/BOOT/BOOT${lib.toUpper efiArch}.EFI".source = "${pkgs.systemd}/lib/systemd/boot/efi/systemd-boot${efiArch}.efi";
-          "/EFI/Linux/${config.system.boot.loader.ukiFile}".source = "${config.system.build.uki}/${config.system.boot.loader.ukiFile}";
-          "/loader/loader.conf".source = pkgs.writeText "loader.conf" ''
-            timeout 5
-            console-mode keep
-          '';
-          "/loader/entries/shell.conf".source = pkgs.writeText "shell.conf" ''
-            title  EDK2 UEFI Shell
-            efi    /EFI/EDK2-UEFI-SHELL/SHELL.EFI
-          '';
-        };
-        repartConfig = {
-          Type = "esp";
-          Format = "vfat";
-          Label = "ESP";
-          SizeMinBytes = "500M";
-          GrowFileSystem = true;
-        };
-      };
-      "30-root" = {
-        storePaths = [config.system.build.toplevel];
-        contents."/boot".source = pkgs.runCommand "boot" {} "mkdir $out";
-        repartConfig = {
-          Type = "root";
-          Format = "ext4";
-          Label = "nixos";
-          Minimize = "guess";
-          GrowFileSystem = true;
-        };
-      };
-    };
-  };
-}
diff --git a/flake.lock b/flake.lock
index 7614ea5..659343c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,50 +1,5 @@
 {
   "nodes": {
-    "ace-bot": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "sdm845",
-          "rust-overlay"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752250448,
-        "narHash": "sha256-bRbSwgpXH2SrlYg0WZVYvIh5LeEtwfgF5KPmOWVcAFU=",
-        "owner": "linyinfeng",
-        "repo": "ace-bot",
-        "rev": "fd6d62f86bc3e9ba5ff608ef1aeb02c0eec63d39",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "ace-bot",
-        "type": "github"
-      }
-    },
     "agenix": {
       "inputs": {
         "darwin": "darwin",
@@ -90,48 +45,11 @@
         "type": "github"
       }
     },
-    "angrr": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752250807,
-        "narHash": "sha256-zXZNU7xsPDcAEfvWwhyU1LD35egz1zfpEyDwcPuBKnQ=",
-        "owner": "linyinfeng",
-        "repo": "angrr",
-        "rev": "f72481311f614f2a56eed3400b8fb923fd0011da",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "angrr",
-        "type": "github"
-      }
-    },
     "attic": {
       "inputs": {
         "crane": "crane",
         "flake-compat": "flake-compat_2",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts",
         "nix-github-actions": "nix-github-actions",
         "nixpkgs": "nixpkgs",
         "nixpkgs-stable": "nixpkgs-stable"
@@ -218,137 +136,6 @@
         "type": "github"
       }
     },
-    "blank": {
-      "locked": {
-        "lastModified": 1625557891,
-        "narHash": "sha256-O8/MWsPBGhhyPoPLHZAuoZiiHo9q6FLlEeIDEXuj6T4=",
-        "owner": "divnix",
-        "repo": "blank",
-        "rev": "5a5d2684073d9f563072ed07c871d577a6c614a8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "divnix",
-        "repo": "blank",
-        "type": "github"
-      }
-    },
-    "cachix": {
-      "inputs": {
-        "devenv": [
-          "sdm845",
-          "blank"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "git-hooks": [
-          "sdm845",
-          "git-hooks-nix"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1748883665,
-        "narHash": "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=",
-        "owner": "cachix",
-        "repo": "cachix",
-        "rev": "f707778d902af4d62d8dd92c269f8e70de09acbe",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "ref": "latest",
-        "repo": "cachix",
-        "type": "github"
-      }
-    },
-    "commit-notifier": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "sdm845",
-          "rust-overlay"
-        ],
-        "systems": [
-          "sdm845",
-          "systems"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751075819,
-        "narHash": "sha256-po711J9vjNsUhlpkIAcy8bGh/249egbsqUVFcWi1Mho=",
-        "owner": "linyinfeng",
-        "repo": "commit-notifier",
-        "rev": "8f781a1851a17fe8f7d48467192a65f303ec5664",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "commit-notifier",
-        "type": "github"
-      }
-    },
-    "conf2nix": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752250503,
-        "narHash": "sha256-etpz7FwbXhShIT5yC2q1qZws3rovLPVjlnBdqFwptG4=",
-        "owner": "linyinfeng",
-        "repo": "conf2nix",
-        "rev": "a85f319ff68adecfd26281361b794049a6604a8d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "conf2nix",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -387,70 +174,6 @@
         "type": "github"
       }
     },
-    "crane_3": {
-      "locked": {
-        "lastModified": 1751562746,
-        "narHash": "sha256-smpugNIkmDeicNz301Ll1bD7nFOty97T79m4GUMUczA=",
-        "owner": "ipetkov",
-        "repo": "crane",
-        "rev": "aed2020fd3dc26e1e857d4107a5a67a33ab6c1fd",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ipetkov",
-        "repo": "crane",
-        "type": "github"
-      }
-    },
-    "crate2nix": {
-      "inputs": {
-        "cachix": [
-          "sdm845",
-          "cachix"
-        ],
-        "crate2nix_stable": [
-          "sdm845",
-          "blank"
-        ],
-        "devshell": [
-          "sdm845",
-          "devshell"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nix-test-runner": [
-          "sdm845",
-          "blank"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "pre-commit-hooks": [
-          "sdm845",
-          "pre-commit-hooks-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1739473963,
-        "narHash": "sha256-ItAhpjNUzEWd/cgZVyW/jvoGbCec4TK29e1Mnmn1oJE=",
-        "owner": "nix-community",
-        "repo": "crate2nix",
-        "rev": "be31feae9a82c225c0fd1bdf978565dc452a483a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "crate2nix",
-        "type": "github"
-      }
-    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -473,35 +196,6 @@
         "type": "github"
       }
     },
-    "deploy-rs": {
-      "inputs": {
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "utils": [
-          "sdm845",
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749105467,
-        "narHash": "sha256-hXh76y/wDl15almBcqvjryB50B0BaiXJKk20f314RoE=",
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "rev": "6bc76b872374845ba9d645a2f012b764fecd765f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "serokell",
-        "repo": "deploy-rs",
-        "type": "github"
-      }
-    },
     "devshell": {
       "locked": {
         "lastModified": 1642188268,
@@ -517,27 +211,6 @@
         "type": "github"
       }
     },
-    "devshell_2": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1741473158,
-        "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=",
-        "owner": "numtide",
-        "repo": "devshell",
-        "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "devshell",
-        "type": "github"
-      }
-    },
     "disko": {
       "inputs": {
         "nixpkgs": [
@@ -558,52 +231,6 @@
         "type": "github"
       }
     },
-    "disko_2": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752113600,
-        "narHash": "sha256-7LYDxKxZgBQ8LZUuolAQ8UkIB+jb4A2UmiR+kzY9CLI=",
-        "owner": "nix-community",
-        "repo": "disko",
-        "rev": "79264292b7e3482e5702932949de9cbb69fedf6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "disko",
-        "type": "github"
-      }
-    },
-    "emacs-overlay": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "sdm845",
-          "blank"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752251148,
-        "narHash": "sha256-LOigOhLS+DC0JUAxG8YfbHoUyOpk/CS919hce9H/YLY=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "fcd9c1b4bded92ec89abe7b41cb2fdb1dd1dd370",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
     "fenix": {
       "inputs": {
         "nixpkgs": [
@@ -627,28 +254,6 @@
         "type": "github"
       }
     },
-    "fenix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "rust-analyzer-src": "rust-analyzer-src_2"
-      },
-      "locked": {
-        "lastModified": 1752216262,
-        "narHash": "sha256-OO7SPN6DfXK8TG62AKWHUYc6D8kVNaKgAStGhDBEcBc=",
-        "owner": "nix-community",
-        "repo": "fenix",
-        "rev": "1b96480284e9b3f76fb1f68dc2be246c8ae90e13",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "fenix",
-        "type": "github"
-      }
-    },
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
@@ -745,41 +350,7 @@
         "type": "github"
       }
     },
-    "flake-compat_5": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
-        "type": "github"
-      },
-      "original": {
-        "owner": "edolstra",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
     "flake-parts": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib"
-      },
-      "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_2": {
       "inputs": {
         "nixpkgs-lib": [
           "grapevine",
@@ -801,9 +372,9 @@
         "type": "github"
       }
     },
-    "flake-parts_3": {
+    "flake-parts_2": {
       "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_2"
+        "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
         "lastModified": 1749398372,
@@ -819,28 +390,7 @@
         "type": "github"
       }
     },
-    "flake-parts_4": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_5": {
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
@@ -861,21 +411,6 @@
         "type": "github"
       }
     },
-    "flake-schemas": {
-      "locked": {
-        "lastModified": 1747430042,
-        "narHash": "sha256-FXBkQaQ2wptf06JpD9d8FsQcyj1wmSttq7eZIXxqiz4=",
-        "owner": "determinatesystems",
-        "repo": "flake-schemas",
-        "rev": "d0e74ee9a30eda4cc153b7f1e347043680834180",
-        "type": "github"
-      },
-      "original": {
-        "owner": "determinatesystems",
-        "repo": "flake-schemas",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems_2"
@@ -894,27 +429,6 @@
         "type": "github"
       }
     },
-    "flake-utils-plus": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ]
-      },
-      "locked": {
-        "lastModified": 1738591040,
-        "narHash": "sha256-4WNeriUToshQ/L5J+dTSWC5OJIwT39SEP7V7oylndi8=",
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "rev": "afcb15b845e74ac5e998358709b2b5fe42a948d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "gytis-ivaskevicius",
-        "repo": "flake-utils-plus",
-        "type": "github"
-      }
-    },
     "flake-utils_2": {
       "inputs": {
         "systems": "systems_3"
@@ -952,72 +466,6 @@
         "type": "github"
       }
     },
-    "flake-utils_4": {
-      "inputs": {
-        "systems": [
-          "sdm845",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "flat-flake": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "rust-overlay": [
-          "sdm845",
-          "rust-overlay"
-        ],
-        "systems": [
-          "sdm845",
-          "systems"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752251357,
-        "narHash": "sha256-a0GQ+T46dXwwvjt+gDIu+tSvgJZYviSsitGaK+1+0+c=",
-        "owner": "linyinfeng",
-        "repo": "flat-flake",
-        "rev": "23f8cf85667f2fdfe0e55a146cfdc04afe2fc8e8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "flat-flake",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -1034,56 +482,6 @@
         "type": "github"
       }
     },
-    "git-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "gitignore": [
-          "sdm845",
-          "gitignore-nix"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
-    "gitignore-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1709087332,
-        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "gitignore.nix",
-        "type": "github"
-      }
-    },
     "gnome-shell": {
       "flake": false,
       "locked": {
@@ -1131,27 +529,6 @@
         "type": "gitlab"
       }
     },
-    "haumea": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1708375098,
-        "narHash": "sha256-DaFJp3wDHgOqx98U0SF57bXaH2Orp106c+jSdPCVu1E=",
-        "owner": "nix-community",
-        "repo": "haumea",
-        "rev": "ec6350fd9353e7f27ce0e85d31f82e3ed73e4d70",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "haumea",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -1193,220 +570,9 @@
         "type": "github"
       }
     },
-    "home-manager_3": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752246954,
-        "narHash": "sha256-c1Rq5Hc4WZLKj1RkmjLFCcX4QHBwrL+DIZNMEHno7DU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "e90b28967cacc64de7fb8742314ed0d7d12f47c6",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "kukui-nixos": {
-      "inputs": {
-        "conf2nix": [
-          "sdm845",
-          "conf2nix"
-        ],
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "disko": [
-          "sdm845",
-          "disko"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nixpkgs-alsa-ucm-conf": "nixpkgs-alsa-ucm-conf",
-        "pmaports": [
-          "sdm845",
-          "pmaports"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751169255,
-        "narHash": "sha256-cWeY2KvwndMJVtVmi/3MYxiwYl0ODW51DVwBvMPFU4w=",
-        "owner": "linyinfeng",
-        "repo": "kukui-nixos",
-        "rev": "53027913fffd5bf48382bbcec6217d0352dc7278",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "kukui-nixos",
-        "type": "github"
-      }
-    },
-    "lantian": {
-      "inputs": {
-        "devshell": [
-          "sdm845",
-          "devshell"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nix-index-database": [
-          "sdm845",
-          "nix-index-database"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nixpkgs-24_05": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nvfetcher": [
-          "sdm845",
-          "nvfetcher"
-        ],
-        "pre-commit-hooks-nix": [
-          "sdm845",
-          "pre-commit-hooks-nix"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752228483,
-        "narHash": "sha256-5yzlcgDV7o3fdrt2101fE/9VxB71NbKtF+IbTS3iNe0=",
-        "owner": "xddxdd",
-        "repo": "nur-packages",
-        "rev": "17c3910b363bd32df0458ee3ae63144657ef76f0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "xddxdd",
-        "repo": "nur-packages",
-        "type": "github"
-      }
-    },
-    "lanzaboote": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "pre-commit-hooks-nix": [
-          "sdm845",
-          "pre-commit-hooks-nix"
-        ],
-        "rust-overlay": [
-          "sdm845",
-          "rust-overlay"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751386392,
-        "narHash": "sha256-Kq7MhnnVXzqproAZsYKAdQNgnb6Hjf12FqDgGWv9IVY=",
-        "owner": "linyinfeng",
-        "repo": "lanzaboote",
-        "rev": "54631d01f2ad2dad3fd6e85adf99d17397e7c78d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "ref": "uki",
-        "repo": "lanzaboote",
-        "type": "github"
-      }
-    },
-    "linyinfeng": {
-      "inputs": {
-        "devshell": [
-          "sdm845",
-          "devshell"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixos-stable": [
-          "sdm845",
-          "blank"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nvfetcher": [
-          "sdm845",
-          "nvfetcher"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752238174,
-        "narHash": "sha256-8Of4X7L8vnHNtC27+FL3i0KGYK9VqLYGey9WjbVzATU=",
-        "owner": "linyinfeng",
-        "repo": "nur-packages",
-        "rev": "5dea91448e25a515208aac5743b43dcfa3daf49e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "nur-packages",
-        "type": "github"
-      }
-    },
     "matrixoidc": {
       "inputs": {
-        "flake-parts": "flake-parts_3",
+        "flake-parts": "flake-parts_2",
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -1425,180 +591,6 @@
         "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc"
       }
     },
-    "mc-config": {
-      "inputs": {
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "minecraft-json": [
-          "sdm845",
-          "minecraft-json"
-        ],
-        "minecraft-nix": [
-          "sdm845",
-          "minecraft-nix"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "systems": [
-          "sdm845",
-          "systems"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752251394,
-        "narHash": "sha256-99/7p5qk0Xj29bSg/y6G5+o5xJUumiOQ8JTwn64MRHY=",
-        "owner": "linyinfeng",
-        "repo": "mc-config",
-        "rev": "7609a41bc1bb7f25d7a071845db14617f3182036",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "mc-config",
-        "type": "github"
-      }
-    },
-    "mc-config-nuc": {
-      "inputs": {
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "mc-config": [
-          "sdm845",
-          "mc-config"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751647353,
-        "narHash": "sha256-vh586RBnVW/jOGkorg9GvT07uxGnE5rjH/uE/4ZugRM=",
-        "owner": "linyinfeng",
-        "repo": "mc-config-nuc",
-        "rev": "423039d75fdbc13fdfcda253129e79a93097338e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "mc-config-nuc",
-        "type": "github"
-      }
-    },
-    "minecraft-json": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751335674,
-        "narHash": "sha256-NLfDOYn/VnqeuMDGWBwuynXyFunPZQqOdzOa2gReQA8=",
-        "owner": "ninlives",
-        "repo": "minecraft.json",
-        "rev": "098835a9f00130afafc148a0efeff59663144259",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ninlives",
-        "repo": "minecraft.json",
-        "type": "github"
-      }
-    },
-    "minecraft-nix": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "metadata": [
-          "sdm845",
-          "minecraft-json"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752199133,
-        "narHash": "sha256-cSlbaQGu94liy+/N1YJQmoRG8ZJoLkgP8tymyMmhD/4=",
-        "owner": "ninlives",
-        "repo": "minecraft.nix",
-        "rev": "73d0552089a3650d884838ef543517c2847f4897",
-        "type": "github"
-      },
-      "original": {
-        "owner": "ninlives",
-        "repo": "minecraft.nix",
-        "type": "github"
-      }
-    },
-    "mobile-nixos": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751171144,
-        "narHash": "sha256-BZLhTA9sRA1yu4O3achWvdMgMD8KsWW5wiia2vzNk3A=",
-        "owner": "linyinfeng",
-        "repo": "mobile-nixos",
-        "rev": "cde155d06e5cc7af547e86e294569e212b2aa634",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "ref": "development",
-        "repo": "mobile-nixos",
-        "type": "github"
-      }
-    },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752249768,
-        "narHash": "sha256-wKqMvhTqMgTKM/CdTH/ihq9eLZM95qpU0FG7cvTBFJg=",
-        "owner": "nix-community",
-        "repo": "naersk",
-        "rev": "35aa63738857c40f98ecb04db52887d664836e74",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "naersk",
-        "type": "github"
-      }
-    },
     "nh": {
       "inputs": {
         "nixpkgs": [
@@ -1619,83 +611,6 @@
         "type": "github"
       }
     },
-    "niri-flake": {
-      "inputs": {
-        "niri-stable": [
-          "sdm845",
-          "blank"
-        ],
-        "niri-unstable": "niri-unstable",
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "sdm845",
-          "nixpkgs-stable"
-        ],
-        "xwayland-satellite-stable": "xwayland-satellite-stable",
-        "xwayland-satellite-unstable": "xwayland-satellite-unstable"
-      },
-      "locked": {
-        "lastModified": 1752078530,
-        "narHash": "sha256-TrRmlYdhWcadWvBpDjB9Xlry4uT4ZUIO46d+o5tjtCQ=",
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "rev": "d231d92313192d4d0c78d6ef04167fed9dee87cf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sodiboo",
-        "repo": "niri-flake",
-        "type": "github"
-      }
-    },
-    "niri-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1750791124,
-        "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "YaLTeR",
-        "repo": "niri",
-        "type": "github"
-      }
-    },
-    "nix-alien": {
-      "inputs": {
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "nix-index-database": [
-          "sdm845",
-          "nix-index-database"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749976779,
-        "narHash": "sha256-Mjb4qsu+Fma1cXe1lGo0GqisvsiUeW0LfacziI7C7oM=",
-        "owner": "thiagokokada",
-        "repo": "nix-alien",
-        "rev": "f8716e36f8864e2f50663fde364ddd8dce5d937f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "thiagokokada",
-        "repo": "nix-alien",
-        "type": "github"
-      }
-    },
     "nix-filter": {
       "locked": {
         "lastModified": 1731533336,
@@ -1712,70 +627,6 @@
         "type": "github"
       }
     },
-    "nix-filter_2": {
-      "locked": {
-        "lastModified": 1731533336,
-        "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=",
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "rev": "f7653272fd234696ae94229839a99b73c9ab7de0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "nix-filter",
-        "type": "github"
-      }
-    },
-    "nix-gc-s3": {
-      "inputs": {
-        "blank": [
-          "sdm845",
-          "blank"
-        ],
-        "devshell": [
-          "sdm845",
-          "devshell"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "poetry2nix": [
-          "sdm845",
-          "poetry2nix"
-        ],
-        "systems": [
-          "sdm845",
-          "systems"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752250849,
-        "narHash": "sha256-mElcSQYBZpalboh52AgbDVNOfnJDCrnRWPqdGmrOMys=",
-        "owner": "linyinfeng",
-        "repo": "nix-gc-s3",
-        "rev": "c7859a247ca327985862b8e97cc43ba354fa68b1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "nix-gc-s3",
-        "type": "github"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -1819,48 +670,6 @@
         "type": "github"
       }
     },
-    "nix-github-actions_3": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1737420293,
-        "narHash": "sha256-F1G5ifvqTpJq7fdkT34e/Jy9VCyzd5XfJ9TO8fHhJWE=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "f4158fa080ef4503c8f4c820967d946c2af31ec9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
-    "nix-index-database": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751774635,
-        "narHash": "sha256-DuOznGdgMxeSlPpUu6Wkq0ZD5e2Cfv9XRZeZlHWMd1s=",
-        "owner": "Mic92",
-        "repo": "nix-index-database",
-        "rev": "85686025ba6d18df31cc651a91d5adef63378978",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "nix-index-database",
-        "type": "github"
-      }
-    },
     "nix-matrix-appservices": {
       "inputs": {
         "devshell": "devshell",
@@ -1884,97 +693,6 @@
         "type": "gitlab"
       }
     },
-    "nix-topology": {
-      "inputs": {
-        "devshell": [
-          "sdm845",
-          "devshell"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "pre-commit-hooks": [
-          "sdm845",
-          "pre-commit-hooks-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752093877,
-        "narHash": "sha256-P0TySh6sQl1EhfxjW9ZqGxEyUBSsEpdnchOe1QB0pLA=",
-        "owner": "oddlama",
-        "repo": "nix-topology",
-        "rev": "6a536c4b686ee4bcf07a7b0f8b823584560e2633",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oddlama",
-        "repo": "nix-topology",
-        "type": "github"
-      }
-    },
-    "nixago": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixago-exts": [
-          "sdm845",
-          "nixago-exts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1746801636,
-        "narHash": "sha256-dlcKfIXp/eqFHzFm+DzseXAWWlpVwyk9cTvCKGtVKkw=",
-        "owner": "nix-community",
-        "repo": "nixago",
-        "rev": "8cc33f973ab3a891d8a41391e73ef451a783960b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixago",
-        "type": "github"
-      }
-    },
-    "nixago-exts": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixago": [
-          "sdm845",
-          "nixago"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1676070308,
-        "narHash": "sha256-QaJ65oc2l8iwQIGWUJ0EKjCeSuuCM/LqR8RauxZUUkc=",
-        "owner": "nix-community",
-        "repo": "nixago-extensions",
-        "rev": "e5380cb0456f4ea3c86cf94e3039eb856bf07d0b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixago-extensions",
-        "type": "github"
-      }
-    },
     "nixlib": {
       "locked": {
         "lastModified": 1643502816,
@@ -1990,121 +708,6 @@
         "type": "github"
       }
     },
-    "nixos-cn": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721353155,
-        "narHash": "sha256-OJWzQC04UBDkXJyxoGnhQZwdxITBnN5QfEczY9Ht4gQ=",
-        "owner": "nixos-cn",
-        "repo": "flakes",
-        "rev": "7d6545e2d0d1a2614a3b98f724ea5d6e068649d1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos-cn",
-        "repo": "flakes",
-        "type": "github"
-      }
-    },
-    "nixos-generators": {
-      "inputs": {
-        "nixlib": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751903740,
-        "narHash": "sha256-PeSkNMvkpEvts+9DjFiop1iT2JuBpyknmBUs0Un0a4I=",
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "rev": "032decf9db65efed428afd2fa39d80f7089085eb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-generators",
-        "type": "github"
-      }
-    },
-    "nixos-hardware": {
-      "locked": {
-        "lastModified": 1752048960,
-        "narHash": "sha256-gATnkOe37eeVwKKYCsL+OnS2gU4MmLuZFzzWCtaKLI8=",
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "rev": "7ced9122cff2163c6a0212b8d1ec8c33a1660806",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "repo": "nixos-hardware",
-        "type": "github"
-      }
-    },
-    "nixos-vscode-server": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750353031,
-        "narHash": "sha256-Bx7DOPLhkr8Z60U9Qw4l0OidzHoqLDKQH5rDV5ef59A=",
-        "owner": "nix-community",
-        "repo": "nixos-vscode-server",
-        "rev": "4ec4859b12129c0436b0a471ed1ea6dd8a317993",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-vscode-server",
-        "type": "github"
-      }
-    },
-    "nixos-wsl": {
-      "inputs": {
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752199438,
-        "narHash": "sha256-xSBMmGtq8K4Qv80TMqREmESCAsRLJRHAbFH2T/2Bf1Y=",
-        "owner": "nix-community",
-        "repo": "nixos-wsl",
-        "rev": "d34d9412556d3a896e294534ccd25f53b6822e80",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixos-wsl",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1726042813,
@@ -2121,54 +724,7 @@
         "type": "github"
       }
     },
-    "nixpkgs-alsa-ucm-conf": {
-      "locked": {
-        "lastModified": 1749323015,
-        "narHash": "sha256-MpuMl8wNyFgKV+CuQINuQeZFJdTSVMPZeKA98qjeyTQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "eb11defad7ffc4724a3ac4308cc2c970aaa9a397",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "pull/414818/head",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-latest": {
-      "locked": {
-        "lastModified": 1752250779,
-        "narHash": "sha256-bCYMUyfHfGL8+4rNxWJARawldVUzD2Zs/7bt5yIQqSE=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "a4fd72001ab44553fe601934a350ac5bcfea4f79",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "master",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
-      "locked": {
-        "lastModified": 1751159883,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nixpkgs.lib",
-        "type": "github"
-      }
-    },
-    "nixpkgs-lib_2": {
       "locked": {
         "lastModified": 1748740939,
         "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
@@ -2183,22 +739,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-riscv": {
-      "locked": {
-        "lastModified": 1752147015,
-        "narHash": "sha256-zbIPkITzVBBMhnq94BFmgP94q8bJUvCg7CDjExXE9v4=",
-        "owner": "nickcao",
-        "repo": "nixpkgs",
-        "rev": "89f754dba710fec148bbadc26bef047f542345ce",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nickcao",
-        "ref": "riscv",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1724316499,
@@ -2215,38 +755,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-stable_2": {
-      "locked": {
-        "lastModified": 1751943650,
-        "narHash": "sha256-7orTnNqkGGru8Je6Un6mq1T8YVVU/O5kyW4+f9C1mZQ=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "88983d4b665fb491861005137ce2b11a9f89f203",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.05",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs-unstable-small": {
-      "locked": {
-        "lastModified": 1752206449,
-        "narHash": "sha256-NVAbC/s4CupABWGXF8M9mDiVw/n0YCftxwc1KatVjDk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "1bd4d0d4a678d48b63eb18f457d74df2fcee6c69",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-unstable-small",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1751792365,
@@ -2273,7 +781,7 @@
           "stylix",
           "nixpkgs"
         ],
-        "treefmt-nix": "treefmt-nix_3"
+        "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
         "lastModified": 1748730660,
@@ -2289,35 +797,6 @@
         "type": "github"
       }
     },
-    "nvfetcher": {
-      "inputs": {
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1732501185,
-        "narHash": "sha256-Z0BpHelaGQsE5VD9hBsBHsvMU9h+Xt0kfkDJyFivZOU=",
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "rev": "bdb14eab6fe9cefc29efe01e60c3a3f616d6b62a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "type": "github"
-      }
-    },
     "ooye": {
       "inputs": {
         "nixpkgs": [
@@ -2338,171 +817,6 @@
         "url": "https://cgit.rory.gay/nix/OOYE-module.git"
       }
     },
-    "oranc": {
-      "inputs": {
-        "crane": [
-          "sdm845",
-          "crane"
-        ],
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749832097,
-        "narHash": "sha256-sYE9bwbQmu59c/q9EkyDWVMv1TV81ffqKtmSVA0FxQQ=",
-        "owner": "linyinfeng",
-        "repo": "oranc",
-        "rev": "37fae71d906cef862624af405e2b539d20dc5ce7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "oranc",
-        "type": "github"
-      }
-    },
-    "pastebin": {
-      "inputs": {
-        "flake-parts": [
-          "sdm845",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752251249,
-        "narHash": "sha256-pdZpB2OcfzfUGfz5yPA8bfMeVDfJ16n9gdUKGfhYU3w=",
-        "owner": "linyinfeng",
-        "repo": "pastebin",
-        "rev": "a611ded8ebc420e47922462b88e5e312fdf6b900",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "pastebin",
-        "type": "github"
-      }
-    },
-    "pmaports": {
-      "flake": false,
-      "locked": {
-        "host": "gitlab.postmarketos.org",
-        "lastModified": 1752231397,
-        "narHash": "sha256-ttjVpoDehT5r/79BAhGxfy9ZPSC4uKsT4nz9Q57F/dc=",
-        "owner": "postmarketOS",
-        "repo": "pmaports",
-        "rev": "3620e3713e047f3a7c56d54ac8de135434548ebe",
-        "type": "gitlab"
-      },
-      "original": {
-        "host": "gitlab.postmarketos.org",
-        "owner": "postmarketOS",
-        "repo": "pmaports",
-        "type": "gitlab"
-      }
-    },
-    "poetry2nix": {
-      "inputs": {
-        "flake-utils": [
-          "sdm845",
-          "flake-utils"
-        ],
-        "nix-github-actions": [
-          "sdm845",
-          "nix-github-actions"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ],
-        "systems": [
-          "sdm845",
-          "systems"
-        ],
-        "treefmt-nix": [
-          "sdm845",
-          "treefmt-nix"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743690424,
-        "narHash": "sha256-cX98bUuKuihOaRp8dNV1Mq7u6/CQZWTPth2IJPATBXc=",
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "rev": "ce2369db77f45688172384bbeb962bc6c2ea6f94",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "poetry2nix",
-        "type": "github"
-      }
-    },
-    "pre-commit-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "sdm845",
-          "flake-compat"
-        ],
-        "gitignore": [
-          "sdm845",
-          "gitignore-nix"
-        ],
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1750779888,
-        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "pre-commit-hooks.nix",
-        "type": "github"
-      }
-    },
-    "preservation": {
-      "locked": {
-        "lastModified": 1751384068,
-        "narHash": "sha256-xGq+Om1ReXcQy6h57yj9V5nOM84g/GBJ3m6oxe1a3js=",
-        "owner": "nix-community",
-        "repo": "preservation",
-        "rev": "286737ba485f30c1687c833e66f5901a6c8dc019",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "preservation",
-        "type": "github"
-      }
-    },
     "programsdb": {
       "inputs": {
         "nixpkgs": [
@@ -2547,7 +861,6 @@
         "agenix-cli": "agenix-cli",
         "disko": "disko",
         "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts",
         "grapevine": "grapevine",
         "home-manager": "home-manager_2",
         "matrixoidc": "matrixoidc",
@@ -2557,7 +870,6 @@
         "ooye": "ooye",
         "programsdb": "programsdb",
         "run0-sudo-shim": "run0-sudo-shim",
-        "sdm845": "sdm845",
         "stylix": "stylix",
         "wrapper-manager": "wrapper-manager"
       }
@@ -2603,23 +915,6 @@
         "type": "github"
       }
     },
-    "rust-analyzer-src_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1752182378,
-        "narHash": "sha256-bKzsGh+1AWSpL2Q2/0FKgNchTJOmYpQH2BS9dCyKXaI=",
-        "owner": "rust-lang",
-        "repo": "rust-analyzer",
-        "rev": "e2c8cefa63bd4cafb66978867c0f1ec2ba14bb03",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rust-lang",
-        "ref": "nightly",
-        "repo": "rust-analyzer",
-        "type": "github"
-      }
-    },
     "rust-overlay": {
       "inputs": {
         "nixpkgs": [
@@ -2641,131 +936,6 @@
         "type": "github"
       }
     },
-    "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752201818,
-        "narHash": "sha256-d8KczaVT8WFEZdWg//tMAbv8EDyn2YTWcJvSY8gqKBU=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "bd8f8329780b348fedcd37b53dbbee48c08c496d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "sdm845": {
-      "inputs": {
-        "ace-bot": "ace-bot",
-        "angrr": "angrr",
-        "blank": "blank",
-        "cachix": "cachix",
-        "commit-notifier": "commit-notifier",
-        "conf2nix": "conf2nix",
-        "crane": "crane_3",
-        "crate2nix": "crate2nix",
-        "deploy-rs": "deploy-rs",
-        "devshell": "devshell_2",
-        "disko": "disko_2",
-        "emacs-overlay": "emacs-overlay",
-        "fenix": "fenix_2",
-        "flake-compat": "flake-compat_5",
-        "flake-parts": "flake-parts_4",
-        "flake-schemas": "flake-schemas",
-        "flake-utils": "flake-utils_4",
-        "flake-utils-plus": "flake-utils-plus",
-        "flat-flake": "flat-flake",
-        "git-hooks-nix": "git-hooks-nix",
-        "gitignore-nix": "gitignore-nix",
-        "haumea": "haumea",
-        "home-manager": "home-manager_3",
-        "kukui-nixos": "kukui-nixos",
-        "lantian": "lantian",
-        "lanzaboote": "lanzaboote",
-        "linyinfeng": "linyinfeng",
-        "mc-config": "mc-config",
-        "mc-config-nuc": "mc-config-nuc",
-        "minecraft-json": "minecraft-json",
-        "minecraft-nix": "minecraft-nix",
-        "mobile-nixos": "mobile-nixos",
-        "naersk": "naersk",
-        "niri-flake": "niri-flake",
-        "nix-alien": "nix-alien",
-        "nix-filter": "nix-filter_2",
-        "nix-gc-s3": "nix-gc-s3",
-        "nix-github-actions": "nix-github-actions_3",
-        "nix-index-database": "nix-index-database",
-        "nix-topology": "nix-topology",
-        "nixago": "nixago",
-        "nixago-exts": "nixago-exts",
-        "nixos-cn": "nixos-cn",
-        "nixos-generators": "nixos-generators",
-        "nixos-hardware": "nixos-hardware",
-        "nixos-vscode-server": "nixos-vscode-server",
-        "nixos-wsl": "nixos-wsl",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-latest": "nixpkgs-latest",
-        "nixpkgs-riscv": "nixpkgs-riscv",
-        "nixpkgs-stable": "nixpkgs-stable_2",
-        "nixpkgs-unstable-small": "nixpkgs-unstable-small",
-        "nvfetcher": "nvfetcher",
-        "oranc": "oranc",
-        "pastebin": "pastebin",
-        "pmaports": "pmaports",
-        "poetry2nix": "poetry2nix",
-        "pre-commit-hooks-nix": "pre-commit-hooks-nix",
-        "preservation": "preservation",
-        "rust-overlay": "rust-overlay_2",
-        "sops-nix": "sops-nix",
-        "systems": "systems_5",
-        "treefmt-nix": "treefmt-nix_2",
-        "weird-deployer": "weird-deployer"
-      },
-      "locked": {
-        "lastModified": 1752251688,
-        "narHash": "sha256-u2hG3OGbZnhDNliMdWk5iGXRS5q6/XLLhvBCN7Fi/jE=",
-        "owner": "linyinfeng",
-        "repo": "dotfiles",
-        "rev": "0662e5ab50c35541d0b56cf5b568ca3c940b52bf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "dotfiles",
-        "type": "github"
-      }
-    },
-    "sops-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1751606940,
-        "narHash": "sha256-KrDPXobG7DFKTOteqdSVeL1bMVitDcy7otpVZWDE6MA=",
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "rev": "3633fc4acf03f43b260244d94c71e9e14a2f6e0d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "sops-nix",
-        "type": "github"
-      }
-    },
     "stylix": {
       "inputs": {
         "base16": "base16",
@@ -2773,13 +943,13 @@
         "base16-helix": "base16-helix",
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme_2",
-        "flake-parts": "flake-parts_5",
+        "flake-parts": "flake-parts_3",
         "gnome-shell": "gnome-shell",
         "nixpkgs": [
           "nixpkgs"
         ],
         "nur": "nur",
-        "systems": "systems_6",
+        "systems": "systems_5",
         "tinted-foot": "tinted-foot",
         "tinted-kitty": "tinted-kitty",
         "tinted-schemes": "tinted-schemes",
@@ -2875,21 +1045,6 @@
         "type": "github"
       }
     },
-    "systems_6": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tinted-foot": {
       "flake": false,
       "locked": {
@@ -2993,27 +1148,6 @@
       }
     },
     "treefmt-nix_2": {
-      "inputs": {
-        "nixpkgs": [
-          "sdm845",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752055615,
-        "narHash": "sha256-19m7P4O/Aw/6+CzncWMAJu89JaKeMh3aMle1CNQSIwM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "c9d477b5d5bd7f26adddd3f96cfd6a904768d4f9",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "treefmt-nix_3": {
       "inputs": {
         "nixpkgs": [
           "stylix",
@@ -3050,21 +1184,6 @@
         "type": "github"
       }
     },
-    "weird-deployer": {
-      "locked": {
-        "lastModified": 1728549622,
-        "narHash": "sha256-gsTCrF5McQgrZkstusw0Qg7+BEdUIYm44gQdSqOi7mw=",
-        "owner": "linyinfeng",
-        "repo": "weird-deployer",
-        "rev": "cbab86e054a686024e2c6ef03f64d0e89e183e56",
-        "type": "github"
-      },
-      "original": {
-        "owner": "linyinfeng",
-        "repo": "weird-deployer",
-        "type": "github"
-      }
-    },
     "wrapper-manager": {
       "locked": {
         "lastModified": 1750605920,
@@ -3079,39 +1198,6 @@
         "repo": "wrapper-manager",
         "type": "github"
       }
-    },
-    "xwayland-satellite-stable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1748488455,
-        "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "ref": "v0.6",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
-    },
-    "xwayland-satellite-unstable": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751228685,
-        "narHash": "sha256-MENtauGBhJ+kDeFaawvWGXaFG3Il6qQzjaP0RmtfM0k=",
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "rev": "557ebeb616e03d5e4a8049862bbbd1f02c6f020b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Supreeeme",
-        "repo": "xwayland-satellite",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 6b6569f..d1bd7b1 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,11 +2,14 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
     wrapper-manager.url = "github:viperML/wrapper-manager";
-    flake-parts.url = "github:hercules-ci/flake-parts";
     disko = {
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    firefox-gnome-theme = {
+      url = "github:rafaelmardojai/firefox-gnome-theme";
+      flake = false;
+    };
     run0-sudo-shim = {
       url = "github:lordgrimmauld/run0-sudo-shim";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -51,14 +54,6 @@
       url = "github:nix-community/nh";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    firefox-gnome-theme = {
-      url = "github:rafaelmardojai/firefox-gnome-theme";
-      flake = false;
-    };
-    sdm845 = {
-      url = "github:linyinfeng/dotfiles";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs = inputs: let
@@ -67,9 +62,9 @@
       opt = lib.optionals;
       dirFiles = type: dir: lib.filter (lib.hasSuffix type) (lib.filesystem.listFilesRecursive dir);
     };
-    system = hostname: isDesktop: arch:
+    system = hostname: isDesktop:
       lib.nixosSystem {
-        system = "${arch}-linux";
+        system = "x86_64-linux";
         specialArgs = {
           inherit inputs isDesktop dirUtils;
         };
@@ -93,22 +88,13 @@
             ]
           );
       };
-  in
-    inputs.flake-parts.lib.mkFlake {inherit inputs;} {
-      systems = ["aarch64-linux" "x86_64-linux"];
-
-      perSystem = {pkgs, ...}: {
-        formatter = pkgs.alejandra;
-      };
-
-      flake.nixosConfigurations = builtins.mapAttrs (name: value: system name value.isDesktop value.arch or "x86_64") {
-        "quadraticserver".isDesktop = false;
-        "quadraticpc".isDesktop = true;
-        "quadtop".isDesktop = true;
-        "quadphone" = {
-          isDesktop = true;
-          arch = "aarch64";
-        };
-      };
+  in {
+    nixosConfigurations = builtins.mapAttrs (name: value: system name value) {
+      "quadraticserver" = false;
+      "quadraticpc" = true;
+      "quadtop" = true;
     };
+
+    formatter.x86_64-linux = inputs.nixpkgs.legacyPackages.x86_64-linux.alejandra;
+  };
 }
diff --git a/modules/graphical/dconf/burn-my-windows.conf b/modules/desktop/dconf/burn-my-windows.conf
similarity index 100%
rename from modules/graphical/dconf/burn-my-windows.conf
rename to modules/desktop/dconf/burn-my-windows.conf
diff --git a/modules/graphical/dconf/default.nix b/modules/desktop/dconf/default.nix
similarity index 100%
rename from modules/graphical/dconf/default.nix
rename to modules/desktop/dconf/default.nix
diff --git a/modules/graphical/desktop.nix b/modules/desktop/desktop.nix
similarity index 100%
rename from modules/graphical/desktop.nix
rename to modules/desktop/desktop.nix
diff --git a/modules/desktop/flatpak.nix b/modules/desktop/flatpak.nix
new file mode 100644
index 0000000..1ff0c53
--- /dev/null
+++ b/modules/desktop/flatpak.nix
@@ -0,0 +1,3 @@
+{
+  services.flatpak.enable = true;
+}
diff --git a/modules/graphical/fonts.nix b/modules/desktop/fonts.nix
similarity index 100%
rename from modules/graphical/fonts.nix
rename to modules/desktop/fonts.nix
diff --git a/modules/graphical/gnome.nix b/modules/desktop/gnome.nix
similarity index 100%
rename from modules/graphical/gnome.nix
rename to modules/desktop/gnome.nix
diff --git a/modules/graphical/goldwarden.nix b/modules/desktop/goldwarden.nix
similarity index 100%
rename from modules/graphical/goldwarden.nix
rename to modules/desktop/goldwarden.nix
diff --git a/modules/graphical/graphics.nix b/modules/desktop/graphics.nix
similarity index 100%
rename from modules/graphical/graphics.nix
rename to modules/desktop/graphics.nix
diff --git a/modules/graphical/librewolf/customChrome.css b/modules/desktop/librewolf/customChrome.css
similarity index 100%
rename from modules/graphical/librewolf/customChrome.css
rename to modules/desktop/librewolf/customChrome.css
diff --git a/modules/graphical/librewolf/customContent.css b/modules/desktop/librewolf/customContent.css
similarity index 100%
rename from modules/graphical/librewolf/customContent.css
rename to modules/desktop/librewolf/customContent.css
diff --git a/modules/graphical/librewolf/default.nix b/modules/desktop/librewolf/default.nix
similarity index 100%
rename from modules/graphical/librewolf/default.nix
rename to modules/desktop/librewolf/default.nix
diff --git a/modules/desktop/mac.nix b/modules/desktop/mac.nix
new file mode 100644
index 0000000..fa89906
--- /dev/null
+++ b/modules/desktop/mac.nix
@@ -0,0 +1,3 @@
+{
+  networking.networkmanager.wifi.macAddress = "random";
+}
diff --git a/modules/graphical/noisetorch.nix b/modules/desktop/noisetorch.nix
similarity index 100%
rename from modules/graphical/noisetorch.nix
rename to modules/desktop/noisetorch.nix
diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix
index 8afc6ab..f9c39af 100644
--- a/modules/desktop/packages.nix
+++ b/modules/desktop/packages.nix
@@ -1,11 +1,27 @@
 {pkgs, ...}: {
+  services.xserver.excludePackages = [pkgs.xterm];
   environment.systemPackages = with pkgs; [
+    tuba
     gimp
+    deno
     heroic
+    aspell
+    ptyxis
+    muzika
+    foliate
+    gapless
     inkscape
     r2modman
+    pciutils
+    resources
     libreoffice
+    wl-clipboard
+    google-cursor
     prismlauncher
+    authenticator
+    cinny-desktop
+    papirus-icon-theme
     nexusmods-app-unfree
+    hunspellDicts.en_CA-large
   ];
 }
diff --git a/modules/graphical/pipewire.nix b/modules/desktop/pipewire.nix
similarity index 100%
rename from modules/graphical/pipewire.nix
rename to modules/desktop/pipewire.nix
diff --git a/modules/graphical/plymouth.nix b/modules/desktop/plymouth.nix
similarity index 100%
rename from modules/graphical/plymouth.nix
rename to modules/desktop/plymouth.nix
diff --git a/modules/desktop/polkit.nix b/modules/desktop/polkit.nix
new file mode 100644
index 0000000..ed10ae6
--- /dev/null
+++ b/modules/desktop/polkit.nix
@@ -0,0 +1,20 @@
+{pkgs, ...}: {
+  environment.systemPackages = [
+    (pkgs.writeTextDir "share/polkit-1/actions/com.henryhiles.quados.policy" ''
+      <!DOCTYPE policyconfig PUBLIC '-//freedesktop//DTD PolicyKit Policy Configuration 1.0//EN' 'http://www.freedesktop.org/standards/PolicyKit/1/policyconfig.dtd'>
+
+      <policyconfig>
+        <action id='com.henryhiles.quados.rebuild'>
+          <description>Rebuild</description>
+          <message>Authentication is required to rebuild the system</message>
+          <defaults>
+            <allow_any>auth_admin_keep</allow_any>
+            <allow_inactive>auth_admin_keep</allow_inactive>
+            <allow_active>auth_admin_keep</allow_active>
+          </defaults>
+          <annotate key='org.freedesktop.policykit.exec.path'>/home/quadradical/.local/bin/rebuildExec</annotate>
+        </action>
+      </policyconfig>
+    '')
+  ];
+}
diff --git a/modules/graphical/print.nix b/modules/desktop/print.nix
similarity index 100%
rename from modules/graphical/print.nix
rename to modules/desktop/print.nix
diff --git a/modules/graphical/run0.nix b/modules/desktop/run0.nix
similarity index 100%
rename from modules/graphical/run0.nix
rename to modules/desktop/run0.nix
diff --git a/modules/graphical/ssh.nix b/modules/desktop/ssh.nix
similarity index 100%
rename from modules/graphical/ssh.nix
rename to modules/desktop/ssh.nix
diff --git a/modules/graphical/mac.nix b/modules/graphical/mac.nix
deleted file mode 100644
index c50fb99..0000000
--- a/modules/graphical/mac.nix
+++ /dev/null
@@ -1 +0,0 @@
-{networking.networkmanager.wifi.macAddress = "random";}
diff --git a/modules/graphical/packages.nix b/modules/graphical/packages.nix
deleted file mode 100644
index 18d8caf..0000000
--- a/modules/graphical/packages.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{pkgs, ...}: {
-  services.xserver.excludePackages = [pkgs.xterm];
-  environment.systemPackages = with pkgs; [
-    tuba
-    ptyxis
-    gapless
-    resources
-    wl-clipboard
-    google-cursor
-    authenticator
-    cinny-desktop
-    papirus-icon-theme
-  ];
-}
diff --git a/packages/kernel.nix b/packages/kernel.nix
deleted file mode 100644
index 39cdd89..0000000
--- a/packages/kernel.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  buildLinux,
-  fetchFromGitLab,
-  ...
-} @ args: let
-  src = fetchFromGitLab {
-    owner = "sdm845-mainline";
-    repo = "linux";
-    rev = "sdm845/6.16-dev";
-    hash = "sha256-Nu7BwSl40Ytm7nCzyctNed7nqwq7NcVVxHLF3KFMKC4=";
-  };
-  version = "${rec {
-    file = "${src}/Makefile";
-    version = toString (builtins.match ".+VERSION = ([0-9]+).+" (builtins.readFile file));
-    patchlevel = toString (builtins.match ".+PATCHLEVEL = ([0-9]+).+" (builtins.readFile file));
-    sublevel = toString (builtins.match ".+SUBLEVEL = ([0-9]+).+" (builtins.readFile file));
-    extraversion = toString (builtins.match ".+EXTRAVERSION = ([a-z0-9-]+).+" (builtins.readFile file));
-    string = "${version + "." + patchlevel + "." + sublevel + (lib.optionalString (extraversion != "") extraversion)}";
-  }.string}";
-in (buildLinux (
-  args
-  // {
-    inherit src version;
-    modDirVersion = version;
-    extraMeta = {
-      platforms = ["aarch64-linux"];
-      hydraPlatforms = [""];
-    };
-  }
-  // (args.argsOverride or {})
-))