diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index fe1447a6..00000000
--- a/.editorconfig
+++ /dev/null
@@ -1,11 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.lua]
-indent_type = Spaces
-indent_width = 2
-call_parentheses = NoSingleTable
diff --git a/flake.lock b/flake.lock
index 027bf8f3..6cca4faf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,38 +1,5 @@
 {
   "nodes": {
-    "aquamarine": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "hyprwayland-scanner": [
-          "hyprland",
-          "hyprwayland-scanner"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722347739,
-        "narHash": "sha256-rAoh+K6KG+b1DwSWtqRVocdojnH6nGk6q07mNltoUSM=",
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "rev": "7c3565f9bedc7cb601cc0baa14792247e4dc1d5a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "aquamarine",
-        "type": "github"
-      }
-    },
     "crane": {
       "inputs": {
         "nixpkgs": [
@@ -54,56 +21,6 @@
         "type": "github"
       }
     },
-    "emacs-overlay": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1718416383,
-        "narHash": "sha256-aM9MIuNE7v/vDAuPkYdjHXxfpDzyCYomWgHaqQE8dZ0=",
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "rev": "9a4bbb3e6b3a1f7c4f870c2906d404d16f65bc44",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "emacs-overlay",
-        "type": "github"
-      }
-    },
-    "envfs": {
-      "inputs": {
-        "flake-parts": [
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1716853897,
-        "narHash": "sha256-vZixjUtN4zQr117r26/Q+0fivtG3AYOc8zKjZPoV/mw=",
-        "owner": "Mic92",
-        "repo": "envfs",
-        "rev": "5644572b4567e8ebecae28525f953bcb71fbf481",
-        "type": "github"
-      },
-      "original": {
-        "owner": "Mic92",
-        "repo": "envfs",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -138,45 +55,6 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712014858,
-        "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
-    "flake-parts_3": {
-      "inputs": {
-        "nixpkgs-lib": "nixpkgs-lib_3"
-      },
-      "locked": {
-        "lastModified": 1717285511,
-        "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": "systems"
@@ -195,55 +73,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
-    "git-hooks-nix": {
-      "inputs": {
-        "flake-compat": [
-          "nix"
-        ],
-        "gitignore": [
-          "nix"
-        ],
-        "nixpkgs": [
-          "nix",
-          "nixpkgs"
-        ],
-        "nixpkgs-stable": [
-          "nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1723803910,
-        "narHash": "sha256-yezvUuFiEnCFbGuwj/bQcqg7RykIEqudOy/RBrId0pc=",
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "rev": "bfef0ada09e2c8ac55bbcd0831bd0c9d42e651ba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "cachix",
-        "repo": "git-hooks.nix",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -266,50 +95,6 @@
         "type": "github"
       }
     },
-    "home-manager": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1718243258,
-        "narHash": "sha256-abBpj2VU8p6qlRzTU8o22q68MmOaZ4v8zZ4UlYl5YRU=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "8d5e27b4807d25308dfe369d5a923d87e7dbfda3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager-wsl": {
-      "inputs": {
-        "home-manager": [
-          "home-manager"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1672329409,
-        "narHash": "sha256-T+xgeOGwbltviUk10QOFprEcgRClCrmO70Xwt41zfDc=",
-        "owner": "viperML",
-        "repo": "home-manager-wsl",
-        "rev": "0a8404d74b82e0b01cd9ea00167eff25365dd34d",
-        "type": "github"
-      },
-      "original": {
-        "owner": "viperML",
-        "repo": "home-manager-wsl",
-        "type": "github"
-      }
-    },
     "hover-rs": {
       "inputs": {
         "nixpkgs": [
@@ -330,169 +115,6 @@
         "type": "github"
       }
     },
-    "hyprcursor": {
-      "inputs": {
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721330371,
-        "narHash": "sha256-aYlHTWylczLt6ERJyg6E66Y/XSCbVL7leVcRuJmVbpI=",
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "rev": "4493a972b48f9c3014befbbf381ed5fff91a65dc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprcursor",
-        "type": "github"
-      }
-    },
-    "hyprland": {
-      "inputs": {
-        "aquamarine": "aquamarine",
-        "hyprcursor": "hyprcursor",
-        "hyprlang": "hyprlang",
-        "hyprutils": "hyprutils",
-        "hyprwayland-scanner": "hyprwayland-scanner",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "systems": "systems_2",
-        "xdph": "xdph"
-      },
-      "locked": {
-        "lastModified": 1723058230,
-        "narHash": "sha256-G39pjU/wdTlhsuaMtwYyhrwyZowoXxN1n7F6up3q4sI=",
-        "owner": "hyprwm",
-        "repo": "Hyprland",
-        "rev": "9a09eac79b85c846e3a865a9078a3f8ff65a9259",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "ref": "v0.42.0",
-        "repo": "Hyprland",
-        "type": "github"
-      }
-    },
-    "hyprland-protocols": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "xdph",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "xdph",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721326555,
-        "narHash": "sha256-zCu4R0CSHEactW9JqYki26gy8h9f6rHmSwj4XJmlHgg=",
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "rev": "5a11232266bf1a1f5952d5b179c3f4b2facaaa84",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprland-protocols",
-        "type": "github"
-      }
-    },
-    "hyprlang": {
-      "inputs": {
-        "hyprutils": [
-          "hyprland",
-          "hyprutils"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721324361,
-        "narHash": "sha256-BiJKO0IIdnSwHQBSrEJlKlFr753urkLE48wtt0UhNG4=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "adbefbf49664a6c2c8bf36b6487fd31e3eb68086",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "type": "github"
-      }
-    },
-    "hyprutils": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722098849,
-        "narHash": "sha256-D3wIZlBNh7LuZ0NaoCpY/Pvu+xHxIVtSN+KkWZYvvVs=",
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "rev": "5dcbbc1e3de40b2cecfd2007434d86e924468f1f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprutils",
-        "type": "github"
-      }
-    },
-    "hyprwayland-scanner": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1721324119,
-        "narHash": "sha256-SOOqIT27/X792+vsLSeFdrNTF+OSRp5qXv6Te+fb2Qg=",
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "rev": "a048a6cb015340bd82f97c1f40a4b595ca85cc30",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "hyprwayland-scanner",
-        "type": "github"
-      }
-    },
     "lanzaboote": {
       "inputs": {
         "crane": "crane",
@@ -526,23 +148,6 @@
         "type": "github"
       }
     },
-    "libgit2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1715853528,
-        "narHash": "sha256-J2rCxTecyLbbDdsyBWn9w7r3pbKRMkI9E7RvRgAqBdY=",
-        "owner": "libgit2",
-        "repo": "libgit2",
-        "rev": "36f7e21ad757a3dacc58cf7944329da6bc1d6e96",
-        "type": "github"
-      },
-      "original": {
-        "owner": "libgit2",
-        "ref": "v1.8.1",
-        "repo": "libgit2",
-        "type": "github"
-      }
-    },
     "nh": {
       "inputs": {
         "nixpkgs": [
@@ -563,35 +168,6 @@
         "type": "github"
       }
     },
-    "nix": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-parts": "flake-parts_2",
-        "git-hooks-nix": "git-hooks-nix",
-        "libgit2": "libgit2",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nixpkgs-23-11": "nixpkgs-23-11",
-        "nixpkgs-regression": "nixpkgs-regression"
-      },
-      "locked": {
-        "lastModified": 1723122168,
-        "narHash": "sha256-ne4/57E2hOeBIc4yIJkm5JDIPtAaRvkDPkKj7pJ5fhg=",
-        "owner": "NixOS",
-        "repo": "nix",
-        "rev": "4036c3aafb7a6c4c625e68cc14acf6b529be2cb2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "2.24.2",
-        "repo": "nix",
-        "type": "github"
-      }
-    },
     "nix-common": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib_2"
@@ -625,27 +201,6 @@
         "type": "github"
       }
     },
-    "nix-gaming": {
-      "inputs": {
-        "flake-parts": "flake-parts_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1718328127,
-        "narHash": "sha256-2ldscRIlStuv/fRmifXbvjlMpyVuy8Z9zhiDBRM6oe0=",
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "rev": "2c9a664875b410d12282fed9043f4703b6fdb029",
-        "type": "github"
-      },
-      "original": {
-        "owner": "fufexan",
-        "repo": "nix-gaming",
-        "type": "github"
-      }
-    },
     "nix-index-database": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -721,22 +276,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-23-11": {
-      "locked": {
-        "lastModified": 1717159533,
-        "narHash": "sha256-oamiKNfr2MS6yH64rUn99mIZjc45nGJlj9eGth/3Xuw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "a62e6edd6d5e1fa0329b8653c801147986f8d446",
-        "type": "github"
-      }
-    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1717284937,
@@ -767,34 +306,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-lib_3": {
-      "locked": {
-        "lastModified": 1717284937,
-        "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=",
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
-      },
-      "original": {
-        "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz"
-      }
-    },
-    "nixpkgs-regression": {
-      "locked": {
-        "lastModified": 1643052045,
-        "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1710695816,
@@ -847,33 +358,6 @@
         "type": "github"
       }
     },
