dotnix

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186


diff --git a/flake.lock b/flake.lock
index e6ca19039c223efc2b2d4b5de305315ebf8cb357..14324cc391332ddd9ca1358e22b720adbdd2e550 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@         ],
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1754433428,
-        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
+        "lastModified": 1762618334,
+        "narHash": "sha256-wyT7Pl6tMFbFrs8Lk/TlEs81N6L+VSybPfiIgzU8lbQ=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
+        "rev": "fcdea223397448d35d9b31f798479227e80183f6",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1758956381,
-        "narHash": "sha256-ROUw5E8CibG3jEy6oHjrkF6/P60eiaUJmc2s2ecC/LM=",
+        "lastModified": 1769164550,
+        "narHash": "sha256-AxLb3L4j148v4Cj6ju5E9wsVdcHULuoI8il7+H5t6cs=",
         "owner": "catppuccin",
         "repo": "nix",
-        "rev": "02dee881c3e644e2b561f407742f1fd927c40b83",
+        "rev": "deb2a5a54cf9e05ddf60aeeb933f60ad2fac20e1",
         "type": "github"
       },
       "original": {
@@ -87,11 +87,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1734153556,
-        "narHash": "sha256-2hnslSdVneyWggHgKVaJW4q+agEHnrrdITxqNBPWWAY=",
+        "lastModified": 1760451332,
+        "narHash": "sha256-flofsttG4DizLuqPG+eTmoo0EUCj6F2+4vYWDBpOLM0=",
         "ref": "refs/heads/main",
-        "rev": "c72f0a08b102ede3857775c4e761f452a2772b26",
-        "revCount": 10,
+        "rev": "e33ca56f93606fb770369483bde156d08164e17a",
+        "revCount": 14,
         "type": "git",
         "url": "https://git.jolheiser.com/gomodinit.git"
       },
@@ -125,11 +125,11 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1757809953,
-        "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=",
+        "lastModified": 1769187349,
+        "narHash": "sha256-clG+nT6I2qxjIgk5WoSDKJyNhzKJs9jzbCujPF2S/yg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "17a10049486f6698fca32097d8f52c0c895542b0",
+        "rev": "082a4cd87c6089d1d9c58ebe52655f9e07245fcb",
         "type": "github"
       },
       "original": {
@@ -140,11 +140,11 @@       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1757775351,
-        "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=",
+        "lastModified": 1769086393,
+        "narHash": "sha256-3ymIZ8s3+hu7sDl/Y48o6bwMxorfKrmn97KuWiw1vjY=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5",
+        "rev": "9f7ba891ea5fc3ededd7804f1a23fafadbcb26ca",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758035966,
-        "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=",
+        "lastModified": 1769018530,
+        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8d4ddb19d03c65a36ad8d189d001dc32ffb0306b",
+        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1760934318,
-        "narHash": "sha256-/oUYsC0lUCBory65VK+UHqCCsCspbL1Vgfcf1KUYqVw=",
+        "lastModified": 1768875095,
+        "narHash": "sha256-dYP3DjiL7oIiiq3H65tGIXXIT1Waiadmv93JS0sS+8A=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "87848bf0cc4f87717fc813a4575f07330c3e743c",
+        "rev": "ed142ab1b3a092c4d149245d0c4126a5d7ea00b0",
         "type": "github"
       },
       "original": {
@@ -236,11 +236,11 @@       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1769018530,
+        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@       }
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1757745802,
-        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
+        "lastModified": 1769018530,
+        "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
+        "rev": "88d3861acdd3d2f0e361767018218e51810df8a1",
         "type": "github"
       },
       "original": {
@@ -319,11 +319,11 @@         "flake-parts": "flake-parts",
         "nixpkgs": "nixpkgs_6"
       },
       "locked": {
-        "lastModified": 1757845540,
-        "narHash": "sha256-WuMsp7TgnuztF9oOdkbP2s3c2gBagRl9pbcVCWyfA1A=",
+        "lastModified": 1769201696,
+        "narHash": "sha256-99ia/BaiSdy55N54SZ1ULojqm/uvRlB3f8WcyJ0JNsg=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "c8366ecedc158e4884015657a8eb739ccb0092a6",
+        "rev": "f3cabaf289d443b25fcd9415c40953a9a68ef1a7",
         "type": "github"
       },
       "original": {
@@ -372,11 +372,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_8"
       },
       "locked": {
-        "lastModified": 1757116466,
-        "narHash": "sha256-ZYlc2K0myyPPm+8GfQygane2p3l6r3PpHKqEjezisdw=",
+        "lastModified": 1759419542,
+        "narHash": "sha256-IYPhZwflL8ctbiNf8PDYkYMRgeIMoP9S03DTZh+Gg8k=",
         "ref": "refs/heads/main",
-        "rev": "a85e91448811bd48dc74b21b2df8690a32e9f27d",
-        "revCount": 25,
+        "rev": "d4934212c67e592cb5df119881fa8d9201dae278",
+        "revCount": 26,
         "type": "git",
         "url": "https://git.jolheiser.com/go-spectre.git"
       },
