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

diff --git a/apps/gui/default.nix b/apps/gui/default.nix
index 1550be57386ddaee404665cc28691ee8a4c528a3..101e25fc341adb96b96a51eab61e0896aa575f57 100644
--- a/apps/gui/default.nix
+++ b/apps/gui/default.nix
@@ -27,11 +27,11 @@
       # IDEs
       jetbrains.goland
 
-      # Personal NUR
-      nur.repos.jolheiser.gomodinit
-      nur.repos.jolheiser.imp
-      nur.repos.jolheiser.kv
-      nur.repos.jolheiser.tmpl
+      # Flake overlays
+      jolheiser.gomodinit
+      jolheiser.imp
+      jolheiser.kv
+      jolheiser.tmpl
     ];
   };
 }

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

diff --git a/apps/nogui/default.nix b/apps/nogui/default.nix
index 0de7a0dcc34b5757fb4828456fa4d7aefc744617..63c21480abd4d2a214a2617072b48f990c9456cc 100644
--- a/apps/nogui/default.nix
+++ b/apps/nogui/default.nix
@@ -40,9 +40,9 @@       # Formatters
       alejandra
       gofumpt
 
-      # Personal NUR
-      nur.repos.jolheiser.git-age
-      nur.repos.jolheiser.tclip
+      # Flake overlays
+      jolheiser.git-age
+      tclip
     ];
     activation.report-changes = config.lib.dag.entryAnywhere ''
       ${pkgs.nvd}/bin/nvd --nix-bin-dir=${pkgs.nix}/bin diff $oldGenPath $newGenPath

 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

diff --git a/apps/nogui/nushell.nix b/apps/nogui/nushell.nix
index e10870eeb35ffaeca45059c573820e2827b144dd..bdc3972a876c5f96c2bc1221fa3746029c16e451 100644
--- a/apps/nogui/nushell.nix
+++ b/apps/nogui/nushell.nix
@@ -15,16 +15,16 @@       du = "dust -b -d 1";
       ll = "ls -al";
       nix-shell = "nix-shell --run nu";
     };
-    extraConfig = ''
-      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *
-      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/btm/btm-completions.nu *
-      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
-      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
-      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
-      use ${pkgs.nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
+    extraConfig = with pkgs; ''
+      use ${nu_scripts}/share/nu_scripts/custom-completions/bitwarden-cli/bitwarden-cli-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/btm/btm-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/git/git-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/glow/glow-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/just/just-completions.nu *
+      use ${nu_scripts}/share/nu_scripts/custom-completions/nix/nix-completions.nu *
 
-      use ${pkgs.nur.repos.jolheiser.kv}/share/kv-completions.nu *
-      use ${pkgs.nur.repos.jolheiser.tmpl}/share/tmpl-completions.nu *
+      use ${jolheiser.kv}/share/kv-completions.nu *
+      use ${jolheiser.tmpl}/share/tmpl-completions.nu *
     '';
     extraEnv = ''
       $env.GOPATH = "${config.xdg.dataHome}/go"

  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
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251

diff --git a/flake.lock b/flake.lock
index 0f4200ace48309bc2dad940331feb98e665602e3..3b52f694a5b58fd4afb9d30bfadda6ad34168a1d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,7 +3,7 @@   "nodes": {
     "agenix": {
       "inputs": {
         "darwin": [],
-        "home-manager": "home-manager",
+        "home-manager": [],
         "nixpkgs": [
           "nixpkgs"
         ]
@@ -40,28 +40,14 @@         "repo": "flake-utils",
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1681202837,
-        "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "cfacdce06f30d2b68473a46042957675eebb3401",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "golink": {
       "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs"
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1689362244,
@@ -105,27 +91,6 @@     },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
-          "agenix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1682203081,
-        "narHash": "sha256-kRL4ejWDhi0zph/FpebFYhzqlOBrk0Pl3dzGEKSAlEw=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "32d3e39c491e2f91152c84f8ad8b003420eab0a1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
           "nixpkgs"
         ]
       },
@@ -145,7 +110,9 @@       }
     },
     "jolheiser-nur": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": [
