diff --git a/flake.lock b/flake.lock
index 14324cc391332ddd9ca1358e22b720adbdd2e550..e6ca19039c223efc2b2d4b5de305315ebf8cb357 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@         ],
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1762618334,
-        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
+        "lastModified": 1754433428,
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1769164550,
-        "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=",
+        "lastModified": 1758956381,
+        "narHash": "sha256-ROUw5E8CibG3jEy6oHjrkF6/P60eiaUJmc2s2ecC/LM=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1",
+        "rev": "02dee881c3e644e2b561f407742f1fd927c40b83",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1760451332,
-        "narHash": "sha256-flofsttG4DizLuqPG+eTmoo0EUCj6F2+4vYWDBpOLM0=",
+        "lastModified": 1734153556,
+        "narHash": "sha256-2hnslSdVneyWggHgKVaJW4q+agEHnrrdITxqNBPWWAY=",
         "ref": "refs/heads/main",
-        "rev": "e33ca56f93606fb770369483bde156d08164e17a",
-        "revCount": 14,
+        "rev": "c72f0a08b102ede3857775c4e761f452a2772b26",
+        "revCount": 10,
         "type": "git",
         "url": "https://git.jolheiser.com/gomodinit.git"
       },
@@ -125,11 +125,11 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1769187349,
-        "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=",
+        "lastModified": 1757809953,
+        "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb",
+        "rev": "17a10049486f6698fca32097d8f52c0c895542b0",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1769086393,
-        "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
+        "lastModified": 1757775351,
+        "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
+        "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1769018530,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "lastModified": 1758035966,
+        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1768875095,
-        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
+        "lastModified": 1760934318,
+        "narHash": "sha256-/oUYsC0lUCBory65VK+UHqCCsCspbL1Vgfcf1KUYqVw=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
+        "rev": "87848bf0cc4f87717fc813a4575f07330c3e743c",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1769018530,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "lastModified": 1757745802,
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1769018530,
-        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
+        "lastModified": 1757745802,
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -319,11 +319,11 @@         "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1769201696,
-        "narHash": "sha256-99ia/BaiSdy55N54SZ1ULojqm/uvRlB3f8WcyJ0JNsg=",
+        "lastModified": 1757845540,
+        "narHash": "sha256-WuMsp7TgnuztF9oOdkbP2s3c2gBagRl9pbcVCWyfA1A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f3cabaf289d443b25fcd9415c40953a9a68ef1a7",
+        "rev": "c8366ecedc158e4884015657a8eb739ccb0092a6",
         "type": "github"
       },
       "original": {
@@ -372,11 +372,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1759419542,
-        "narHash": "sha256-IYPhZwflL8ctbiNf8PDYkYMRgeIMoP9S03DTZh+Gg8k=",
+        "lastModified": 1757116466,
+        "narHash": "sha256-ZYlc2K0myyPPm+8GfQygane2p3l6r3PpHKqEjezisdw=",
         "ref": "refs/heads/main",
-        "rev": "d4934212c67e592cb5df119881fa8d9201dae278",
-        "revCount": 26,
+        "rev": "a85e91448811bd48dc74b21b2df8690a32e9f27d",
+        "revCount": 25,
         "type": "git",
         "url": "https://git.jolheiser.com/go-spectre.git"
       },
@@ -421,11 +421,11 @@         "nixpkgs": "nixpkgs_9",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1763610823,
-        "narHash": "sha256-0/PDPc8ODlgR7ERViSEWPnu7z4sdPB+PXrVnL1ZRpmI=",
+        "lastModified": 1748361314,
+        "narHash": "sha256-OpbRZBs/3+F0pulG06vqkGcMW5P7S4BGQWpdDheB6Lw=",
         "owner": "tailscale-dev",
         "repo": "tclip",
