diff --git a/flake.lock b/flake.lock
index 3fc2210..258693f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1745630506,
-        "narHash": "sha256-bHCFgGeu8XjWlVuaWzi3QONjDW3coZDqSHvnd4l7xus=",
+        "lastModified": 1747575206,
+        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "96e078c646b711aee04b82ba01aefbff87004ded",
+        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
         "type": "github"
       },
       "original": {
@@ -72,11 +72,11 @@
         "fromYaml": "fromYaml"
       },
       "locked": {
-        "lastModified": 1745523430,
-        "narHash": "sha256-EAYWV+kXbwsH+8G/8UtmcunDeKwLwSOyfcmzZUkWE/c=",
+        "lastModified": 1746562888,
+        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
         "owner": "SenchoPens",
         "repo": "base16.nix",
-        "rev": "58bfe2553d937d8af0564f79d5b950afbef69717",
+        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
         "type": "github"
       },
       "original": {
@@ -220,11 +220,11 @@
     "firefox-gnome-theme": {
       "flake": false,
       "locked": {
-        "lastModified": 1744642301,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
+        "lastModified": 1747677437,
+        "narHash": "sha256-c3oiw6RysUVxRqkv39gxhiO1WjfvuEzZw4PemN0C7Kk=",
         "owner": "rafaelmardojai",
         "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
+        "rev": "6b2061ac6faf5dfb52d5b41dca98fa0c022b2b91",
         "type": "github"
       },
       "original": {
@@ -338,7 +338,6 @@
       "inputs": {
         "nixpkgs-lib": [
           "stylix",
-          "nur",
           "nixpkgs"
         ]
       },
@@ -393,27 +392,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": [
-          "stylix",
-          "systems"
-        ]
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "fromYaml": {
       "flake": false,
       "locked": {
@@ -481,16 +459,16 @@
     "gnome-shell": {
       "flake": false,
       "locked": {
-        "lastModified": 1732369855,
-        "narHash": "sha256-JhUWbcYPjHO3Xs3x9/Z9RuqXbcp5yhPluGjwsdE2GMg=",
+        "lastModified": 1744584021,
+        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
         "owner": "GNOME",
         "repo": "gnome-shell",
-        "rev": "dadd58f630eeea41d645ee225a63f719390829dc",
+        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
         "type": "github"
       },
       "original": {
         "owner": "GNOME",
-        "ref": "47.2",
+        "ref": "48.1",
         "repo": "gnome-shell",
         "type": "github"
       }
@@ -551,11 +529,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746369725,
-        "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
+        "lastModified": 1747565775,
+        "narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
+        "rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
         "type": "github"
       },
       "original": {
@@ -572,11 +550,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1746369725,
-        "narHash": "sha256-m3ai7LLFYsymMK0uVywCceWfUhP0k3CALyFOfcJACqE=",
+        "lastModified": 1747279714,
+        "narHash": "sha256-UdxlE8yyrKiGq3bgGyJ78AdFwh+fuRAruKtyFY5Zq5I=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1a1793f6d940d22c6e49753548c5b6cb7dc5545d",
+        "rev": "954615c510c9faa3ee7fb6607ff72e55905e69f2",
         "type": "github"
       },
       "original": {
@@ -585,6 +563,26 @@
         "type": "github"
       }
     },
+    "nh": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1747943020,
+        "narHash": "sha256-LlMUdltEdGxVLDZRSDQn3/i/WWn7Jakdz4wQxLxzfZ8=",
+        "owner": "nix-community",
+        "repo": "nh",
+        "rev": "24c12228e1f1e4fc953e37283fe442ca169951ed",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nh",
+        "type": "github"
+      }
+    },
     "nix-filter": {
       "locked": {
         "lastModified": 1731533336,
@@ -689,11 +687,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1746328495,
-        "narHash": "sha256-uKCfuDs7ZM3QpCE/jnfubTg459CnKnJG/LwqEVEdEiw=",
+        "lastModified": 1747542820,
+        "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "979daf34c8cacebcd917d540070b52a3c2b9b16e",
+        "rev": "292fa7d4f6519c074f0a50394dbbe69859bb6043",
         "type": "github"
       },
       "original": {
@@ -705,11 +703,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1745930157,
-        "narHash": "sha256-y3h3NLnzRSiUkYpnfvnS669zWZLoqqI6NprtLQ+5dck=",
+        "lastModified": 1747327360,
+        "narHash": "sha256-LSmTbiq/nqZR9B2t4MRnWG7cb0KVNU70dB7RT4+wYK4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "46e634be05ce9dc6d4db8e664515ba10b78151ae",
+        "rev": "e06158e58f3adee28b139e9c2bcfcc41f8625b46",
         "type": "github"
       },
       "original": {
@@ -721,7 +719,10 @@
     },
     "nur": {
       "inputs": {
-        "flake-parts": "flake-parts_2",
+        "flake-parts": [
+          "stylix",
+          "flake-parts"
+        ],
         "nixpkgs": [
           "stylix",
           "nixpkgs"
@@ -750,11 +751,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1746393339,
-        "narHash": "sha256-7PXmCQfExrIOh8ISeruCWnmi3C1h/QjzfWyLA8FRRm8=",
+        "lastModified": 1747647098,
+        "narHash": "sha256-q97sL76AwyTbykQPNB/iHuxhUtR5MslJQdKPYIM9pXQ=",
         "owner": "wamserma",
         "repo": "flake-programs-sqlite",
-        "rev": "d61db790e37ccdb961510746bbfdf615fd085c99",
+        "rev": "687ecefe4c7aa963d6e591e39045bcdfa3d2f7ae",
         "type": "github"
       },
       "original": {
@@ -787,6 +788,7 @@
         "firefox-gnome-theme": "firefox-gnome-theme",
         "grapevine": "grapevine",
         "home-manager": "home-manager_2",
+        "nh": "nh",
         "nixpkgs": "nixpkgs_4",
         "programsdb": "programsdb",
         "stylix": "stylix",
@@ -818,7 +820,7 @@
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme_2",
         "flake-compat": "flake-compat_4",
-        "flake-utils": "flake-utils_3",
+        "flake-parts": "flake-parts_2",
         "git-hooks": "git-hooks",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
@@ -832,11 +834,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1746395987,
-        "narHash": "sha256-Na6MAPSWIWzxsgxwcxLhQ160ExvyyhCdC1JDcBA8vW8=",
+        "lastModified": 1747675820,
+        "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "70f331c8e7da588e07e70cef15a114f9fcec3cee",
+        "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70",
         "type": "github"
       },
       "original": {
@@ -925,17 +927,16 @@
     "tinted-kitty": {
       "flake": false,
       "locked": {
-        "lastModified": 1716423189,
-        "narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
+        "lastModified": 1735730497,
+        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
+        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
         "type": "github"
       },
       "original": {
         "owner": "tinted-theming",
         "repo": "tinted-kitty",
-        "rev": "eb39e141db14baef052893285df9f266df041ff8",
         "type": "github"
       }
     },
@@ -1031,11 +1032,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1744611115,
-        "narHash": "sha256-7WsdYgA6bh9dytXdLKQYUkUdSux6fNo7SZXYqMJx72k=",
+        "lastModified": 1747562021,
+        "narHash": "sha256-XfF+5zjoWbAcAiGNb++og6yDGJRwWYpADr9P6WuieQA=",
         "owner": "viperML",
         "repo": "wrapper-manager",
-        "rev": "a4990b7da8e7845974031599e7f6104226cfb43e",
+        "rev": "f2b0bec5140403cf24cae96f6764d97b5d59b0e2",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 04940b9..7fd2918 100755
--- a/flake.nix
+++ b/flake.nix
@@ -24,6 +24,10 @@
       url = "github:viperML/wrapper-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    nh = {
+      url = "github:nix-community/nh";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs: let
diff --git a/modules/common/bat.nix b/modules/common/bat.nix
new file mode 100644
index 0000000..7c9a8ba
--- /dev/null
+++ b/modules/common/bat.nix
@@ -0,0 +1,5 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {environment.shellAliases.cat = "${lib.getExe pkgs.bat} --theme Nord";}
diff --git a/modules/common/experimental.nix b/modules/common/experimental.nix
index 8e3b499..512b86f 100644
--- a/modules/common/experimental.nix
+++ b/modules/common/experimental.nix
@@ -1 +1 @@
-{nix.settings.experimental-features = ["nix-command" "flakes"];}
+{nix.settings.experimental-features = ["nix-command" "flakes" "repl-flake"];}
diff --git a/modules/common/eza.nix b/modules/common/eza.nix
new file mode 100644
index 0000000..d5d7ad9
--- /dev/null
+++ b/modules/common/eza.nix
@@ -0,0 +1,5 @@
+{
+  lib,
+  pkgs,
+  ...
+}: {environment.shellAliases.ls = "${lib.getExe pkgs.eza} --all --icons --hyperlink --group-directories-first --color=always";}
diff --git a/modules/common/fish.nix b/modules/common/fish.nix
index c2b2de7..017f55b 100644
--- a/modules/common/fish.nix
+++ b/modules/common/fish.nix
@@ -7,30 +7,6 @@
     '';
   };
 
-  environment = {
-    shells = [pkgs.fish];
-    shellAliases = {
-      # Utility
-      ls = "eza";
-      cat = "bat";
-      rm = "gio trash";
-      free = "free -h";
-      neofetch = "neowofetch";
-      shutdown = "shutdown now";
-
-      # Git
-      clone = "gh repo clone";
-      create = "gh repo create";
-
-      push = "git push";
-      commit = "git commit -am";
-
-      # NixOS
-      clean = "nh clean all";
-      rebuild = "nh os switch";
-      rebuildServer = "nixos-rebuild switch --flake ~/.config/nixos#quadraticserver --target-host quadradical@192.168.0.132 --use-remote-sudo";
-      update = "pushd ~/.config/nixos && nix flake update && popd && rebuild";
-    };
-  };
+  environment.shells = [pkgs.fish];
   users.defaultUserShell = pkgs.fish;
 }
diff --git a/modules/common/free.nix b/modules/common/free.nix
new file mode 100644
index 0000000..942832a
--- /dev/null
+++ b/modules/common/free.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {environment.shellAliases.free = "${pkgs.procps}/bin/free -h";}
diff --git a/modules/common/git.nix b/modules/common/git.nix
index 1141ae4..b2a488f 100644
--- a/modules/common/git.nix
+++ b/modules/common/git.nix
@@ -1,4 +1,8 @@
-{pkgs, ...}: {
+{
+  pkgs,
+  lib,
+  ...
+}: {
   programs.git = {
     enable = true;
     config = {
@@ -17,5 +21,17 @@
       gpg.format = "ssh";
     };
   };
-  environment.systemPackages = [pkgs.gh];
+  environment = {
+    systemPackages = [pkgs.gh];
+    shellAliases = let
+      gitExe = lib.meta.getExe pkgs.git;
+      ghExe = lib.meta.getExe pkgs.gh;
+    in {
+      clone = "${ghExe} repo clone";
+      create = "${ghExe} repo create";
+
+      push = "${gitExe} push";
+      commit = "${gitExe} commit -am";
+    };
+  };
 }
diff --git a/modules/common/neowofetch/default.nix b/modules/common/neowofetch/default.nix
new file mode 100644
index 0000000..7f92393
--- /dev/null
+++ b/modules/common/neowofetch/default.nix
@@ -0,0 +1,3 @@
+{pkgs, ...}: {
+  environment.shellAliases.neofetch = "${pkgs.hyfetch}/bin/neowofetch --config ${./neofetch.conf}";
+}
diff --git a/wrappers/common/neofetch/neofetch.conf b/modules/common/neowofetch/neofetch.conf
similarity index 100%
rename from wrappers/common/neofetch/neofetch.conf
rename to modules/common/neowofetch/neofetch.conf
diff --git a/modules/common/nh.nix b/modules/common/nh.nix
index 96195e5..d0a7262 100644
--- a/modules/common/nh.nix
+++ b/modules/common/nh.nix
@@ -1,7 +1,23 @@
 {
+  inputs,
+  pkgs,
+  lib,
+  ...
+}: let
+  pkg = inputs.nh.packages.${pkgs.system}.default;
+  exe = lib.getExe pkg;
+in {
   programs.nh = {
     enable = true;
+    package = pkg;
     clean.enable = true;
     flake = "/home/quadradical/.config/nixos";
   };
+
+  environment.shellAliases = {
+    clean = "${exe} clean all";
+    update = "pushd ~/.config/nixos && nix flake update && popd && rebuild";
+    rebuild = "${exe} os switch";
+    rebuildServer = "${exe} os switch --hostname quadraticserver --target-host 192.168.0.132";
+  };
 }
diff --git a/modules/common/run0.nix b/modules/common/run0.nix
index ec62ce1..99d9a4f 100644
--- a/modules/common/run0.nix
+++ b/modules/common/run0.nix
@@ -1,7 +1,7 @@
 {pkgs, ...}: {
-  environment.systemPackages = [(pkgs.writeShellScriptBin "sudo" "run0 $@")];
-  security = {
-    sudo.enable = false;
-    pam.services.systemd-run0 = {};
-  };
+  # environment.systemPackages = [(pkgs.writeShellScriptBin "sudo" "run0 $@")];
+  # security = {
+  #   sudo.enable = false;
+  #   pam.services.systemd-run0 = {};
+  # };
 }
diff --git a/modules/common/trash.nix b/modules/common/trash.nix
new file mode 100644
index 0000000..d4a204b
--- /dev/null
+++ b/modules/common/trash.nix
@@ -0,0 +1 @@
+{pkgs, ...}: {environment.shellAliases.rm = "${pkgs.glib}/bin/gio trash";}
diff --git a/modules/desktop/dconf/default.nix b/modules/desktop/dconf/default.nix
index 9fa0b9e..a4f90fe 100644
--- a/modules/desktop/dconf/default.nix
+++ b/modules/desktop/dconf/default.nix
@@ -85,7 +85,6 @@
             "compiz-windows-effect@hermes83.github.com"
             "user-theme@gnome-shell-extensions.gcampax.github.com"
             "display-brightness-ddcutil@themightydeity.github.com"
-            "system-monitor@gnome-shell-extensions.gcampax.github.com"
             "launch-new-instance@gnome-shell-extensions.gcampax.github.com"
           ];
           disabled-extensions = [
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index 610ab33..ebdd173 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -15,6 +15,7 @@
       just-perfection
       burn-my-windows
       fullscreen-avoider
+      launch-new-instance
       compiz-windows-effect
       rounded-window-corners-reborn
       brightness-control-using-ddcutil
diff --git a/modules/desktop/packages.nix b/modules/desktop/packages.nix
index 77d3128..ac29058 100644
--- a/modules/desktop/packages.nix
+++ b/modules/desktop/packages.nix
@@ -4,7 +4,6 @@
     tuba
     gimp
     deno
-    dart
     ptyxis
     heroic
     aspell
@@ -15,14 +14,10 @@
     r2modman
     pciutils
     resources
-    alejandra
-    impression
     libreoffice
     wl-clipboard
-    protontricks
     prismlauncher
     authenticator
-    android-studio
     nexusmods-app-unfree
     hunspellDicts.en_CA-large
   ];
diff --git a/modules/desktop/vscodium.nix b/modules/desktop/vscodium.nix
index 449d806..d16250d 100644
--- a/modules/desktop/vscodium.nix
+++ b/modules/desktop/vscodium.nix
@@ -100,7 +100,7 @@
       "nix.serverPath" = lib.meta.getExe pkgs.nil;
       "nix.serverSettings" = {
         "nil" = {
-          "formatting" = {"command" = ["alejandra"];};
+          "formatting" = {"command" = [(lib.getExe pkgs.alejandra)];};
         };
       };
       "indentRainbow.ignoreErrorLanguages" = ["*"];
diff --git a/wrappers/common/bat.nix b/wrappers/common/bat.nix
deleted file mode 100644
index 5271789..0000000
--- a/wrappers/common/bat.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{pkgs, ...}: {
-  wrappers.bat = {
-    basePackage = pkgs.bat;
-    flags = ["--theme" "Nord"];
-  };
-}
diff --git a/wrappers/common/eza.nix b/wrappers/common/eza.nix
deleted file mode 100644
index 692794a..0000000
--- a/wrappers/common/eza.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{pkgs, ...}: {
-  wrappers.eza = {
-    basePackage = pkgs.eza;
-    flags = [
-      "--all"
-      "--icons"
-      "--hyperlink"
-      "--color=always"
-      "--group-directories-first"
-    ];
-  };
-}
diff --git a/wrappers/common/neofetch/default.nix b/wrappers/common/neofetch/default.nix
deleted file mode 100644
index 2143a75..0000000
--- a/wrappers/common/neofetch/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{pkgs, ...}: {
-  wrappers.neofetch = {
-    basePackage = pkgs.hyfetch; # Neowofetch
-    flags = [
-      "--config"
-      ./neofetch.conf
-    ];
-  };
-}