+          "nixpkgs"
+        ]
       },
       "locked": {
         "lastModified": 1692850752,
@@ -163,17 +130,18 @@       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1682929865,
-        "narHash": "sha256-jxVrgnf5QNjO+XoxDxUWtN2G5xyJSGZ5SWDQFxMuHxc=",
-        "owner": "NixOS",
+        "lastModified": 1693060755,
+        "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "f2e9a130461950270f87630b11132323706b4d91",
+        "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
         "type": "github"
       },
       "original": {
-        "id": "nixpkgs",
+        "owner": "nixos",
         "ref": "nixpkgs-unstable",
-        "type": "indirect"
+        "repo": "nixpkgs",
+        "type": "github"
       }
     },
     "nixpkgs-py36": {
@@ -192,53 +160,6 @@         "rev": "34f85de51bbc74595e63b22ee089adbb31f7c7a2",
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1688556768,
-        "narHash": "sha256-mhd6g0iJGjEfOr3+6mZZOclUveeNr64OwxdbNtLc8mY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "27bd67e55fe09f9d68c77ff151c3e44c4f81f7de",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_3": {
-      "locked": {
-        "lastModified": 1693060755,
-        "narHash": "sha256-KNsbfqewEziFJEpPR0qvVz4rx0x6QXxw1CcunRhlFdk=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "c66ccfa00c643751da2fd9290e096ceaa30493fc",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1692447944,
-        "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d680ded26da5cf104dd2735a51e88d2d8f487b4d",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-unstable",
-        "type": "indirect"
-      }
-    },
     "nur": {
       "locked": {
         "lastModified": 1693943116,
@@ -259,9 +180,9 @@       "inputs": {
         "agenix": "agenix",
         "flake-utils": "flake-utils",
         "golink": "golink",
-        "home-manager": "home-manager_2",
+        "home-manager": "home-manager",
         "jolheiser-nur": "jolheiser-nur",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs",
         "nixpkgs-py36": "nixpkgs-py36",
         "nur": "nur",
         "tclip": "tclip"
@@ -282,41 +203,15 @@         "repo": "default",
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "tclip": {
       "inputs": {
         "gomod2nix": "gomod2nix",
-        "nixpkgs": "nixpkgs_4",
-        "utils": "utils"
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "utils": [
+          "flake-utils"
+        ]
       },
       "locked": {
         "lastModified": 1693326365,
@@ -329,24 +224,6 @@       },
       "original": {
         "owner": "tailscale-dev",
         "repo": "tclip",
-        "type": "github"
-      }
-    },
-    "utils": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
         "type": "github"
       }
     }

 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

diff --git a/flake.nix b/flake.nix
index d5085546c7ffb797ec04d8e588ffb90930a40265..d2bdbd01a37a6d5ba72c28c50340c1fc163fa0bb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,6 +3,8 @@   description = "jolheiser's nixos config";
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -12,18 +14,32 @@       url = "github:ryantm/agenix";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         darwin.follows = "";
+        home-manager.follows = "";
       };
     };
     flake-utils.url = "github:numtide/flake-utils";
 
     nur.url = "github:nix-community/NUR";
-    jolheiser-nur.url = "git+https://git.jojodev.com/jolheiser/nur";
-
-    nixpkgs-py36.url = "github:nixos/nixpkgs/34f85de51bbc74595e63b22ee089adbb31f7c7a2";
+    jolheiser-nur = {
+      url = "git+https://git.jojodev.com/jolheiser/nur";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     # Other flakes
-    golink.url = "github:tailscale/golink";
-    tclip.url = "github:tailscale-dev/tclip";
+    golink = {
+      url = "github:tailscale/golink";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        flake-utils.follows = "flake-utils";
+      };
+    };
+    tclip = {
+      url = "github:tailscale-dev/tclip";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        utils.follows = "flake-utils";
+      };
+    };
   };
 
   outputs = {
@@ -42,10 +58,9 @@       (final: prev: {
         nur = import inputs.nur {
           nurpkgs = prev;
           pkgs = prev;
-          repoOverrides = {
-            jolheiser = import jolheiser-nur {pkgs = prev;};
-          };
         };
+        jolheiser = inputs.jolheiser-nur.packages.${prev.system};
+        tclip = inputs.tclip.packages.${prev.system}.tclip;
       })
       golink.overlay
     ];

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

diff --git a/machines/chai/default.nix b/machines/chai/default.nix
index 837f4b9927b6641e54f7c63029248b5e0e2f6f29..7f55f51fc61c66187ae3c73114b2103a314f7c5a 100644
--- a/machines/chai/default.nix
+++ b/machines/chai/default.nix
@@ -57,8 +57,8 @@     subversion
     teams-for-linux
     xorg.xauth
 
-    # Personal NUR
-    nur.repos.jolheiser.prospect-mail
+    # Flake overlay
+    jolheiser.prospect-mail
   ];
 
   system.stateVersion = "22.11";