-        "rev": "770d400091d0c75967d800abc3d4fac8d807f3b6",
+        "rev": "e022fc33592806f2cecb34f05ce2db977bc6e231",
         "type": "github"
       },
       "original": {
diff --git a/home/nogui/default.nix b/home/nogui/default.nix
index d5ad1421d6b2e01547de658e2e79496a8aeff7bd..1b14ea91afbc1e3277e356ef84da07c03fe75b4d 100644
--- a/home/nogui/default.nix
+++ b/home/nogui/default.nix
@@ -40,7 +40,7 @@       age
       atproto-goat
       cachix
       duf
-      dust
+      du-dust
       fd
       git-bug
       just
diff --git a/home/nogui/difftastic.nix b/home/nogui/difftastic.nix
deleted file mode 100644
index 00a188c22f964864c340116a51d3cace4790b221..0000000000000000000000000000000000000000
--- a/home/nogui/difftastic.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  programs.difftastic = {
-    enable = true;
-    git.enable = true;
-  };
-}
diff --git a/home/nogui/git.nix b/home/nogui/git.nix
index e45ec8446a8f4c6e9af986035367af8545e0487c..65eb46a8aa6e10f96d13c1a7a265b998b6aa7953 100644
--- a/home/nogui/git.nix
+++ b/home/nogui/git.nix
@@ -23,6 +23,25 @@ {
   age.secrets.git-send-email.file = ../../secrets/git-send-email.age;
   programs.git = {
     enable = true;
+    userName = jolheiser.git.username;
+    userEmail = jolheiser.git.email;
+    aliases = {
+      wt = "worktree";
+      ci = "commit -s -S -m";
+      ca = "commit --amend";
+      pf = "push --force";
+      br = "branch";
+      aa = "add .";
+      adog = "log --all --decorate --oneline --graph";
+      poh = "push origin HEAD";
+      cb = "checkout -b";
+      fu = "fetch upstream";
+      fo = "fetch origin";
+      dh = "diff HEAD";
+      unstage = "restore --staged";
+      last = "log --show-signature --format=fuller --max-count=1 HEAD";
+      tui = "!lazygit";
+    };
     lfs.enable = true;
     ignores = [
       ".idea/"
@@ -30,28 +49,7 @@       "result"
       "node_modules"
       "ve"
     ];
-    settings = {
-      user = {
-        name = jolheiser.git.username;
-        email = jolheiser.git.email;
-      };
-      alias = {
-        wt = "worktree";
-        ci = "commit -s -S -m";
-        ca = "commit --amend";
-        pf = "push --force";
-        br = "branch";
-        aa = "add .";
-        adog = "log --all --decorate --oneline --graph";
-        poh = "push origin HEAD";
-        cb = "checkout -b";
-        fu = "fetch upstream";
-        fo = "fetch origin";
-        dh = "diff HEAD";
-        unstage = "restore --staged";
-        last = "log --show-signature --format=fuller --max-count=1 HEAD";
-        tui = "!lazygit";
-      };
+    extraConfig = {
       init.defaultBranch = "main";
       merge.conflictstyle = "zdiff3";
       diff.colorMoved = "default";
@@ -76,8 +74,10 @@         // insteadOf "gt" "gitea.com"
         // insteadOf "gl" "gitlab.com"
         // insteadOf "cb" "codeberg.org"
         // insteadOf "tngl" "tangled.sh";
-    }
-    // sshSigning;
+    } // sshSigning;
+    difftastic = {
+      enable = true;
+    };
     includes = [ { inherit (config.age.secrets.git-send-email) path; } ];
   };
 }
diff --git a/home/nogui/gpg.nix b/home/nogui/gpg.nix
index 31b7938c484dff1d5bb54253f1ea5499cee4a895..86f080d7aa8a6a9a72cb3d361e97dfa839242111 100644
--- a/home/nogui/gpg.nix
+++ b/home/nogui/gpg.nix
@@ -3,7 +3,7 @@ let
   key = "0xB853ADA5DA7BBF7A";
 in
 {
-  home.packages = with pkgs; [ pinentry-gnome3 ];
+  home.packages = with pkgs; [ pinentry ];
   home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = {
     enable = true;
     text = builtins.toJSON {