@@ -421,11 +421,11 @@         "nixpkgs": "nixpkgs_9",
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1748361314,
-        "narHash": "sha256-OpbRZBs/3+F0pulG06vqkGcMW5P7S4BGQWpdDheB6Lw=",
+        "lastModified": 1763610823,
+        "narHash": "sha256-0/PDPc8ODlgR7ERViSEWPnu7z4sdPB+PXrVnL1ZRpmI=",
         "owner": "tailscale-dev",
         "repo": "tclip",
-        "rev": "e022fc33592806f2cecb34f05ce2db977bc6e231",
+        "rev": "770d400091d0c75967d800abc3d4fac8d807f3b6",
         "type": "github"
       },
       "original": {

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13


diff --git a/home/nogui/default.nix b/home/nogui/default.nix
index 1b14ea91afbc1e3277e356ef84da07c03fe75b4d..d5ad1421d6b2e01547de658e2e79496a8aeff7bd 100644
--- a/home/nogui/default.nix
+++ b/home/nogui/default.nix
@@ -40,7 +40,7 @@       age
       atproto-goat
       cachix
       duf
-      du-dust
+      dust
       fd
       git-bug
       just

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12


diff --git a/home/nogui/difftastic.nix b/home/nogui/difftastic.nix
new file mode 100644
index 0000000000000000000000000000000000000000..00a188c22f964864c340116a51d3cace4790b221
--- /dev/null
+++ b/home/nogui/difftastic.nix
@@ -0,0 +1,6 @@
+{
+  programs.difftastic = {
+    enable = true;
+    git.enable = true;
+  };
+}

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73


diff --git a/home/nogui/git.nix b/home/nogui/git.nix
index 65eb46a8aa6e10f96d13c1a7a265b998b6aa7953..e45ec8446a8f4c6e9af986035367af8545e0487c 100644
--- a/home/nogui/git.nix
+++ b/home/nogui/git.nix
@@ -23,25 +23,6 @@ {
   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/"
@@ -49,7 +30,28 @@       "result"
       "node_modules"
       "ve"
     ];
-    extraConfig = {
+    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";
+      };
       init.defaultBranch = "main";
       merge.conflictstyle = "zdiff3";
       diff.colorMoved = "default";
@@ -74,10 +76,8 @@         // insteadOf "gt" "gitea.com"
         // insteadOf "gl" "gitlab.com"
         // insteadOf "cb" "codeberg.org"
         // insteadOf "tngl" "tangled.sh";
-    } // sshSigning;
-    difftastic = {
-      enable = true;
-    };
+    }
+    // sshSigning;
     includes = [ { inherit (config.age.secrets.git-send-email) path; } ];
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13


diff --git a/home/nogui/gpg.nix b/home/nogui/gpg.nix
index 86f080d7aa8a6a9a72cb3d361e97dfa839242111..31b7938c484dff1d5bb54253f1ea5499cee4a895 100644
--- a/home/nogui/gpg.nix
+++ b/home/nogui/gpg.nix
@@ -3,7 +3,7 @@ let
   key = "0xB853ADA5DA7BBF7A";
 in
 {
-  home.packages = with pkgs; [ pinentry ];
+  home.packages = with pkgs; [ pinentry-gnome3 ];
   home.file.".mozilla/native-messaging-hosts/gpgmejson.json" = {
     enable = true;
     text = builtins.toJSON {

Home