diff --git a/flake.lock b/flake.lock
index cb96378..caaf1e1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -842,11 +842,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710888565,
-        "narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
+        "lastModified": 1706981411,
+        "narHash": "sha256-cLbLPTL1CDmETVh4p0nQtvoF+FSEjsnJTFpTxhXywhQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
+        "rev": "652fda4ca6dafeb090943422c34ae9145787af37",
         "type": "github"
       },
       "original": {
@@ -1407,11 +1407,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1710951922,
-        "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=",
+        "lastModified": 1710838473,
+        "narHash": "sha256-RLvwdQSENKOaLdKhNie8XqHmTXzNm00/M/THj6zplQo=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f091af045dff8347d66d186a62d42aceff159456",
+        "rev": "fa9f817df522ac294016af3d40ccff82f5fd3a63",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d398cd0..520ab74 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
         snowfall = {
           meta = {
             name = "metacfg";
-            title = "Metacfg";
+            title = "Plus Ultra";
           };
         };
       };
diff --git a/modules/nixos/services/base/default.nix b/modules/nixos/services/base/default.nix
index 7b9055a..f892988 100644
--- a/modules/nixos/services/base/default.nix
+++ b/modules/nixos/services/base/default.nix
@@ -1,18 +1,8 @@
-{ options
-,config
-,lib
-,pkgs
-, ... }:
+{ options, config, lib, pkgs, ... }:
 
 with lib;
 with lib.metacfg;
-let
-  cfg = config.metacfg.base;
-  gitconfig = pkgs.writeText "gitconfig" ''
-    [filter "rot8000"]
-        smudge = ${pkgs.metacfg.rot8000}/bin/rot8000
-        clean = ${pkgs.metacfg.rot8000}/bin/rot8000
-  '';
+let cfg = config.metacfg.base;
 in
 {
   options.metacfg.base = with types; {
@@ -48,7 +38,6 @@ in
         delta
         efibootmgr
         git
-        git-crypt
         git-delete-merged-branches
         home-manager
         htop
@@ -148,10 +137,6 @@ in
       ];
       flake = "git+https://git.hoyer.xyz/harald/nixcfg";
     };
-    systemd.services.nixos-upgrade = {
-      path = [ pkgs.metacfg.rot8000 ];
-      environment.GIT_CONFIG_GLOBAL = toString gitconfig;
-    };
 
     virtualisation.libvirtd.enable = true;
 
diff --git a/modules/nixos/services/gui/default.nix b/modules/nixos/services/gui/default.nix
index 322dc25..2512a40 100644
--- a/modules/nixos/services/gui/default.nix
+++ b/modules/nixos/services/gui/default.nix
@@ -72,6 +72,7 @@ in
       cardpeek
       ccache
       clang
+      clippy
       dive
       file
       firefox
diff --git a/modules/nixos/user/default.nix b/modules/nixos/user/default.nix
index ddcc640..d5609ed 100644
--- a/modules/nixos/user/default.nix
+++ b/modules/nixos/user/default.nix
@@ -74,7 +74,7 @@ in
           cfg.icon;
       };
       extraOptions.programs.bash.initExtra = ''
-        [[ $WANT_BASH ]] || ${pkgs.fish}/bin/fish -l
+        [[ $WANT_BASH ]] || exec env fish -l
       '';
     };
 
diff --git a/packages/nixos-revision/default.nix b/packages/nixos-revision/default.nix
index fbdb676..9168b01 100644
--- a/packages/nixos-revision/default.nix
+++ b/packages/nixos-revision/default.nix
@@ -1,6 +1,6 @@
 { pkgs
 , lib
-, gitHostCommitUrl ? "https://git.hoyer.xyz/harald/nixcfg/commit"
+, gitHostCommitUrl ? "https://github.com/jakehamilton/config/commit"
 , ...
 }:
 
diff --git a/packages/rot8000/Cargo.lock b/packages/rot8000/Cargo.lock
deleted file mode 100644
index 9fc021d..0000000
--- a/packages/rot8000/Cargo.lock
+++ /dev/null
@@ -1,54 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "memchr"
-version = "2.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
-
-[[package]]
-name = "regex"
-version = "1.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
-dependencies = [
- "aho-corasick",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
-
-[[package]]
-name = "rot8000"
-version = "0.1.0"
-dependencies = [
- "regex",
-]
diff --git a/packages/rot8000/default.nix b/packages/rot8000/default.nix
deleted file mode 100644
index b4483b2..0000000
--- a/packages/rot8000/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib
-, stdenv
-, rustPlatform
-, fetchFromGitHub
-, ...
-}:
-rustPlatform.buildRustPackage rec {
-  pname = "rot8000";
-  version = "0.0.1";
-
-  src = fetchFromGitHub {
-    owner = "haraldh";
-    rev = "3e3c4e4d6ed5b572ca2b09c8dc7f5bc3bd86e554";
-    repo = "mailsmudge";
-    sha256 = "sha256-4cG4Mn94lewxj1qstor8R0xLWIBFxf0rOHTMxzgHyFQ=";
-  };
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-
-  meta = with lib; {
-    description = "mailsmudge";
-    homepage = "https://github.com/haraldh/mailsmudge";
-    license = licenses.unlicense;
-    maintainers = [ maintainers.tailhook ];
-  };
-}