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

diff --git a/apps/de/default.nix b/apps/de/default.nix
index 25c34e35131dfb70ccbda8ea2164784d9ddd55d4..d5ce532f61d6f008683fba3031c410c49978c57b 100644
--- a/apps/de/default.nix
+++ b/apps/de/default.nix
@@ -21,6 +21,7 @@       };
       "org/gnome/desktop/interface" = {
         document-font-name = "MonaspiceXe Nerd Font Regular 10";
         monospace-font-name = "MonaspiceAr Nerd Font Regular 10";
+        color-scheme = "prefer-dark";
       };
     };
 

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20

diff --git a/apps/nogui/go.nix b/apps/nogui/go.nix
index 47f4a8ff1620cf059b4b8af0202d73a551f80cab..527efff0355c41759d59929a897a15178ac4d330 100644
--- a/apps/nogui/go.nix
+++ b/apps/nogui/go.nix
@@ -1,10 +1,12 @@
 let
-  goPath = ".local/share/go";
+  GOPATH = ".local/share/go";
 in
 {
   programs.go = {
-    inherit goPath;
     enable = true;
-    goBin = "${goPath}/bin";
+    env = {
+      inherit GOPATH;
+      GOBIN = "${GOPATH}/bin";
+    };
   };
 }

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

diff --git a/apps/nogui/gpg.nix b/apps/nogui/gpg.nix
index bbf88d12445212bfa5f9e7f2d37cb5dcdb0864cb..86f080d7aa8a6a9a72cb3d361e97dfa839242111 100644
--- a/apps/nogui/gpg.nix
+++ b/apps/nogui/gpg.nix
@@ -34,6 +34,6 @@   services.gpg-agent = {
     enable = false;
     enableExtraSocket = true;
     enableSshSupport = true;
-    pinentryPackage = pkgs.pinentry-gnome3;
+    pinentry.package = pkgs.pinentry-gnome3;
   };
 }

 1
 2
 3
 4
 5
 6
 7
 8
 9
10
11
12
13
14
15
16
17
18
19
20
21
22