-    "nvfetcher": {
-      "inputs": {
-        "flake-compat": [
-          "flake-compat"
-        ],
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1692371809,
-        "narHash": "sha256-McJd+9TM//Hp2EWx4AZtVBsELdi6hvsC19uabRRrqv8=",
-        "owner": "berberman",
-        "repo": "nvfetcher",
-        "rev": "8ca17d561bd47d46f866daa04194dbe34692a966",
-        "type": "github"
-      },
-      "original": {
-        "owner": "berberman",
-        "ref": "0.6.2",
-        "repo": "nvfetcher",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks-nix": {
       "inputs": {
         "flake-compat": [
@@ -903,30 +387,21 @@
     },
     "root": {
       "inputs": {
-        "emacs-overlay": "emacs-overlay",
-        "envfs": "envfs",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
-        "home-manager": "home-manager",
-        "home-manager-wsl": "home-manager-wsl",
         "hover-rs": "hover-rs",
-        "hyprland": "hyprland",
         "lanzaboote": "lanzaboote",
         "nh": "nh",
-        "nix": "nix",
         "nix-common": "nix-common",
         "nix-filter": "nix-filter",
-        "nix-gaming": "nix-gaming",
         "nix-index-database": "nix-index-database",
         "nix-ld": "nix-ld",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "noshell": "noshell",
-        "nvfetcher": "nvfetcher",
         "sops-nix": "sops-nix",
         "tree-sitter": "tree-sitter",
-        "vscode-server": "vscode-server",
         "wrapper-manager": "wrapper-manager"
       }
     },
@@ -993,36 +468,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tree-sitter": {
       "inputs": {
         "flake-parts": [
@@ -1046,48 +491,6 @@
         "type": "github"
       }
     },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "envfs",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1710781103,
-        "narHash": "sha256-nehQK/XTFxfa6rYKtbi8M1w+IU1v5twYhiyA4dg1vpg=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "7ee5aaac63c30d3c97a8c56efe89f3b2aa9ae564",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
-    "vscode-server": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1713958148,
-        "narHash": "sha256-8PDNi/dgoI2kyM7uSiU4eoLBqUKoA+3TXuz+VWmuCOc=",
-        "owner": "msteen",
-        "repo": "nixos-vscode-server",
-        "rev": "fc900c16efc6a5ed972fb6be87df018bcf3035bc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "msteen",
-        "repo": "nixos-vscode-server",
-        "type": "github"
-      }
-    },
     "wrapper-manager": {
       "inputs": {
         "nixpkgs": [
@@ -1107,36 +510,6 @@
         "repo": "wrapper-manager",
         "type": "github"
       }
-    },
-    "xdph": {
-      "inputs": {
-        "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": [
-          "hyprland",
-          "hyprlang"
-        ],
-        "nixpkgs": [
-          "hyprland",
-          "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1722365976,
-        "narHash": "sha256-Khdm+mDzYA//XaU0M+hftod+rKr5q9SSHSEuiQ0/9ow=",
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "rev": "7f2a77ddf60390248e2a3de2261d7102a13e5341",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hyprwm",
-        "repo": "xdg-desktop-portal-hyprland",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 03c33d4b..0710682d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -29,18 +29,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nix = {
-      url = "github:NixOS/nix/2.24.2";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-
-    home-manager-wsl = {
-      url = "github:viperML/home-manager-wsl";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
-
     flake-compat = {
       url = "github:edolstra/flake-compat";
       flake = false;
@@ -48,42 +36,9 @@
     flake-utils = {
       url = "github:numtide/flake-utils";
     };
-    home-manager = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-gaming = {
-      url = "github:fufexan/nix-gaming";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nix-index-database = {
       url = "github:Mic92/nix-index-database";
     };
-    vscode-server = {
-      url = "github:msteen/nixos-vscode-server";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nvfetcher = {
-      url = "github:berberman/nvfetcher/0.6.2";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-    envfs = {
-      url = "github:Mic92/envfs";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
-    emacs-overlay = {
-      url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-    hyprland = {
-      url = "github:hyprwm/Hyprland/v0.42.0";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nix-ld = {
       url = "github:nix-community/nix-ld-rs";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -113,4 +68,4 @@
       url = "github:NixOS/nixos-hardware";
     };
   };
-}
\ No newline at end of file
+}
diff --git a/flake/.envrc b/flake/.envrc
deleted file mode 100644
index 674a1b8d..00000000
--- a/flake/.envrc
+++ /dev/null
@@ -1,6 +0,0 @@
-# shellcheck shell=bash
-source_env_if_exists ../.envrc
-
-use flake .#flake
-export RUST_BACKTRACE=1
-export RUST_LOG=dotci=trace
diff --git a/flake/Cargo.lock b/flake/Cargo.lock
deleted file mode 100644
index bbf6b7c9..00000000
--- a/flake/Cargo.lock
+++ /dev/null
@@ -1,1562 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "addr2line"
-version = "0.20.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
-
-[[package]]
-name = "aho-corasick"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43f6cb1bf222025340178f382c426f13757b2960e89779dfcb319c32542a5a41"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "anstream"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
-dependencies = [
- "anstyle",
- "anstyle-parse",
- "anstyle-query",
- "anstyle-wincon",
- "colorchoice",
- "is-terminal",
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
-
-[[package]]
-name = "anstyle-parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
-dependencies = [
- "utf8parse",
-]
-
-[[package]]
-name = "anstyle-query"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "anstyle-wincon"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
-dependencies = [
- "anstyle",
- "windows-sys",
-]
-
-[[package]]
-name = "async-trait"
-version = "0.1.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "backtrace"
-version = "0.3.68"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
-dependencies = [
- "addr2line",
- "cc",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
-]
-
-[[package]]
-name = "base64"
-version = "0.21.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
-
-[[package]]
-name = "block-buffer"
-version = "0.10.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.13.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
-
-[[package]]
-name = "bytes"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
-
-[[package]]
-name = "cc"
-version = "1.0.79"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "clap"
-version = "4.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d"
-dependencies = [
- "clap_builder",
- "clap_derive",
- "once_cell",
-]
-
-[[package]]
-name = "clap_builder"
-version = "4.3.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1"
-dependencies = [
- "anstream",
- "anstyle",
- "clap_lex",
- "strsim",
-]
-
-[[package]]
-name = "clap_derive"
-version = "4.3.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
-dependencies = [
- "heck",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "clap_lex"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
-
-[[package]]
-name = "colorchoice"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-
-[[package]]
-name = "cpufeatures"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
-dependencies = [
- "block-buffer",
- "crypto-common",
-]
-
-[[package]]
-name = "dotci"
-version = "0.1.0"
-dependencies = [
- "async-trait",
- "clap",
- "eyre",
- "futures",
- "handlebars",
- "once_cell",
- "regex",
- "reqwest",
- "serde",
- "serde_json",
- "tokio",
- "tracing",
- "tracing-subscriber",
-]
-
-[[package]]
-name = "encoding_rs"
-version = "0.8.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "071a31f4ee85403370b58aca746f01041ede6f0da2730960ad001edc2b71b394"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "errno"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
-dependencies = [
- "errno-dragonfly",
- "libc",
- "windows-sys",
-]
-
-[[package]]
-name = "errno-dragonfly"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-dependencies = [
- "cc",
- "libc",
-]
-
-[[package]]
-name = "eyre"
-version = "0.6.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c2b6b5a29c02cdc822728b7d7b8ae1bab3e3b05d44522770ddd49722eeac7eb"
-dependencies = [
- "indenter",
- "once_cell",
-]
-
-[[package]]
-name = "fnv"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
-
-[[package]]
-name = "form_urlencoded"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-dependencies = [
- "percent-encoding",
-]
-
-[[package]]
-name = "futures"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-io",
- "futures-sink",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-channel"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-dependencies = [
- "futures-core",
- "futures-sink",
-]
-
-[[package]]
-name = "futures-core"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-
-[[package]]
-name = "futures-executor"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-dependencies = [
- "futures-core",
- "futures-task",
- "futures-util",
-]
-
-[[package]]
-name = "futures-io"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-
-[[package]]
-name = "futures-macro"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "futures-sink"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-
-[[package]]
-name = "futures-task"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-
-[[package]]
-name = "futures-util"
-version = "0.3.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-dependencies = [
- "futures-channel",
- "futures-core",
- "futures-io",
- "futures-macro",
- "futures-sink",
- "futures-task",
- "memchr",
- "pin-project-lite",
- "pin-utils",
- "slab",
-]
-
-[[package]]
-name = "generic-array"
-version = "0.14.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "gimli"
-version = "0.27.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
-
-[[package]]
-name = "h2"
-version = "0.3.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97ec8491ebaf99c8eaa73058b045fe58073cd6be7f596ac993ced0b0a0c01049"
-dependencies = [
- "bytes",
- "fnv",
- "futures-core",
- "futures-sink",
- "futures-util",
- "http",
- "indexmap",
- "slab",
- "tokio",
- "tokio-util",
- "tracing",
-]
-
-[[package]]
-name = "handlebars"
-version = "4.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83c3372087601b532857d332f5957cbae686da52bb7810bf038c3e3c3cc2fa0d"
-dependencies = [
- "log",
- "pest",
- "pest_derive",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-
-[[package]]
-name = "heck"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-
-[[package]]
-name = "hermit-abi"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
-
-[[package]]
-name = "http"
-version = "0.2.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
-dependencies = [
- "bytes",
- "fnv",
- "itoa",
-]
-
-[[package]]
-name = "http-body"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-dependencies = [
- "bytes",
- "http",
- "pin-project-lite",
-]
-
-[[package]]
-name = "httparse"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-
-[[package]]
-name = "httpdate"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421"
-
-[[package]]
-name = "hyper"
-version = "0.14.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
-dependencies = [
- "bytes",
- "futures-channel",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "httparse",
- "httpdate",
- "itoa",
- "pin-project-lite",
- "socket2",
- "tokio",
- "tower-service",
- "tracing",
- "want",
-]
-
-[[package]]
-name = "hyper-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d78e1e73ec14cf7375674f74d7dde185c8206fd9dea6fb6295e8a98098aaa97"
-dependencies = [
- "futures-util",
- "http",
- "hyper",
- "rustls",
- "tokio",
- "tokio-rustls",
-]
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "indenter"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
-
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown",
-]
-
-[[package]]
-name = "ipnet"
-version = "2.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
-
-[[package]]
-name = "is-terminal"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-dependencies = [
- "hermit-abi",
- "rustix",
- "windows-sys",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-
-[[package]]
-name = "js-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-dependencies = [
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
-[[package]]
-name = "libc"
-version = "0.2.147"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
-
-[[package]]
-name = "linux-raw-sys"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503"
-
-[[package]]
-name = "lock_api"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4"
-
-[[package]]
-name = "matchers"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
-dependencies = [
- "regex-automata 0.1.10",
-]
-
-[[package]]
-name = "memchr"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
-
-[[package]]
-name = "mime"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-dependencies = [
- "adler",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
-dependencies = [
- "libc",
- "wasi",
- "windows-sys",
-]
-
-[[package]]
-name = "nu-ansi-term"
-version = "0.46.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
-dependencies = [
- "overload",
- "winapi",
-]
-
-[[package]]
-name = "num_cpus"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
-dependencies = [
- "hermit-abi",
- "libc",
-]
-
-[[package]]
-name = "object"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-
-[[package]]
-name = "overload"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
-
-[[package]]
-name = "parking_lot"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-dependencies = [
- "lock_api",
- "parking_lot_core",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets",
-]
-
-[[package]]
-name = "percent-encoding"
-version = "2.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-
-[[package]]
-name = "pest"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1acb4a4365a13f749a93f1a094a7805e5cfa0955373a9de860d962eaa3a5fe5a"
-dependencies = [
- "thiserror",
- "ucd-trie",
-]
-
-[[package]]
-name = "pest_derive"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "666d00490d4ac815001da55838c500eafb0320019bbaa44444137c48b443a853"
-dependencies = [
- "pest",
- "pest_generator",
-]
-
-[[package]]
-name = "pest_generator"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68ca01446f50dbda87c1786af8770d535423fa8a53aec03b8f4e3d7eb10e0929"
-dependencies = [
- "pest",
- "pest_meta",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "pest_meta"
-version = "2.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56af0a30af74d0445c0bf6d9d051c979b516a1a5af790d251daee76005420a48"
-dependencies = [
- "once_cell",
- "pest",
- "sha2",
-]
-
-[[package]]
-name = "pin-project-lite"
-version = "0.2.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57"
-
-[[package]]
-name = "pin-utils"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.32"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f3b39ccfb720540debaa0164757101c08ecb8d326b15358ce76a62c7e85965"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "regex"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2eae68fc220f7cf2532e4494aded17545fce192d59cd996e0fe7887f4ceb575"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata 0.3.4",
- "regex-syntax 0.7.4",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
-dependencies = [
- "regex-syntax 0.6.29",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7b6d6190b7594385f61bd3911cd1be99dfddcfc365a4160cc2ab5bff4aed294"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax 0.7.4",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.6.29"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
-
-[[package]]
-name = "regex-syntax"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
-
-[[package]]
-name = "reqwest"
-version = "0.11.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde824a14b7c14f85caff81225f411faacc04a2013f41670f41443742b1c1c55"
-dependencies = [
- "base64",
- "bytes",
- "encoding_rs",
- "futures-core",
- "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
- "hyper-rustls",
- "ipnet",
- "js-sys",
- "log",
- "mime",
- "once_cell",
- "percent-encoding",
- "pin-project-lite",
- "rustls",
- "rustls-pemfile",
- "serde",
- "serde_json",
- "serde_urlencoded",
- "tokio",
- "tokio-rustls",
- "tower-service",
- "url",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "web-sys",
- "webpki-roots",
- "winreg",
-]
-
-[[package]]
-name = "ring"
-version = "0.16.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
-dependencies = [
- "cc",
- "libc",
- "once_cell",
- "spin",
- "untrusted",
- "web-sys",
- "winapi",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.23"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-
-[[package]]
-name = "rustix"
-version = "0.38.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
-dependencies = [
- "bitflags 2.3.3",
- "errno",
- "libc",
- "linux-raw-sys",
- "windows-sys",
-]
-
-[[package]]
-name = "rustls"
-version = "0.21.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36"
-dependencies = [
- "log",
- "ring",
- "rustls-webpki",
- "sct",
-]
-
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d3987094b1d07b653b7dfdc3f70ce9a1da9c51ac18c1b06b662e4f9a0e9f4b2"
-dependencies = [
- "base64",
-]
-
-[[package]]
-name = "rustls-webpki"
-version = "0.101.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "sct"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "serde"
-version = "1.0.180"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.180"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "serde_urlencoded"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
-dependencies = [
- "form_urlencoded",
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "sha2"
-version = "0.10.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
-dependencies = [
- "cfg-if",
- "cpufeatures",
- "digest",
-]
-
-[[package]]
-name = "sharded-slab"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
-dependencies = [
- "lazy_static",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "slab"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6528351c9bc8ab22353f9d776db39a20288e8d6c37ef8cfe3317cf875eecfc2d"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9"
-
-[[package]]
-name = "socket2"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-dependencies = [
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "spin"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
-
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
-[[package]]
-name = "syn"
-version = "2.0.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04361975b3f5e348b2189d8dc55bc942f278b2d482a6a0365de5bdd62d351567"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "thiserror"
-version = "1.0.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "611040a08a0439f8248d1990b111c95baa9c704c805fa1f62104b39655fd7f90"
-dependencies = [
- "thiserror-impl",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "090198534930841fab3a5d1bb637cde49e339654e606195f8d9c76eeb081dc96"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "thread_local"
-version = "1.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-dependencies = [
- "cfg-if",
- "once_cell",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "tokio"
-version = "1.29.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da"
-dependencies = [
- "autocfg",
- "backtrace",
- "bytes",
- "libc",
- "mio",
- "num_cpus",
- "parking_lot",
- "pin-project-lite",
- "signal-hook-registry",
- "socket2",
- "tokio-macros",
- "windows-sys",
-]
-
-[[package]]
-name = "tokio-macros"
-version = "2.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls",
- "tokio",
-]
-
-[[package]]
-name = "tokio-util"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "806fe8c2c87eccc8b3267cbae29ed3ab2d0bd37fca70ab622e46aaa9375ddb7d"
-dependencies = [
- "bytes",
- "futures-core",
- "futures-sink",
- "pin-project-lite",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "tower-service"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
-
-[[package]]
-name = "tracing"
-version = "0.1.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-dependencies = [
- "cfg-if",
- "pin-project-lite",
- "tracing-attributes",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-attributes"
-version = "0.1.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "tracing-core"
-version = "0.1.31"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-dependencies = [
- "once_cell",
- "valuable",
-]
-
-[[package]]
-name = "tracing-log"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-dependencies = [
- "lazy_static",
- "log",
- "tracing-core",
-]
-
-[[package]]
-name = "tracing-subscriber"
-version = "0.3.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-dependencies = [
- "matchers",
- "nu-ansi-term",
- "once_cell",
- "regex",
- "sharded-slab",
- "smallvec",
- "thread_local",
- "tracing",
- "tracing-core",
- "tracing-log",
-]
-
-[[package]]
-name = "try-lock"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-
-[[package]]
-name = "typenum"
-version = "1.16.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
-
-[[package]]
-name = "ucd-trie"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
-
-[[package]]
-name = "unicode-bidi"
-version = "0.3.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
-
-[[package]]
-name = "unicode-normalization"
-version = "0.1.22"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-dependencies = [
- "tinyvec",
-]
-
-[[package]]
-name = "untrusted"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
-
-[[package]]
-name = "url"
-version = "2.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
-dependencies = [
- "form_urlencoded",
- "idna",
- "percent-encoding",
-]
-
-[[package]]
-name = "utf8parse"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-
-[[package]]
-name = "valuable"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "want"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
-dependencies = [
- "try-lock",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-dependencies = [
- "cfg-if",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-dependencies = [
- "bumpalo",
- "log",
- "once_cell",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
-dependencies = [
- "cfg-if",
- "js-sys",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.87"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-
-[[package]]
-name = "web-sys"
-version = "0.3.64"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "webpki"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd"
-dependencies = [
- "ring",
- "untrusted",
-]
-
-[[package]]
-name = "webpki-roots"
-version = "0.22.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
-dependencies = [
- "webpki",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
-dependencies = [
- "windows-targets",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.48.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
-dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.48.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
-
-[[package]]
-name = "winreg"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d"
-dependencies = [
- "winapi",
-]
diff --git a/flake/Cargo.toml b/flake/Cargo.toml
deleted file mode 100644
index f724a6f3..00000000
--- a/flake/Cargo.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[package]
-name = "dotci"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-async-trait = "0.1.72"
-clap = { version = "4.3.19", features = ["derive", "env"] }
-eyre = "0.6.8"
-futures = "0.3.28"
-handlebars = "4.3.7"
-once_cell = "1.18.0"
-regex = "1.9.1"
-reqwest = { version = "0.11.18", default-features = false, features = ["rustls-tls"] }
-serde = { version = "1.0.180", features = ["derive"] }
-serde_json = "1.0.104"
-tokio = { version = "1.29.1", features = ["full"] }
-tracing = "0.1.37"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
diff --git a/flake/default.nix b/flake/default.nix
index 96cb700e..a9a905b4 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -1,16 +1,10 @@
-{
-  inputs,
-  lib,
-  ...
-}: {
+{lib, ...}: {
   imports = [
     ../packages
     ../misc/lib
-    ../homes
     ../misc/bundlers.nix
     ../hosts
-    ../modules
-    # ../wrappers
+    ../modules/nixos
   ];
 
   flake.templates = lib.pipe ../misc/templ [
@@ -28,18 +22,6 @@
     config,
     ...
   }: {
-    devShells.dotci = with pkgs;
-      mkShell {
-        packages = [
-          rustc
-          cargo
-          rustfmt
-          rust-analyzer-unwrapped
-          clippy
-        ];
-        RUST_SRC_PATH = "${rustPlatform.rustLibSrc}";
-      };
-
     devShells.default = with pkgs;
       mkShellNoCC {
         packages = [
@@ -47,14 +29,5 @@
           stylua
         ];
       };
-
-    packages.dotci = pkgs.callPackage ./dotci.nix {
-      src = inputs.nix-filter.lib {
-        root = ./.;
-        include = ["src" "Cargo.toml" "Cargo.lock"];
-      };
-    };
-
-    checks = {inherit (config.packages) dotci;};
   };
 }
diff --git a/flake/dotci.nix b/flake/dotci.nix
deleted file mode 100644
index 082ec4b5..00000000
--- a/flake/dotci.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  rustPlatform,
-  src,
-}:
-rustPlatform.buildRustPackage {
-  name = "dotci";
-  cargoLock.lockFile = ./Cargo.lock;
-  inherit src;
-  doCheck = false;
-}
diff --git a/flake/flake.nix.hbs b/flake/flake.nix.hbs
deleted file mode 100644
index c872c9ad..00000000
--- a/flake/flake.nix.hbs
+++ /dev/null
@@ -1,119 +0,0 @@
-# vim:ft=nix
-{
-  outputs = inputs: inputs.flake-parts.lib.mkFlake { inherit inputs; } { imports = [ ./flake ]; };
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-    };
-    nix-common = {
-      url = "github:viperML/nix-common";
-      # url = "path:/home/ayats/Documents/nix-common";
-    };
-    tree-sitter = {
-      url = "github:viperML/tree-sitter";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
-
-    nh = {
-      url = "github:viperML/nh";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    hover-rs = {
-      url = "github:viperML/hover-rs";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    noshell = {
-      url = "github:viperML/noshell";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    nix = {
-      url = "github:NixOS/nix/{{nix}}";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-
-    home-manager-wsl = {
-      url = "github:viperML/home-manager-wsl";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
-
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-    flake-utils = {
-      url = "github:numtide/flake-utils";
-    };
-    home-manager = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-gaming = {
-      url = "github:fufexan/nix-gaming";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-index-database = {
-      url = "github:Mic92/nix-index-database";
-    };
-    vscode-server = {
-      url = "github:msteen/nixos-vscode-server";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nvfetcher = {
-      url = "github:berberman/nvfetcher/{{nvfetcher}}";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-    envfs = {
-      url = "github:Mic92/envfs";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-    };
-    # nixified-ai.url = "github:nixified-ai/flake/nixos";
-    emacs-overlay = {
-      url = "github:nix-community/emacs-overlay";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-    };
-    hyprland = {
-      url = "github:hyprwm/Hyprland/{{hyprland}}";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-ld = {
-      url = "github:nix-community/nix-ld-rs";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-    wrapper-manager = {
-      url = "github:viperML/wrapper-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-    nix-filter = {
-      url = "github:numtide/nix-filter";
-    };
-    lanzaboote = {
-      url = "github:nix-community/lanzaboote/{{lanzaboote}}";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.flake-utils.follows = "flake-utils";
-      inputs.flake-compat.follows = "flake-compat";
-    };
-    sops-nix = {
-      url = "github:Mic92/sops-nix";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.nixpkgs-stable.follows = "nixpkgs";
-    };
-    nixos-hardware = {
-      url = "github:NixOS/nixos-hardware";
-    };
-  };
-}
diff --git a/flake/flake.toml b/flake/flake.toml
deleted file mode 100644
index dce83132..00000000
--- a/flake/flake.toml
+++ /dev/null
@@ -1,19 +0,0 @@
-[hyprland]
-# src.github = "hyprwm/Hyprland"
-src.git = "https://github.com/hyprwm/Hyprland"
-fetch.git = "https://github.com/hyprwm/Hyprland"
-
-[nvfetcher]
-src.github = "berberman/nvfetcher"
-fetch.git = "https://github.com/berberman/nvfetcher.git"
-
-[nix]
-src.github_tag = "NixOS/nix"
-fetch.git = "https://github.com/nixos/nix.git"
-
-# [helix]
-# src.github = "helix-editor/helix"
-# fetch.git = "https://github.com/helix-editor/helix.git"
-[lanzaboote]
-src.github_tag = "nix-community/lanzaboote"
-fetch.git = "https://github.com/nix-community/lanzaboote"
diff --git a/flake/generated.json b/flake/generated.json
deleted file mode 100644
index fdc699a0..00000000
--- a/flake/generated.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "hyprland": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "hyprland",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "rev": "v0.42.0",
-            "sha256": "sha256-G39pjU/wdTlhsuaMtwYyhrwyZowoXxN1n7F6up3q4sI=",
-            "type": "git",
-            "url": "https://github.com/hyprwm/Hyprland"
-        },
-        "version": "v0.42.0"
-    },
-    "lanzaboote": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "lanzaboote",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "rev": "v0.4.1",
-            "sha256": "sha256-eSZyrQ9uoPB9iPQ8Y5H7gAmAgAvCw3InStmU3oEjqsE=",
-            "type": "git",
-            "url": "https://github.com/nix-community/lanzaboote"
-        },
-        "version": "v0.4.1"
-    },
-    "nix": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "nix",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "rev": "2.24.2",
-            "sha256": "sha256-ne4/57E2hOeBIc4yIJkm5JDIPtAaRvkDPkKj7pJ5fhg=",
-            "type": "git",
-            "url": "https://github.com/nixos/nix.git"
-        },
-        "version": "2.24.2"
-    },
-    "nvfetcher": {
-        "cargoLocks": null,
-        "date": null,
-        "extract": null,
-        "name": "nvfetcher",
-        "passthru": null,
-        "pinned": false,
-        "src": {
-            "deepClone": false,
-            "fetchSubmodules": false,
-            "leaveDotGit": false,
-            "name": null,
-            "rev": "0.6.2",
-            "sha256": "sha256-McJd+9TM//Hp2EWx4AZtVBsELdi6hvsC19uabRRrqv8=",
-            "type": "git",
-            "url": "https://github.com/berberman/nvfetcher.git"
-        },
-        "version": "0.6.2"
-    }
-}
\ No newline at end of file
diff --git a/flake/src/build_matrix.rs b/flake/src/build_matrix.rs
deleted file mode 100644
index cb57cd76..00000000
--- a/flake/src/build_matrix.rs
+++ /dev/null
@@ -1,122 +0,0 @@
-use std::{collections::HashMap, path::PathBuf};
-
-use async_trait::async_trait;
-use clap::Args;
-use eyre::{bail, eyre, ContextCompat, Result};
-use futures::{stream::FuturesUnordered, StreamExt, TryFutureExt};
-use regex::Regex;
-use tracing::{error, info};
-
-use crate::CliCommand;
-
-#[derive(Debug, Args)]
-pub(crate) struct BuildMatrixArgs {
-    #[arg(long, env = "PWD")]
-    flake: PathBuf,
-    #[arg(long, default_value = "x86_64-linux")]
-    system: String,
-}
-
-type OutputMap = HashMap<String, String>;
-
-const CACHES: &[&str] = &[
-    // -
-    "https://viperml.cachix.org",
-    "https://cache.nixos.org",
-];
-
-#[async_trait]
-impl CliCommand for BuildMatrixArgs {
-    async fn run(&self) -> Result<()> {
-        info!(?self);
-
-        let output = std::process::Command::new("nix")
-            .arg("eval")
-            .arg(format!(
-                "{}#checks.{}",
-                self.flake.to_string_lossy(),
-                self.system
-            ))
-            .arg("--apply")
-            .arg("builtins.mapAttrs (_: value: value.outPath)")
-            .arg("--json")
-            .output()?;
-
-        if !output.status.success() {
-            let stderr = std::str::from_utf8(&output.stderr).unwrap();
-            error!(%stderr);
-            bail!(output.status);
-        }
-
-        let parsed: OutputMap = serde_json::from_slice(&output.stdout)?;
-        info!(?parsed);
-
-        let futs = parsed.into_iter().map(|(name, path)| async move {
-            let hash = async { extract_hash(&path).wrap_err("Couldn't get a hash") };
-
-            hash.and_then(|hash| async {
-                let queries = CACHES.iter().map(|host| query_hash(hash, host));
-
-                futures::future::try_join_all(queries.into_iter())
-                    .await
-                    .map(|v| v.into_iter().any(|ok| ok))
-            })
-            .await
-            .map(|res| (format!("checks.{}.{}", self.system, name), res))
-        });
-
-        let mut stream = futs.collect::<FuturesUnordered<_>>();
-        let mut outputs = Vec::new();
-
-        while let Some(result) = stream.next().await {
-            let (name, ok) = result?;
-            info!(?name, ?ok);
-            if !ok {
-                outputs.push(name);
-            }
-        }
-
-        let json = serde_json::to_string(&outputs)?;
-        info!(%json);
-
-        println!("flake_outputs={}", json);
-
-        Ok(())
-    }
-}
-
-async fn query_hash(hash: &str, host: &str) -> Result<bool> {
-    let url = format!("{}/{}.narinfo", host, hash);
-    let response = reqwest::get(url).await?;
-
-    match response.status().as_u16() {
-        404 => Ok(false),
-        200 => Ok(true),
-        _ => Err(eyre::eyre!("Bad response").wrap_err(response.status())),
-    }
-}
-
-fn extract_hash(path: &str) -> Option<&str> {
-    let re = Regex::new(r"/nix/store/([a-zA-Z0-9]+)-").unwrap();
-    let (_, [hash]) = re.captures_iter(path).next()?.extract();
-    Some(hash)
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_extract_hash() {
-        assert_eq!(
-            Some("d8brwi1ki4y017hw9x5zvzwi48dlmlbi"),
-            extract_hash(
-                "/nix/store/d8brwi1ki4y017hw9x5zvzwi48dlmlbi-nix-index-0.1.6+db=2023-07-09"
-            )
-        );
-        assert_eq!(
-            Some("q6r9kwmidiy6wx1w1nf3ff0q40sfq4dg"),
-            extract_hash("/nix/store/q6r9kwmidiy6wx1w1nf3ff0q40sfq4dg-nix-2.15.1")
-        );
-    }
-}
diff --git a/flake/src/generate.rs b/flake/src/generate.rs
deleted file mode 100644
index bec7b206..00000000
--- a/flake/src/generate.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use std::{collections::HashMap, path::PathBuf};
-
-use async_trait::async_trait;
-use clap::Args;
-use eyre::Result;
-use handlebars::Handlebars;
-use serde::Deserialize;
-use tracing::{debug, info};
-
-use crate::CliCommand;
-
-#[derive(Debug, Args)]
-pub(crate) struct GenFlakeArgs {
-    #[arg(long, short)]
-    template: PathBuf,
-    #[arg(long, short)]
-    nv_generated: PathBuf,
-}
-
-#[non_exhaustive]
-#[derive(Debug, Deserialize)]
-struct NvOutput {
-    version: String,
-}
-
-#[async_trait]
-impl CliCommand for GenFlakeArgs {
-    async fn run(&self) -> Result<()> {
-        info!(?self);
-
-        let raw = std::fs::read_to_string(&self.template)?
-            .lines()
-            .filter(|line| !line.split_whitespace().any(|elem| elem.starts_with('#')))
-            .fold(None, |acc: Option<String>, next| {
-                let mut acc = match acc {
-                    None => String::new(),
-                    Some(mut s) => {
-                        s.push('\n');
-                        s
-                    }
-                };
-                acc.push_str(next);
-                Some(acc)
-            })
-            .unwrap();
-
-        info!(%raw);
-
-        let nv = {
-            let file = std::fs::File::open(&self.nv_generated)?;
-            let nv_raw: HashMap<String, NvOutput> = serde_json::from_reader(file)?;
-            nv_raw
-                .into_iter()
-                .map(|(name, value)| (name, value.version))
-                .collect::<HashMap<_, _>>()
-        };
-
-        debug!(?nv);
-
-        let mut handlebars = Handlebars::new();
-        handlebars.set_strict_mode(true);
-        let render = handlebars.render_template(&raw, &nv)?;
-
-        print!("{render}");
-
-        Ok(())
-    }
-}
diff --git a/flake/src/main.rs b/flake/src/main.rs
deleted file mode 100644
index f50cf850..00000000
--- a/flake/src/main.rs
+++ /dev/null
@@ -1,49 +0,0 @@
-mod build_matrix;
-mod generate;
-
-
-
-use async_trait::async_trait;
-use clap::Parser;
-use eyre::Result;
-
-use tracing_subscriber::prelude::*;
-
-#[derive(Debug, Parser)]
-enum Args {
-    BuildMatrix(build_matrix::BuildMatrixArgs),
-    GenFlake(generate::GenFlakeArgs),
-}
-
-#[async_trait]
-trait CliCommand {
-    async fn run(&self) -> Result<()>;
-}
-
-#[async_trait]
-impl CliCommand for Args {
-    async fn run(&self) -> Result<()> {
-        match self {
-            Args::BuildMatrix(args) => args.run().await,
-            Args::GenFlake(args) => args.run().await,
-        }
-    }
-}
-
-#[tokio::main]
-async fn main() -> Result<()> {
-    let layer_filter = tracing_subscriber::EnvFilter::from_default_env();
-
-    let layer_fmt = tracing_subscriber::fmt::layer()
-        .with_writer(std::io::stderr)
-        // .without_time()
-        .with_line_number(true)
-        .compact();
-
-    tracing_subscriber::registry()
-        .with(layer_filter)
-        .with(layer_fmt)
-        .init();
-
-    Args::parse().run().await
-}
diff --git a/hosts/default.nix b/hosts/default.nix
index 49a38d65..11eded29 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -29,15 +29,6 @@
 
           inputs.noshell.nixosModules.default
           {programs.noshell.enable = true;}
-
-          inputs.home-manager.nixosModules.home-manager
-          {
-            home-manager.sharedModules = [
-              config.flake.homeModules.common
-              inputs.nix-common.homeModules.default
-            ];
-            home-manager.extraSpecialArgs = specialArgs;
-          }
         ]
         ++ extraModules;
     };
diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix
index 51727465..0918f5e4 100644
--- a/hosts/hermes/configuration.nix
+++ b/hosts/hermes/configuration.nix
@@ -2,10 +2,13 @@
   lib,
   pkgs,
   config,
+  self',
   ...
 }: let
   luksDevice = "luksroot";
 in {
+  environment.sessionVariables.FLAKE = "/var/home/ayats/Documents/dotfiles";
+
   networking = {
     hostName = "hermes";
     networkmanager = {
@@ -102,4 +105,11 @@ in {
       options = ["x-systemd.automount" "x-systemd.mount-timeout=15min" "umask=077"];
     };
   };
+
+  environment.systemPackages = with pkgs; [
+    self'.packages.vscode
+    pkgs.vault
+    self'.packages.wezterm
+    pkgs.sbctl
+  ];
 }
diff --git a/hosts/hermes/default.nix b/hosts/hermes/default.nix
index 22bfc187..66f17137 100644
--- a/hosts/hermes/default.nix
+++ b/hosts/hermes/default.nix
@@ -16,17 +16,18 @@ in {
       nixosModules.tmpfs
       nixosModules.tpm2
       nixosModules.user-ayats
+      nixosModules.user-soch
       nixosModules.yubikey
 
       #-- home-manager
       {
-        home-manager.sharedModules = [./home.nix homeModules.browser];
+        # home-manager.sharedModules = [./home.nix homeModules.browser];
       }
 
       #-- Environment
       # {services.displayManager.autoLogin.user = "ayats";}
       nixosModules.plasma6
-      nixosModules.hyprland
+      # nixosModules.hyprland
 
       #-- Other
       nixosModules.guix
diff --git a/hosts/hermes/home.nix b/hosts/hermes/home.nix
deleted file mode 100644
index 217ce814..00000000
--- a/hosts/hermes/home.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  pkgs,
-  self',
-  ...
-}: {
-  nixpkgs.config.allowUnfree = true;
-
-  unsafeFlakePath = "/home/ayats/Documents/dotfiles";
-
-  home.packages = [
-    self'.packages.vscode
-    pkgs.vault
-    self'.packages.wezterm
-    pkgs.sbctl
-  ];
-}
diff --git a/hosts/hermes/polkit.js b/hosts/hermes/polkit.js
deleted file mode 100644
index 7e5c9b09..00000000
--- a/hosts/hermes/polkit.js
+++ /dev/null
@@ -1,9 +0,0 @@
-polkit.addRule(function(action, subject) {
-    polkit.log("user " +  subject.user + " is attempting action " + action.id + " from PID " + subject.pid);
-});
-
-polkit.addRule(function(action, subject) {
-    if (subject.isInGroup("wheel")) {
-        return polkit.Result.AUTH_ADMIN_KEEP;
-    }
-});
diff --git a/hosts/hermes/polkit.nix b/hosts/hermes/polkit.nix
deleted file mode 100644
index b4cd5546..00000000
--- a/hosts/hermes/polkit.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  lib,
-  packages,
-  pkgs,
-  ...
-}: {
-  security.polkit = {
-    extraConfig = lib.fileContents ./polkit.js;
-    debug = true;
-  };
-
-  system.replaceRuntimeDependencies = [
-    {
-      original = pkgs.polkit;
-      replacement = packages.self.polkit;
-    }
-  ];
-}
diff --git a/hosts/zorah/configuration.nix b/hosts/zorah/configuration.nix
index 77c7424a..2ec430e8 100644
--- a/hosts/zorah/configuration.nix
+++ b/hosts/zorah/configuration.nix
@@ -2,16 +2,24 @@
   lib,
   pkgs,
   config,
+  self',
   ...
 }: let
   luksDevice = "luksroot";
 in {
-  environment.systemPackages = [
-    pkgs.powertop
-    pkgs.openconnect
+  environment.systemPackages = with pkgs; [
+    powertop
+    openconnect
+
+    onlyoffice-bin
+
+    # global dev
+    ltex-ls
   ];
 
-  # environment.sessionVariables = {NIXOS_OZONE_WL = "1";};
+  environment.sessionVariables = {
+    FLAKE = "/var/home/ayats/Documents/dotfiles";
+  };
 
   networking = {
     hostName = "zorah";
diff --git a/hosts/zorah/default.nix b/hosts/zorah/default.nix
index d7641290..303750c5 100644
--- a/hosts/zorah/default.nix
+++ b/hosts/zorah/default.nix
@@ -17,19 +17,10 @@ in {
       nixosModules.tmpfs
       nixosModules.tpm2
       nixosModules.user-ayats
+      nixosModules.user-soch
       nixosModules.yubikey
 
       inputs.nixos-hardware.nixosModules.common-gpu-nvidia-disable
-      # ./nvidia.nix
-
-      #-- home-manager
-      {
-        home-manager.sharedModules = [
-          ./home.nix
-          homeModules.browser
-          inputs.sops-nix.homeManagerModules.sops
-        ];
-      }
 
       #-- Environment
       # {services.displayManager.autoLogin.user = "ayats";}
diff --git a/hosts/zorah/home.nix b/hosts/zorah/home.nix
deleted file mode 100644
index 72027fca..00000000
--- a/hosts/zorah/home.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  pkgs,
-  self',
-  config,
-  lib,
-  ...
-}: {
-  nixpkgs.config.allowUnfree = true;
-
-  unsafeFlakePath = "/home/ayats/Documents/dotfiles";
-
-  home.packages = [
-    self'.packages.vscode
-    self'.packages.wezterm
-    pkgs.onlyoffice-bin
-    pkgs.sops
-    pkgs.age
-    pkgs.d-spy
-    pkgs.rsync
-    pkgs.ltex-ls
-    self'.packages.ungoogled-chromium
-
-    # global dev
-    pkgs.just
-    pkgs.clang-tools
-    pkgs.hyperfine
-    pkgs.cntr
-    pkgs.sshfs
-    pkgs.strace
-    pkgs.gdb
-    pkgs.tokio-console
-  ];
-
-  sops = {
-    age.keyFile = "${config.xdg.configHome}/sops/age/keys.txt";
-    defaultSopsFile = ./private.yaml;
-    secrets.git_config = {
-      path = "${config.xdg.configHome}/git/local";
-    };
-    secrets.ssh_config = {
-      sopsFile = ../../misc/private/ssh.yaml;
-      path = "${config.home.homeDirectory}/.ssh/config-generic";
-    };
-  };
-
-  home.activation.ssh_config = config.lib.dag.entryAfter ["writeBoundary"] ''
-    mkdir -pv ~/.ssh
-    touch ~/.ssh/config-device
-    rm -rf ~/.ssh/config
-    echo "## WARNING: THIS FILE WAS AUTOGENERATED" > ~/.ssh/config
-    cat ~/.ssh/config-device >> ~/.ssh/config
-    cat ~/.ssh/config-generic >> ~/.ssh/config
-  '';
-}
diff --git a/hosts/zorah/nvidia.nix b/hosts/zorah/nvidia.nix
deleted file mode 100644
index 53b435ed..00000000
--- a/hosts/zorah/nvidia.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{config, ...}: {
-  services.xserver.videoDrivers = [
-    "nvidia"
-  ];
-
-  hardware.nvidia = {
-    modesetting.enable = true;
-    powerManagement = {
-      enable = true;
-      finegrained = config.hardware.nvidia.prime.offload.enable;
-    };
-    nvidiaSettings = false;
-    # prime = {
-    #   nvidiaBusId = "PCI:1:0:0";
-    #   intelBusId = "PCI:0:2:0";
-    # };
-  };
-
-  environment.systemPackages = [
-    # pkgs.nvtopPackages.nvidia
-  ];
-}
diff --git a/modules/home-manager/ags/.envrc b/misc/home-manager/ags/.envrc
similarity index 100%
rename from modules/home-manager/ags/.envrc
rename to misc/home-manager/ags/.envrc
diff --git a/modules/home-manager/ags/.gitignore b/misc/home-manager/ags/.gitignore
similarity index 100%
rename from modules/home-manager/ags/.gitignore
rename to misc/home-manager/ags/.gitignore
diff --git a/modules/home-manager/ags/.vscode/settings.json b/misc/home-manager/ags/.vscode/settings.json
similarity index 100%
rename from modules/home-manager/ags/.vscode/settings.json
rename to misc/home-manager/ags/.vscode/settings.json
diff --git a/modules/home-manager/ags/config.js b/misc/home-manager/ags/config.js
similarity index 100%
rename from modules/home-manager/ags/config.js
rename to misc/home-manager/ags/config.js
diff --git a/modules/home-manager/ags/default.nix b/misc/home-manager/ags/default.nix
similarity index 100%
rename from modules/home-manager/ags/default.nix
rename to misc/home-manager/ags/default.nix
diff --git a/modules/home-manager/ags/style.css b/misc/home-manager/ags/style.css
similarity index 100%
rename from modules/home-manager/ags/style.css
rename to misc/home-manager/ags/style.css
diff --git a/modules/home-manager/ags/tsconfig.json b/misc/home-manager/ags/tsconfig.json
similarity index 100%
rename from modules/home-manager/ags/tsconfig.json
rename to misc/home-manager/ags/tsconfig.json
diff --git a/modules/home-manager/awesome/README.md b/misc/home-manager/awesome/README.md
similarity index 100%
rename from modules/home-manager/awesome/README.md
rename to misc/home-manager/awesome/README.md
diff --git a/modules/home-manager/awesome/default.nix b/misc/home-manager/awesome/default.nix
similarity index 100%
rename from modules/home-manager/awesome/default.nix
rename to misc/home-manager/awesome/default.nix
diff --git a/modules/home-manager/awesome/generated.json b/misc/home-manager/awesome/generated.json
similarity index 100%
rename from modules/home-manager/awesome/generated.json
rename to misc/home-manager/awesome/generated.json
diff --git a/modules/home-manager/awesome/generated.nix b/misc/home-manager/awesome/generated.nix
similarity index 100%
rename from modules/home-manager/awesome/generated.nix
rename to misc/home-manager/awesome/generated.nix
diff --git a/modules/home-manager/awesome/helpers.lua b/misc/home-manager/awesome/helpers.lua
similarity index 100%
rename from modules/home-manager/awesome/helpers.lua
rename to misc/home-manager/awesome/helpers.lua
diff --git a/modules/home-manager/awesome/rc.lua b/misc/home-manager/awesome/rc.lua
similarity index 100%
rename from modules/home-manager/awesome/rc.lua
rename to misc/home-manager/awesome/rc.lua
diff --git a/modules/home-manager/awesome/rc/helpers.lua b/misc/home-manager/awesome/rc/helpers.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/helpers.lua
rename to misc/home-manager/awesome/rc/helpers.lua
diff --git a/modules/home-manager/awesome/rc/keybinds.lua b/misc/home-manager/awesome/rc/keybinds.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/keybinds.lua
rename to misc/home-manager/awesome/rc/keybinds.lua
diff --git a/modules/home-manager/awesome/rc/menu.lua b/misc/home-manager/awesome/rc/menu.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/menu.lua
rename to misc/home-manager/awesome/rc/menu.lua
diff --git a/modules/home-manager/awesome/rc/notifications.lua b/misc/home-manager/awesome/rc/notifications.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/notifications.lua
rename to misc/home-manager/awesome/rc/notifications.lua
diff --git a/modules/home-manager/awesome/rc/rules.lua b/misc/home-manager/awesome/rc/rules.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/rules.lua
rename to misc/home-manager/awesome/rc/rules.lua
diff --git a/modules/home-manager/awesome/rc/signals.lua b/misc/home-manager/awesome/rc/signals.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/signals.lua
rename to misc/home-manager/awesome/rc/signals.lua
diff --git a/modules/home-manager/awesome/rc/theme.lua b/misc/home-manager/awesome/rc/theme.lua
similarity index 100%
rename from modules/home-manager/awesome/rc/theme.lua
rename to misc/home-manager/awesome/rc/theme.lua
diff --git a/modules/home-manager/awesome/res/awesome.kra b/misc/home-manager/awesome/res/awesome.kra
similarity index 100%
rename from modules/home-manager/awesome/res/awesome.kra
rename to misc/home-manager/awesome/res/awesome.kra
diff --git a/modules/home-manager/awesome/res/awesome.png b/misc/home-manager/awesome/res/awesome.png
similarity index 100%
rename from modules/home-manager/awesome/res/awesome.png
rename to misc/home-manager/awesome/res/awesome.png
diff --git a/modules/home-manager/awesome/res/awesome.svg b/misc/home-manager/awesome/res/awesome.svg
similarity index 100%
rename from modules/home-manager/awesome/res/awesome.svg
rename to misc/home-manager/awesome/res/awesome.svg
diff --git a/modules/home-manager/awesome/res/btn/btn.psd b/misc/home-manager/awesome/res/btn/btn.psd
similarity index 100%
rename from modules/home-manager/awesome/res/btn/btn.psd
rename to misc/home-manager/awesome/res/btn/btn.psd
diff --git a/modules/home-manager/awesome/res/btn/close.png b/misc/home-manager/awesome/res/btn/close.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/close.png
rename to misc/home-manager/awesome/res/btn/close.png
diff --git a/modules/home-manager/awesome/res/btn/close2.png b/misc/home-manager/awesome/res/btn/close2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/close2.png
rename to misc/home-manager/awesome/res/btn/close2.png
diff --git a/modules/home-manager/awesome/res/btn/exp.png b/misc/home-manager/awesome/res/btn/exp.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/exp.png
rename to misc/home-manager/awesome/res/btn/exp.png
diff --git a/modules/home-manager/awesome/res/btn/exp2.png b/misc/home-manager/awesome/res/btn/exp2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/exp2.png
rename to misc/home-manager/awesome/res/btn/exp2.png
diff --git a/modules/home-manager/awesome/res/btn/pin.png b/misc/home-manager/awesome/res/btn/pin.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/pin.png
rename to misc/home-manager/awesome/res/btn/pin.png
diff --git a/modules/home-manager/awesome/res/btn/pin2.png b/misc/home-manager/awesome/res/btn/pin2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/pin2.png
rename to misc/home-manager/awesome/res/btn/pin2.png
diff --git a/modules/home-manager/awesome/res/btn/retr.png b/misc/home-manager/awesome/res/btn/retr.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/retr.png
rename to misc/home-manager/awesome/res/btn/retr.png
diff --git a/modules/home-manager/awesome/res/btn/retr2.png b/misc/home-manager/awesome/res/btn/retr2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn/retr2.png
rename to misc/home-manager/awesome/res/btn/retr2.png
diff --git a/modules/home-manager/awesome/res/btn2/btn.psd b/misc/home-manager/awesome/res/btn2/btn.psd
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/btn.psd
rename to misc/home-manager/awesome/res/btn2/btn.psd
diff --git a/modules/home-manager/awesome/res/btn2/close.png b/misc/home-manager/awesome/res/btn2/close.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/close.png
rename to misc/home-manager/awesome/res/btn2/close.png
diff --git a/modules/home-manager/awesome/res/btn2/close2.png b/misc/home-manager/awesome/res/btn2/close2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/close2.png
rename to misc/home-manager/awesome/res/btn2/close2.png
diff --git a/modules/home-manager/awesome/res/btn2/close3.png b/misc/home-manager/awesome/res/btn2/close3.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/close3.png
rename to misc/home-manager/awesome/res/btn2/close3.png
diff --git a/modules/home-manager/awesome/res/btn2/exp.png b/misc/home-manager/awesome/res/btn2/exp.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/exp.png
rename to misc/home-manager/awesome/res/btn2/exp.png
diff --git a/modules/home-manager/awesome/res/btn2/exp2.png b/misc/home-manager/awesome/res/btn2/exp2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/exp2.png
rename to misc/home-manager/awesome/res/btn2/exp2.png
diff --git a/modules/home-manager/awesome/res/btn2/exp3.png b/misc/home-manager/awesome/res/btn2/exp3.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/exp3.png
rename to misc/home-manager/awesome/res/btn2/exp3.png
diff --git a/modules/home-manager/awesome/res/btn2/pin.png b/misc/home-manager/awesome/res/btn2/pin.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/pin.png
rename to misc/home-manager/awesome/res/btn2/pin.png
diff --git a/modules/home-manager/awesome/res/btn2/pin2.png b/misc/home-manager/awesome/res/btn2/pin2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/pin2.png
rename to misc/home-manager/awesome/res/btn2/pin2.png
diff --git a/modules/home-manager/awesome/res/btn2/pin3.png b/misc/home-manager/awesome/res/btn2/pin3.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/pin3.png
rename to misc/home-manager/awesome/res/btn2/pin3.png
diff --git a/modules/home-manager/awesome/res/btn2/retr.png b/misc/home-manager/awesome/res/btn2/retr.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/retr.png
rename to misc/home-manager/awesome/res/btn2/retr.png
diff --git a/modules/home-manager/awesome/res/btn2/retr2.png b/misc/home-manager/awesome/res/btn2/retr2.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/retr2.png
rename to misc/home-manager/awesome/res/btn2/retr2.png
diff --git a/modules/home-manager/awesome/res/btn2/retr3.png b/misc/home-manager/awesome/res/btn2/retr3.png
similarity index 100%
rename from modules/home-manager/awesome/res/btn2/retr3.png
rename to misc/home-manager/awesome/res/btn2/retr3.png
diff --git a/modules/home-manager/awesome/res/btn3/close1.svg b/misc/home-manager/awesome/res/btn3/close1.svg
similarity index 100%
rename from modules/home-manager/awesome/res/btn3/close1.svg
rename to misc/home-manager/awesome/res/btn3/close1.svg
diff --git a/modules/home-manager/awesome/res/btn3/close2.svg b/misc/home-manager/awesome/res/btn3/close2.svg
similarity index 100%
rename from modules/home-manager/awesome/res/btn3/close2.svg
rename to misc/home-manager/awesome/res/btn3/close2.svg
diff --git a/modules/home-manager/awesome/res/btn3/icons.psd b/misc/home-manager/awesome/res/btn3/icons.psd
similarity index 100%
rename from modules/home-manager/awesome/res/btn3/icons.psd
rename to misc/home-manager/awesome/res/btn3/icons.psd
diff --git a/modules/home-manager/awesome/res/btn3/pin1.svg b/misc/home-manager/awesome/res/btn3/pin1.svg
similarity index 100%
rename from modules/home-manager/awesome/res/btn3/pin1.svg
rename to misc/home-manager/awesome/res/btn3/pin1.svg
diff --git a/modules/home-manager/awesome/res/btn3/pin2.svg b/misc/home-manager/awesome/res/btn3/pin2.svg
similarity index 100%
rename from modules/home-manager/awesome/res/btn3/pin2.svg
rename to misc/home-manager/awesome/res/btn3/pin2.svg
diff --git a/modules/home-manager/awesome/res/btn3/pin3.svg b/misc/home-manager/awesome/res/btn3/pin3.svg
similarity index 100%
rename from modules/home-manager/awesome/res/btn3/pin3.svg
rename to misc/home-manager/awesome/res/btn3/pin3.svg
diff --git a/modules/home-manager/awesome/res/macos-green.png b/misc/home-manager/awesome/res/macos-green.png
similarity index 100%
rename from modules/home-manager/awesome/res/macos-green.png
rename to misc/home-manager/awesome/res/macos-green.png
diff --git a/modules/home-manager/awesome/res/macos-red.png b/misc/home-manager/awesome/res/macos-red.png
similarity index 100%
rename from modules/home-manager/awesome/res/macos-red.png
rename to misc/home-manager/awesome/res/macos-red.png
diff --git a/modules/home-manager/awesome/res/macos-yellow.png b/misc/home-manager/awesome/res/macos-yellow.png
similarity index 100%
rename from modules/home-manager/awesome/res/macos-yellow.png
rename to misc/home-manager/awesome/res/macos-yellow.png
diff --git a/modules/home-manager/awesome/res/nix-snowflake-plain.svg b/misc/home-manager/awesome/res/nix-snowflake-plain.svg
similarity index 100%
rename from modules/home-manager/awesome/res/nix-snowflake-plain.svg
rename to misc/home-manager/awesome/res/nix-snowflake-plain.svg
diff --git a/modules/home-manager/awesome/res/nix-snowflake.svg b/misc/home-manager/awesome/res/nix-snowflake.svg
similarity index 100%
rename from modules/home-manager/awesome/res/nix-snowflake.svg
rename to misc/home-manager/awesome/res/nix-snowflake.svg
diff --git a/modules/home-manager/awesome/theme/common.lua b/misc/home-manager/awesome/theme/common.lua
similarity index 100%
rename from modules/home-manager/awesome/theme/common.lua
rename to misc/home-manager/awesome/theme/common.lua
diff --git a/modules/home-manager/awesome/theme/dark.lua b/misc/home-manager/awesome/theme/dark.lua
similarity index 100%
rename from modules/home-manager/awesome/theme/dark.lua
rename to misc/home-manager/awesome/theme/dark.lua
diff --git a/modules/home-manager/awesome/ui/bar.lua b/misc/home-manager/awesome/ui/bar.lua
similarity index 100%
rename from modules/home-manager/awesome/ui/bar.lua
rename to misc/home-manager/awesome/ui/bar.lua
diff --git a/modules/home-manager/awesome/ui/taglist.lua b/misc/home-manager/awesome/ui/taglist.lua
similarity index 100%
rename from modules/home-manager/awesome/ui/taglist.lua
rename to misc/home-manager/awesome/ui/taglist.lua
diff --git a/modules/home-manager/awesome/ui/tasklist.lua b/misc/home-manager/awesome/ui/tasklist.lua
similarity index 100%
rename from modules/home-manager/awesome/ui/tasklist.lua
rename to misc/home-manager/awesome/ui/tasklist.lua
diff --git a/modules/home-manager/awesome/ui/title.lua b/misc/home-manager/awesome/ui/title.lua
similarity index 100%
rename from modules/home-manager/awesome/ui/title.lua
rename to misc/home-manager/awesome/ui/title.lua
diff --git a/modules/home-manager/awesome/xob/xob.cfg b/misc/home-manager/awesome/xob/xob.cfg
similarity index 100%
rename from modules/home-manager/awesome/xob/xob.cfg
rename to misc/home-manager/awesome/xob/xob.cfg
diff --git a/modules/home-manager/awesome/xob/xob_receiver.py b/misc/home-manager/awesome/xob/xob_receiver.py
similarity index 100%
rename from modules/home-manager/awesome/xob/xob_receiver.py
rename to misc/home-manager/awesome/xob/xob_receiver.py
diff --git a/modules/home-manager/browser.nix b/misc/home-manager/browser.nix
similarity index 100%
rename from modules/home-manager/browser.nix
rename to misc/home-manager/browser.nix
diff --git a/modules/home-manager/common.nix b/misc/home-manager/common.nix
similarity index 100%
rename from modules/home-manager/common.nix
rename to misc/home-manager/common.nix
diff --git a/modules/home-manager/default.nix b/misc/home-manager/default.nix
similarity index 100%
rename from modules/home-manager/default.nix
rename to misc/home-manager/default.nix
diff --git a/modules/home-manager/emacs-doom/config.el b/misc/home-manager/emacs-doom/config.el
similarity index 100%
rename from modules/home-manager/emacs-doom/config.el
rename to misc/home-manager/emacs-doom/config.el
diff --git a/modules/home-manager/emacs-doom/default.nix b/misc/home-manager/emacs-doom/default.nix
similarity index 100%
rename from modules/home-manager/emacs-doom/default.nix
rename to misc/home-manager/emacs-doom/default.nix
diff --git a/modules/home-manager/emacs-doom/init.el b/misc/home-manager/emacs-doom/init.el
similarity index 100%
rename from modules/home-manager/emacs-doom/init.el
rename to misc/home-manager/emacs-doom/init.el
diff --git a/modules/home-manager/emacs-doom/packages.el b/misc/home-manager/emacs-doom/packages.el
similarity index 100%
rename from modules/home-manager/emacs-doom/packages.el
rename to misc/home-manager/emacs-doom/packages.el
diff --git a/modules/home-manager/emacs/custom.el b/misc/home-manager/emacs/custom.el
similarity index 100%
rename from modules/home-manager/emacs/custom.el
rename to misc/home-manager/emacs/custom.el
diff --git a/modules/home-manager/emacs/default.nix b/misc/home-manager/emacs/default.nix
similarity index 100%
rename from modules/home-manager/emacs/default.nix
rename to misc/home-manager/emacs/default.nix
diff --git a/modules/home-manager/emacs/init.el b/misc/home-manager/emacs/init.el
similarity index 100%
rename from modules/home-manager/emacs/init.el
rename to misc/home-manager/emacs/init.el
diff --git a/modules/home-manager/gnome.nix b/misc/home-manager/gnome.nix
similarity index 100%
rename from modules/home-manager/gnome.nix
rename to misc/home-manager/gnome.nix
diff --git a/modules/home-manager/hyprland/default.nix b/misc/home-manager/hyprland/default.nix
similarity index 100%
rename from modules/home-manager/hyprland/default.nix
rename to misc/home-manager/hyprland/default.nix
diff --git a/modules/home-manager/hyprland/hyprland.conf b/misc/home-manager/hyprland/hyprland.conf
similarity index 100%
rename from modules/home-manager/hyprland/hyprland.conf
rename to misc/home-manager/hyprland/hyprland.conf
diff --git a/modules/home-manager/plasma5.nix b/misc/home-manager/plasma5.nix
similarity index 100%
rename from modules/home-manager/plasma5.nix
rename to misc/home-manager/plasma5.nix
diff --git a/modules/home-manager/rofi/config.rasi b/misc/home-manager/rofi/config.rasi
similarity index 100%
rename from modules/home-manager/rofi/config.rasi
rename to misc/home-manager/rofi/config.rasi
diff --git a/modules/home-manager/rofi/default.nix b/misc/home-manager/rofi/default.nix
similarity index 100%
rename from modules/home-manager/rofi/default.nix
rename to misc/home-manager/rofi/default.nix
diff --git a/modules/home-manager/rofi/material.rasi b/misc/home-manager/rofi/material.rasi
similarity index 100%
rename from modules/home-manager/rofi/material.rasi
rename to misc/home-manager/rofi/material.rasi
diff --git a/modules/home-manager/rofi/rofiman b/misc/home-manager/rofi/rofiman
similarity index 100%
rename from modules/home-manager/rofi/rofiman
rename to misc/home-manager/rofi/rofiman
diff --git a/modules/home-manager/rofi/slate.rasi b/misc/home-manager/rofi/slate.rasi
similarity index 100%
rename from modules/home-manager/rofi/slate.rasi
rename to misc/home-manager/rofi/slate.rasi
diff --git a/modules/home-manager/rofi/theme.rasi b/misc/home-manager/rofi/theme.rasi
similarity index 100%
rename from modules/home-manager/rofi/theme.rasi
rename to misc/home-manager/rofi/theme.rasi
diff --git a/modules/home-manager/sway/config.nix b/misc/home-manager/sway/config.nix
similarity index 100%
rename from modules/home-manager/sway/config.nix
rename to misc/home-manager/sway/config.nix
diff --git a/modules/home-manager/sway/default.nix b/misc/home-manager/sway/default.nix
similarity index 100%
rename from modules/home-manager/sway/default.nix
rename to misc/home-manager/sway/default.nix
diff --git a/modules/home-manager/sway/fx.nix b/misc/home-manager/sway/fx.nix
similarity index 100%
rename from modules/home-manager/sway/fx.nix
rename to misc/home-manager/sway/fx.nix
diff --git a/modules/home-manager/waybar/config.json b/misc/home-manager/waybar/config.json
similarity index 100%
rename from modules/home-manager/waybar/config.json
rename to misc/home-manager/waybar/config.json
diff --git a/modules/home-manager/waybar/default.nix b/misc/home-manager/waybar/default.nix
similarity index 100%
rename from modules/home-manager/waybar/default.nix
rename to misc/home-manager/waybar/default.nix
diff --git a/modules/home-manager/waybar/style.css b/misc/home-manager/waybar/style.css
similarity index 100%
rename from modules/home-manager/waybar/style.css
rename to misc/home-manager/waybar/style.css
diff --git a/modules/home-manager/wayland-compositors/default.nix b/misc/home-manager/wayland-compositors/default.nix
similarity index 100%
rename from modules/home-manager/wayland-compositors/default.nix
rename to misc/home-manager/wayland-compositors/default.nix
diff --git a/modules/home-manager/wayland-compositors/power-menu.sh b/misc/home-manager/wayland-compositors/power-menu.sh
similarity index 100%
rename from modules/home-manager/wayland-compositors/power-menu.sh
rename to misc/home-manager/wayland-compositors/power-menu.sh
diff --git a/modules/home-manager/wayland-compositors/wob.ini b/misc/home-manager/wayland-compositors/wob.ini
similarity index 100%
rename from modules/home-manager/wayland-compositors/wob.ini
rename to misc/home-manager/wayland-compositors/wob.ini
diff --git a/modules/home-manager/wayland-compositors/wofi-style.css b/misc/home-manager/wayland-compositors/wofi-style.css
similarity index 100%
rename from modules/home-manager/wayland-compositors/wofi-style.css
rename to misc/home-manager/wayland-compositors/wofi-style.css
diff --git a/homes/ayats/@HESTIA.nix b/misc/homes/ayats/@HESTIA.nix
similarity index 100%
rename from homes/ayats/@HESTIA.nix
rename to misc/homes/ayats/@HESTIA.nix
diff --git a/homes/ayats/@hpc.nix b/misc/homes/ayats/@hpc.nix
similarity index 100%
rename from homes/ayats/@hpc.nix
rename to misc/homes/ayats/@hpc.nix
diff --git a/homes/ayats/@shiva.nix b/misc/homes/ayats/@shiva.nix
similarity index 100%
rename from homes/ayats/@shiva.nix
rename to misc/homes/ayats/@shiva.nix
diff --git a/homes/ayats/@wsl.nix b/misc/homes/ayats/@wsl.nix
similarity index 100%
rename from homes/ayats/@wsl.nix
rename to misc/homes/ayats/@wsl.nix
diff --git a/homes/ayats/README.md b/misc/homes/ayats/README.md
similarity index 100%
rename from homes/ayats/README.md
rename to misc/homes/ayats/README.md
diff --git a/homes/ayats/default.nix b/misc/homes/ayats/default.nix
similarity index 100%
rename from homes/ayats/default.nix
rename to misc/homes/ayats/default.nix
diff --git a/homes/ayats/home.nix b/misc/homes/ayats/home.nix
similarity index 100%
rename from homes/ayats/home.nix
rename to misc/homes/ayats/home.nix
diff --git a/homes/default.nix b/misc/homes/default.nix
similarity index 100%
rename from homes/default.nix
rename to misc/homes/default.nix
diff --git a/modules/README.md b/modules/README.md
deleted file mode 100644
index a6b1dc54..00000000
--- a/modules/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# modules
-
-* [home-manager](./home-manager): modules to be used with home-manager
-
-* [nixos](./nixos): modules to be used with NixOS
-
-Design considerations:
-
-* Import to enable, remove to restore the state. The modules won't export options that have to be enabled.
-
-* Any hardcoded paths and usernames have been removed, except in `mainUser-` files. Any module should be able to be imported into any NixOS without any prior knowledge.
diff --git a/modules/default.nix b/modules/default.nix
deleted file mode 100644
index 310fbec4..00000000
--- a/modules/default.nix
+++ /dev/null
@@ -1 +0,0 @@
-{imports = [./nixos ./home-manager];}
diff --git a/modules/nixos/_mkUser.nix b/modules/nixos/_mkUser.nix
index 673075eb..64317756 100644
--- a/modules/nixos/_mkUser.nix
+++ b/modules/nixos/_mkUser.nix
@@ -1,15 +1,15 @@
-{
-  name,
-  uid,
-}: {
+name: {
   lib,
   config,
   ...
 }: let
-  home = "/home/${name}";
+  inherit (config.users.users.${name}) home;
 in {
+  _file = ./_mkUser.nix;
+
   users.users.${name} = {
-    inherit name home uid;
+    inherit name;
+    home = lib.mkDefault "/home/${name}";
     createHome = true;
     description = name;
     isNormalUser = true;
@@ -27,21 +27,21 @@ in {
     hashedPasswordFile = "/var/lib/secrets/users.passwd";
   };
 
-  home-manager.users.${name} = {};
-  home-manager.sharedModules = [
-    (args: {
-      _file = ./_mkUser.nix;
-      # Fix locale shenanigans
-      home.activation.plasma-localerc = args.lib.hm.dag.entryAfter ["writeBoundary"] ''
-        rm -vf $HOME/.config/plasma-localerc
-      '';
-    })
-  ];
+  # home-manager.users.${name} = {};
+  # home-manager.sharedModules = [
+  #   (args: {
+  #     _file = ./_mkUser.nix;
+  #     # Fix locale shenanigans
+  #     home.activation.plasma-localerc = args.lib.hm.dag.entryAfter ["writeBoundary"] ''
+  #       rm -vf $HOME/.config/plasma-localerc
+  #     '';
+  #   })
+  # ];
 
   systemd.tmpfiles.rules =
     [
-      "d ${home} 0755 ${name} ${config.users.users.${name}.group} - -"
-      "z ${home} 0755 ${name} ${config.users.users.${name}.group} - -"
+      "d ${home} 0700 ${name} ${config.users.users.${name}.group} - -"
+      "z ${home} 0700 ${name} ${config.users.users.${name}.group} - -"
     ]
     ++ (lib.flatten (map (d: [
         "d ${home}/${d} 0755 ${name} users - -"
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
index ea69b9e5..bd63adfb 100644
--- a/modules/nixos/common.nix
+++ b/modules/nixos/common.nix
@@ -30,7 +30,11 @@
   services.udev.packages = with pkgs; [android-udev-rules];
 
   environment.defaultPackages = [];
+
+  environment.sessionVariables.EDITOR = "nvim";
+
   environment.systemPackages = with pkgs; [
+    # CLI base tools
     usbutils
     pciutils
     vim
@@ -38,10 +42,23 @@
     pax-utils
     efibootmgr
     e2fsprogs.bin
+    android-tools
 
-    warp
+    # Global dev, not part of env
+    self'.packages.env
+    nixpkgs-fmt
+    nix-output-monitor
+    nodePackages.bash-language-server
+    inputs'.tree-sitter.packages.tree-sitter-cat
+    sops
+    age
 
-    android-tools
+    # GUI
+    warp
+    firefox
+    self'.packages.ungoogled-chromium
+    self'.packages.wezterm
+    vscode
   ];
 
   # i18n = let
@@ -86,18 +103,18 @@
     services."kmsconvt@tty7".enable = false;
   };
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    backupFileExtension = "old";
-    verbose = true;
-    sharedModules = [
-      {
-        home.stateVersion = lib.mkForce config.system.stateVersion;
-        nix.package = lib.mkForce config.nix.package;
-      }
-    ];
-  };
+  # home-manager = {
+  #   useGlobalPkgs = true;
+  #   useUserPackages = true;
+  #   backupFileExtension = "old";
+  #   verbose = true;
+  #   sharedModules = [
+  #     {
+  #       home.stateVersion = lib.mkForce config.system.stateVersion;
+  #       nix.package = lib.mkForce config.nix.package;
+  #     }
+  #   ];
+  # };
 
   programs.ssh = {
     startAgent = true;
diff --git a/modules/nixos/incus.nix b/modules/nixos/incus.nix
index 102100c7..412c5145 100644
--- a/modules/nixos/incus.nix
+++ b/modules/nixos/incus.nix
@@ -47,6 +47,12 @@ in {
               readonly = true;
               source = path;
             };
+            nix_profiles = rec {
+              type = "disk";
+              path = "/nix/var/nix/profiles";
+              source = path;
+              readonly = true;
+            };
             nixos_etc_static = rec {
               type = "disk";
               readonly = true;
diff --git a/modules/nixos/plasma5.nix b/modules/nixos/plasma5.nix
deleted file mode 100644
index 6b15b580..00000000
--- a/modules/nixos/plasma5.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  packages,
-  pkgs,
-  inputs,
-  ...
-}: {
-  services.xserver = {
-    enable = true;
-    desktopManager.plasma5 = {
-      enable = true;
-      runUsingSystemd = true;
-    };
-    displayManager = {defaultSession = "plasmawayland";};
-  };
-
-  environment.sessionVariables = {MOZ_ENABLE_WAYLAND = "1";};
-
-  environment.systemPackages = [
-    packages.self.reversal-kde
-    packages.self.papirus-icon-theme
-    packages.self.adw-gtk3
-    pkgs.vanilla-dmz
-  ];
-
-  home-manager.sharedModules = [inputs.self.homeModules.plasma5];
-}
diff --git a/modules/nixos/plasma6.nix b/modules/nixos/plasma6.nix
index c5510bb1..d92e564e 100644
--- a/modules/nixos/plasma6.nix
+++ b/modules/nixos/plasma6.nix
@@ -14,13 +14,10 @@
 
   environment.systemPackages = [
     pkgs.vanilla-dmz
-    pkgs.kdePackages.discover
     pkgs.kdePackages.ksshaskpass
     pkgs.wl-clipboard-rs
   ];
 
-  services.packagekit = {enable = true;};
-
   environment.sessionVariables = {
     XCURSOR_THEME = "DMZ-White";
   };
diff --git a/modules/nixos/user-ayats.nix b/modules/nixos/user-ayats.nix
index d1bd1310..f593dec4 100644
--- a/modules/nixos/user-ayats.nix
+++ b/modules/nixos/user-ayats.nix
@@ -1,4 +1,14 @@
-import ./_mkUser.nix {
-  name = "ayats";
-  uid = 1000;
+{
+  imports = [
+    (import ./_mkUser.nix "ayats")
+  ];
+
+  users.users.ayats = {
+    uid = 10000;
+    home = "/var/home/ayats";
+  };
+
+  systemd.tmpfiles.rules = [
+    "z /var/home 0755 root root - -"
+  ];
 }
diff --git a/modules/nixos/user-soch.nix b/modules/nixos/user-soch.nix
index 3e2747e3..385159c2 100644
--- a/modules/nixos/user-soch.nix
+++ b/modules/nixos/user-soch.nix
@@ -1,4 +1,10 @@
-import ./_mkUser.nix {
-  name = "soch";
-  uid = 1001;
+{
+  imports = [
+    (import ./_mkUser.nix "soch")
+  ];
+
+  users.users.soch = {
+    uid = 10001;
+    home = "/tmp/soch";
+  };
 }
diff --git a/modules/nixos/warp.nix b/modules/nixos/warp.nix
deleted file mode 100644
index 6a860974..00000000
--- a/modules/nixos/warp.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  systemd.packages = [pkgs.cloudflare-warp];
-
-  systemd.services."warp-svc".wantedBy = ["multi-user.target"];
-  systemd.user.services."warp-taskbar".wantedBy = ["tray.target"];
-
-  environment.systemPackages = [pkgs.cloudflare-warp];
-}
diff --git a/packages/env/default.nix b/packages/env/default.nix
index 68cdf377..fb276574 100644
--- a/packages/env/default.nix
+++ b/packages/env/default.nix
@@ -27,6 +27,8 @@
   elfutils-cli,
   lurk,
   fq,
+  alejandra,
+  nil,
 } @ args:
 symlinkJoin {
   name = "env";