diff --git a/flake.lock b/flake.lock
index f8e93c3e..0d9207b5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -14,11 +14,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1736955230,
-        "narHash": "sha256-uenf8fv2eG5bKM8C/UvFaiJMZ4IpUFaQxk9OH5t/1gA=",
+        "lastModified": 1745630506,
+        "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c",
+        "rev": "96e078c646b711aee04b82ba01aefbff87004ded",
         "type": "github"
       },
       "original": {
@@ -47,11 +47,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1744375272,
-        "narHash": "sha256-xvWbdTctLu5YWgcp+lNTh51GAY3vB2XEXUFKRMJUiCM=",
+        "lastModified": 1746210481,
+        "narHash": "sha256-AqppJhlacRGS76JkynL1/PbbMIenWR5pqrCgDThl+ws=",
         "owner": "nix-community",
         "repo": "authentik-nix",
-        "rev": "105b3b6c004ce00d1d3c7a88669bea4aadfd4580",
+        "rev": "ce1abb86409ca5e604667f9a91661601bd9c15e3",
         "type": "github"
       },
       "original": {
@@ -105,11 +105,11 @@
         "treefmt-nix": "treefmt-nix_2"
       },
       "locked": {
-        "lastModified": 1744289588,
-        "narHash": "sha256-xzYebbAH13K6pK/Z+Vvu/uY52NkTkOs/o7PEAeAx5Yg=",
+        "lastModified": 1746013568,
+        "narHash": "sha256-F0V2zLgMWhtgDdO/jD1ra4of8ym/Ide6iwPI+EwUadU=",
         "owner": "Mic92",
         "repo": "buildbot-nix",
-        "rev": "8a50a4bcf8090c156d38ae96a57ded65f1341ac6",
+        "rev": "9357f51171541cf4606c224afb1ee0bf7a89b0a2",
         "type": "github"
       },
       "original": {
@@ -123,11 +123,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1744447794,
-        "narHash": "sha256-z5uK5BDmFg0L/0EW2XYLGr39FbQeXyNVnIEhkZrG8+Q=",
+        "lastModified": 1746175539,
+        "narHash": "sha256-/wjcn1CDQqOhwOoYKS8Xp0KejrdXSJZQMF1CbbrVtMw=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "c44fe73ed8e5d5809eded7cc6156ca9c40044e42",
+        "rev": "a5db9e41a4dccfa5ffe38e6f1841a5f9ad5c5c04",
         "type": "github"
       },
       "original": {
@@ -144,11 +144,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1700795494,
-        "narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
+        "lastModified": 1744478979,
+        "narHash": "sha256-dyN+teG9G82G+m+PX/aSAagkC+vUv0SgUw3XkPhQodQ=",
         "owner": "lnl7",
         "repo": "nix-darwin",
-        "rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
+        "rev": "43975d782b418ebf4969e9ccba82466728c2851b",
         "type": "github"
       },
       "original": {
@@ -378,19 +378,16 @@
         "nixpkgs": [
           "nixpkgs"
         ],
-        "parts": [
-          "flake-parts"
-        ],
         "systems": [
           "systems"
         ]
       },
       "locked": {
-        "lastModified": 1744133121,
-        "narHash": "sha256-SBhJUjmvM7fIUj8bhJx5hljdIm9BJ8q/wYBD5GRJwNA=",
+        "lastModified": 1746124171,
+        "narHash": "sha256-+rin6Z3gsw5FNrC17K4Wn6BDcbpbVi2a+Vzw3J6Azp0=",
         "owner": "tailscale",
         "repo": "golink",
-        "rev": "4112ebe50fc8751bcd5342ffa2da720fa8aba38c",
+        "rev": "3e2c22db8b1b6260108f3260c26d9ef770e38d50",
         "type": "github"
       },
       "original": {
@@ -401,11 +398,11 @@
     },
     "hardware": {
       "locked": {
-        "lastModified": 1744366945,
-        "narHash": "sha256-OuLhysErPHl53BBifhesrRumJNhrlSgQDfYOTXfgIMg=",
+        "lastModified": 1745955289,
+        "narHash": "sha256-mmV2oPhQN+YF2wmnJzXX8tqgYmUYXUj3uUUBSTmYN5o=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "1fe3cc2bc5d2dc9c81cb4e63d2f67c1543340df1",
+        "rev": "72081c9fbbef63765ae82bff9727ea79cc86bd5b",
         "type": "github"
       },
       "original": {
@@ -426,11 +423,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1742014779,
-        "narHash": "sha256-I6fG1zrfdLFcp/imGZElig0BJO3YU0QEXLgvwWoOpJ8=",
+        "lastModified": 1744693102,
+        "narHash": "sha256-1Z4WPGVky4w3lrhrgs89OKsLzPdtkbi1bPLNFWsoLfY=",
         "owner": "hercules-ci",
         "repo": "hercules-ci-effects",
-        "rev": "524637ef84c177661690b924bf64a1ce18072a2c",
+        "rev": "5b6cec51c9ec095a0d3fd4c8eeb53eb5c59ae33e",
         "type": "github"
       },
       "original": {
@@ -446,11 +443,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744498625,
-        "narHash": "sha256-pL52uCt9CUoTTmysGG91c2FeU7XUvpB7Cep6yon2vDk=",
+        "lastModified": 1746204974,
+        "narHash": "sha256-Evu4H0/kzaQoCNLGQTp+JGTqkywzPx0IAo20Ci2zNck=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "db56335ca8942d86f2200664acdbd5b9212b26ad",
+        "rev": "1e8c62c651242fc685b10efc4a48ab777635fb7f",
         "type": "github"
       },
       "original": {
@@ -491,11 +488,11 @@
         "nixpkgs-24_11": "nixpkgs-24_11"
       },
       "locked": {
-        "lastModified": 1742413977,
-        "narHash": "sha256-NkhM9GVu3HL+MiXtGD0TjuPCQ4GFVJPBZ8KyI2cFDGU=",
+        "lastModified": 1746220417,
+        "narHash": "sha256-cN2Vf/d9KKy3V6eJIoxYHD7X0HQHfgP+lMnj3AdbsEc=",
         "owner": "simple-nixos-mailserver",
         "repo": "nixos-mailserver",
-        "rev": "b4fbffe79c00f19be94b86b4144ff67541613659",
+        "rev": "95e2de368fe76ec0675b3d380168c5ca1c1b955d",
         "type": "gitlab"
       },
       "original": {
@@ -551,26 +548,6 @@
         "type": "github"
       }
     },