diff --git a/apps/nogui/jj.nix b/apps/nogui/jj.nix
index 36438c2a97f65e11610663bf4cbdb5387c119a7e..b77e6e987dd88e9e4e60e1472185b0ae492af8a9 100644
--- a/apps/nogui/jj.nix
+++ b/apps/nogui/jj.nix
@@ -8,7 +8,7 @@         name = "jolheiser";
         email = "git@jolheiser.com";
       };
       ui = {
-        diff.tool = [
+        diff-formatter = [
           "${pkgs.difftastic}/bin/difft"
           "--color=always"
           "$left"
@@ -18,7 +18,7 @@         editor = "hx";
         paginate = "never";
         default-command = "log";
       };
-      git.push-bookmark-prefix = "change/";
+      templates.git_push_bookmark = ''"change/" ++ change_id.short()'';
       signing = {
         behavior = "own";
         backend = "ssh";

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

diff --git a/apps/nogui/nushell/git-bug.nu b/apps/nogui/nushell/git-bug.nu
index 3678b9b9c2dadfdd0e4ad2155bbfd0ee5700132b..c0f421229e60b912d8daa9b7bfaa86a7824e2934 100644
--- a/apps/nogui/nushell/git-bug.nu
+++ b/apps/nogui/nushell/git-bug.nu
@@ -1,6 +1,6 @@
 export def "git bug init" [] {
   git bug pull
-  let id = ^git-bug user -f json | from json | where name == 'jolheiser' | get -i human_id.0
+  let id = ^git-bug user -f json | from json | where name == 'jolheiser' | get --optional human_id.0
   if ($id | is-not-empty) {
     ^git-bug user adopt $id
   } else {

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

diff --git a/apps/nogui/nushell/ssh.nu b/apps/nogui/nushell/ssh.nu
index 2c02adb50079878495a244dec118bfcf1a4dc829..5c38eadcca29ddd14b9ce99621010fd57f550322 100644
--- a/apps/nogui/nushell/ssh.nu
+++ b/apps/nogui/nushell/ssh.nu
@@ -63,7 +63,7 @@ def "nu-complete ssh-host" [] {
     mut files = [
         '/etc/ssh/ssh_config',
         '~/.ssh/config'
-    ] | filter { |file| $file | path exists }
+    ] | where { |file| $file | path exists }
 
 
     $files | each { |file|

 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

diff --git a/apps/nogui/ssh.nix b/apps/nogui/ssh.nix
index b6afe164c19bae3bec0d1683807c105959e3ce2b..cdccc297670b646dcfe3a57e3ef4124a36589fd1 100644
--- a/apps/nogui/ssh.nix
+++ b/apps/nogui/ssh.nix
@@ -6,6 +6,20 @@     includes = [ config.age.secrets.ssh-config.path ];
     extraConfig = ''
       IdentitiesOnly yes
     '';
+    # TODO modify this? This is what the old defaults were.
+    enableDefaultConfig = false;
+    matchBlocks."*" = {
+      forwardAgent = false;
+      addKeysToAgent = "no";
+      compression = false;
+      serverAliveInterval = 0;
+      serverAliveCountMax = 3;
+      hashKnownHosts = false;
+      userKnownHostsFile = "~/.ssh/known_hosts";
+      controlMaster = "no";
+      controlPath = "~/.ssh/master-%r@%n:%p";
+      controlPersist = "no";
+    };
   };
   services.ssh-agent.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
 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
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211

diff --git a/flake.lock b/flake.lock
index a3e64ca128b8fe07b1b055a6c9b6314bdf3e5e3b..a24712ce9dc46a9ee919b6942cd9bcb302ffb50e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -12,11 +12,11 @@         ],
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1747575206,
-        "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
+        "lastModified": 1754433428,
+        "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
+        "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
         "type": "github"
       },
       "original": {
@@ -30,11 +30,11 @@       "inputs": {
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1729195705,
-        "narHash": "sha256-adYNn7zLF0WL/QnwuCf+qo/x2BRV5qmZUZK0uAaS8vg=",
+        "lastModified": 1756152754,
+        "narHash": "sha256-GWXqV/BD7AisNVmJw92Ft3myWD48H23+cmyV17yEe6E=",
         "ref": "refs/heads/main",
-        "rev": "281b64352ff6a2bcca6ce2c5e4b3adc8d08d32d3",
-        "revCount": 10,
+        "rev": "2d0ac7163fc5126251847c958793c75aea8c4ac9",
+        "revCount": 11,
         "type": "git",
         "url": "https://git.jolheiser.com/cfg.git"
       },
@@ -87,11 +87,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1754448815,
-        "narHash": "sha256-Kk7p7bNfjBlaHa0rZR71kwbrbawHDR/l0KdNSBbJjUY=",
+        "lastModified": 1754481695,
+        "narHash": "sha256-stYwz0zQrjZXMl4+OlpHqa2yNesDU3ZhteNn4Sr7hJA=",
         "ref": "refs/heads/main",
-        "rev": "c6c255ff885c7219b1a3e6521289409fd268239b",
-        "revCount": 32,
+        "rev": "ca81e960f7faf55a686e2d5cb24e40840e85cc3d",
+        "revCount": 33,
         "type": "git",
         "url": "https://git.jolheiser.com/helix.drv.git"
       },
@@ -107,11 +107,11 @@           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1748391243,
-        "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=",
+        "lastModified": 1757809953,
+        "narHash": "sha256-29mlXbfAJhz9cWVrPP4STvVPDVZFCfCOmaIN5lFJa+Y=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "f5b12be834874f7661db4ced969a621ab2d57971",
+        "rev": "17a10049486f6698fca32097d8f52c0c895542b0",
         "type": "github"
       },
       "original": {
@@ -122,11 +122,11 @@       }
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1747900541,
-        "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=",
+        "lastModified": 1757775351,
+        "narHash": "sha256-xWsxmNHwt9jV/yFJqzsNeilpH4BR8MPe44Yt0eaGAIM=",
         "owner": "nixos",
         "repo": "nixos-hardware",
-        "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06",
+        "rev": "f89c620d3d6e584d98280b48f0af7be4f8506ab5",
         "type": "github"
       },
       "original": {
@@ -138,11 +138,11 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1717786204,
-        "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=",
+        "lastModified": 1755615617,
+        "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "051f920625ab5aabe37c920346e3e69d7d34400e",
+        "rev": "20075955deac2583bb12f07151c2df830ef346b4",
         "type": "github"
       },
       "original": {
@@ -186,11 +186,11 @@       }
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1748190013,
-        "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
+        "lastModified": 1757745802,
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -202,11 +202,11 @@       }
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1748190013,
-        "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
+        "lastModified": 1757745802,
+        "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
+        "rev": "c23193b943c6c689d70ee98ce3128239ed9e32d1",
         "type": "github"
       },
       "original": {
@@ -234,16 +234,16 @@       }
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1726937504,
-        "narHash": "sha256-bvGoiQBvponpZh8ClUcmJ6QnsNKw0EMrCQJARK3bI1c=",
+        "lastModified": 1756911493,
+        "narHash": "sha256-6n/n1GZQ/vi+LhFXMSyoseKdNfc2QQaSBXJdgamrbkE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "9357f4f23713673f310988025d9dc261c20e70c6",
+        "rev": "c6a788f552b7b7af703b1a29802a7233c0067908",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "nixos-unstable",
+        "ref": "nixpkgs-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -266,15 +266,14 @@     },
     "nur": {
       "inputs": {
         "flake-parts": "flake-parts",
-        "nixpkgs": "nixpkgs_5",
-        "treefmt-nix": "treefmt-nix"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
-        "lastModified": 1748393063,
-        "narHash": "sha256-G7xbGhrSZqlMYrrjqe6HOG/yQldfnCaa7ZuPVteiIOE=",
+        "lastModified": 1757845540,
+        "narHash": "sha256-WuMsp7TgnuztF9oOdkbP2s3c2gBagRl9pbcVCWyfA1A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "86cc4fe96799d2415a824daf0cfcdfc7205e7fca",
+        "rev": "c8366ecedc158e4884015657a8eb739ccb0092a6",
         "type": "github"
       },
       "original": {
@@ -321,11 +320,11 @@       "inputs": {
         "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1732207908,
-        "narHash": "sha256-qXsiaX1diDURGPFTn3HDepf5IIVV05qFqMap4niQW8I=",
+        "lastModified": 1757116466,
+        "narHash": "sha256-ZYlc2K0myyPPm+8GfQygane2p3l6r3PpHKqEjezisdw=",
         "ref": "refs/heads/main",
-        "rev": "3be0914920858646d81643c64b1492364824f351",
-        "revCount": 24,
+        "rev": "a85e91448811bd48dc74b21b2df8690a32e9f27d",
+        "revCount": 25,
         "type": "git",
         "url": "https://git.jolheiser.com/go-spectre.git"
       },
@@ -380,27 +379,6 @@       },
       "original": {
         "owner": "tailscale-dev",
         "repo": "tclip",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
         "type": "github"
       }
     },