-    "nh": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1743682999,
-        "narHash": "sha256-bg+aAN8K90r3m/I+xXiXG0gawpbkshwlk93wxUN7KEk=",
-        "owner": "viperML",
-        "repo": "nh",
-        "rev": "9e9a4590b38b62b28f07a1fae973ce7b6ca0687a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "viperML",
-        "repo": "nh",
-        "type": "github"
-      }
-    },
     "nix-github-actions": {
       "inputs": {
         "nixpkgs": [
@@ -623,11 +600,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743911143,
-        "narHash": "sha256-4j4JPwr0TXHH4ZyorXN5yIcmqIQr0WYacsuPA4ktONo=",
+        "lastModified": 1746054057,
+        "narHash": "sha256-iR+idGZJ191cY6NBXyVjh9QH8GVWTkvZw/w+1Igy45A=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "a36f6a7148aec2c77d78e4466215cceb2f5f4bfb",
+        "rev": "13ba07d54c6ccc5af30a501df669bf3fe3dd4db8",
         "type": "github"
       },
       "original": {
@@ -674,11 +651,11 @@
         "treefmt-nix": "treefmt-nix_3"
       },
       "locked": {
-        "lastModified": 1744423808,
-        "narHash": "sha256-DiivRNDj39u86uUilkmbgbx2c1NqWVQ3fxw6fFfVO14=",
+        "lastModified": 1746212243,
+        "narHash": "sha256-BKrQIdolNE09l94dNXHp7UWjtyvijjJy+JcdnEIRydg=",
         "owner": "nix-community",
         "repo": "nixd",
-        "rev": "3aa27fde1edcf7b126c70a62aad05d120209363c",
+        "rev": "0cd3cf83e32fc7791b7e9e994064cd666f79d441",
         "type": "github"
       },
       "original": {
@@ -689,11 +666,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1744098102,
-        "narHash": "sha256-tzCdyIJj9AjysC3OuKA+tMD/kDEDAF9mICPDU7ix0JA=",
+        "lastModified": 1744463964,
+        "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c8cd81426f45942bb2906d5ed2fe21d2f19d95b7",
+        "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
         "type": "github"
       },
       "original": {
@@ -720,11 +697,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1744511788,
-        "narHash": "sha256-5PVswSsunWhzi6mBwOvuCCUBK+ggcB/idSWCaXvVvr8=",
+        "lastModified": 1745716251,
+        "narHash": "sha256-fI6UzabnzH2mU8e3c5fZPQiWziGERhexCMmS8Vv5ytI=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "022a1e186f42079dba4f00376697158e068abd79",
+        "rev": "25999e7d9c47c384675bea8478c66386a9be9c65",
         "type": "github"
       },
       "original": {
@@ -735,11 +712,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1744502386,
-        "narHash": "sha256-QAd1L37eU7ktL2WeLLLTmI6P9moz9+a/ONO8qNBYJgM=",
+        "lastModified": 1746152631,
+        "narHash": "sha256-zBuvmL6+CUsk2J8GINpyy8Hs1Zp4PP6iBWSmZ4SCQ/s=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f6db44a8daa59c40ae41ba6e5823ec77fe0d2124",
+        "rev": "032bc6539bd5f14e9d0c51bd79cfe9a055b094c3",
         "type": "github"
       },
       "original": {
@@ -824,7 +801,6 @@
         "iceshrimp": "iceshrimp",
         "mailserver": "mailserver",
         "my-pkgs": "my-pkgs",
-        "nh": "nh",
         "nix-index": "nix-index",
         "nix-index-database": "nix-index-database",
         "nix-search": "nix-search",
@@ -977,11 +953,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1743748085,
-        "narHash": "sha256-uhjnlaVTWo5iD3LXics1rp9gaKgDRQj6660+gbUU3cE=",
+        "lastModified": 1744961264,
+        "narHash": "sha256-aRmUh0AMwcbdjJHnytg1e5h5ECcaWtIFQa6d9gI85AI=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "815e4121d6a5d504c0f96e5be2dd7f871e4fd99d",
+        "rev": "8d404a69efe76146368885110f29a2ca3700bee6",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 250062b7..83539875 100644
--- a/flake.nix
+++ b/flake.nix
@@ -86,7 +86,6 @@
     };
     golink = {
       url = "github:tailscale/golink";
-      inputs.parts.follows = "flake-parts";
       inputs.systems.follows = "systems";
       inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -114,10 +113,6 @@
       inputs.flake-utils.follows = "flake-utils";
       inputs.flake-compat.follows = "flake-compat";
     };
-    nh = {
-      url = "github:viperML/nh";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     nixd = {
       url = "github:nix-community/nixd";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -161,8 +156,8 @@
         self.overlays.pyronet-packages
         self.overlays.nix-index
         self.overlays.sway-unwrapped
+        self.overlays.poptracker
         inputs.golink.overlays.default
-        inputs.nixd.overlays.default
         inputs.topology.overlays.default
       ];
     in
@@ -217,14 +212,6 @@
         # Define default packages to use everywhere
         packages = {
           nvim = channels.nixpkgs.neovim-unwrapped;
-          customGit = channels.nixpkgs.git.override {
-            withLibsecret = true;
-            withSsh = true;
-            perlSupport = false;
-            osxkeychainSupport = false;
-            guiSupport = false;
-            svnSupport = false;
-          };
         };
         formatter = channels.nixpkgs.nixfmt-rfc-style;
 
diff --git a/homes/x86_64-linux/thehedgehog@zaphod/default.nix b/homes/x86_64-linux/thehedgehog@zaphod/default.nix
index 2e4a2877..dce42654 100644
--- a/homes/x86_64-linux/thehedgehog@zaphod/default.nix
+++ b/homes/x86_64-linux/thehedgehog@zaphod/default.nix
@@ -8,7 +8,7 @@
   };
   home.packages = [
     pkgs.mindustry
-    pkgs.signal-desktop-source
+    pkgs.signal-desktop
   ];
   py.profiles.desktop.enable = true;
   py.services.kanshi.settings = [
diff --git a/modules/home/programs/git/default.nix b/modules/home/programs/git/default.nix
index eb5f03bd..159639e6 100644
--- a/modules/home/programs/git/default.nix
+++ b/modules/home/programs/git/default.nix
@@ -20,7 +20,7 @@ in
     programs = {
       git = lib.mkIf cfg.enable {
         enable = true;
-        package = pkgs.py.customGit;
+        package = pkgs.git;
         aliases = {
           a = "add -p";
           co = "checkout";
diff --git a/modules/nixos/default-config/packages.nix b/modules/nixos/default-config/packages.nix
index 37413e77..9c74f5a8 100644
--- a/modules/nixos/default-config/packages.nix
+++ b/modules/nixos/default-config/packages.nix
@@ -8,7 +8,7 @@
     lazygit
     nix-output-monitor
     pciutils
-    py.customGit
+    git
     ripgrep
     tailscale
     unrar
diff --git a/modules/nixos/default-config/programs/nh.nix b/modules/nixos/default-config/programs/nh.nix
index c2ca66ef..ded47daa 100644
--- a/modules/nixos/default-config/programs/nh.nix
+++ b/modules/nixos/default-config/programs/nh.nix
@@ -1,8 +1,7 @@
-{ inputs, ... }:
+{ pkgs, ... }:
 {
   programs.nh = {
     enable = true;
-    package = inputs.nh.packages.x86_64-linux.default;
     clean.enable = true;
     clean.extraArgs = "-k 5";
   };
diff --git a/packages/anubis-files/default.nix b/packages/anubis-files/default.nix
index 93ba5896..e1fdda54 100644
--- a/packages/anubis-files/default.nix
+++ b/packages/anubis-files/default.nix
@@ -2,7 +2,7 @@
   stdenv,
   ...
 }:
-stdenv.mkDerivationNoCC {
+stdenv.mkDerivation {
   pname = "pyronet-anubis-files";
   version = "1.0.0";
 
@@ -10,6 +10,6 @@ stdenv.mkDerivationNoCC {
 
   installPhase = ''
     mkdir $out
-    install -t $out $src/*
+    cp -r $src/* $out/
   '';
 }