aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock301
-rw-r--r--flake.nix17
-rw-r--r--hosts/laurel/configuration.nix4
-rw-r--r--hosts/laurel/servarr.nix2
4 files changed, 313 insertions, 11 deletions
diff --git a/flake.lock b/flake.lock
new file mode 100644
index 0000000..9faf5d0
--- /dev/null
+++ b/flake.lock
@@ -0,0 +1,301 @@
1{
2 "nodes": {
3 "better-text-objs": {
4 "inputs": {
5 "nixpkgs": [
6 "nixpkgs"
7 ]
8 },
9 "locked": {
10 "lastModified": 1674354525,
11 "narHash": "sha256-C0Fc7I2S1MGNGKgvGkMzzEyVF3WkRHlj8i+PF0o9tYI=",
12 "ref": "refs/heads/master",
13 "rev": "697b2c8f2415832bae7520a1d802e080363aa84b",
14 "revCount": 5,
15 "type": "git",
16 "url": "https://git.peppe.rs/vim/better-text-objs"
17 },
18 "original": {
19 "type": "git",
20 "url": "https://git.peppe.rs/vim/better-text-objs"
21 }
22 },
23 "flake-parts": {
24 "inputs": {
25 "nixpkgs-lib": "nixpkgs-lib"
26 },
27 "locked": {
28 "lastModified": 1727826117,
29 "narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=",
30 "owner": "hercules-ci",
31 "repo": "flake-parts",
32 "rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1",
33 "type": "github"
34 },
35 "original": {
36 "owner": "hercules-ci",
37 "repo": "flake-parts",
38 "type": "github"
39 }
40 },
41 "home-manager": {
42 "inputs": {
43 "nixpkgs": [
44 "nixpkgs"
45 ]
46 },
47 "locked": {
48 "lastModified": 1730016908,
49 "narHash": "sha256-bFCxJco7d8IgmjfNExNz9knP8wvwbXU4s/d53KOK6U0=",
50 "owner": "nix-community",
51 "repo": "home-manager",
52 "rev": "e83414058edd339148dc142a8437edb9450574c8",
53 "type": "github"
54 },
55 "original": {
56 "owner": "nix-community",
57 "repo": "home-manager",
58 "type": "github"
59 }
60 },
61 "niri": {
62 "inputs": {
63 "flake-parts": "flake-parts",
64 "niri-stable": "niri-stable",
65 "niri-unstable": "niri-unstable",
66 "nixpkgs": [
67 "nixpkgs"
68 ],
69 "nixpkgs-stable": "nixpkgs-stable",
70 "xwayland-satellite-stable": "xwayland-satellite-stable",
71 "xwayland-satellite-unstable": "xwayland-satellite-unstable"
72 },
73 "locked": {
74 "lastModified": 1730267238,
75 "narHash": "sha256-Qwr72PbHBmc88UeLtm7K6/PJ0cfJjq8p2R4lsHA4cWw=",
76 "owner": "sodiboo",
77 "repo": "niri-flake",
78 "rev": "92d467d0c2dc8aeade9d858c95104b6a678cd9c0",
79 "type": "github"
80 },
81 "original": {
82 "owner": "sodiboo",
83 "repo": "niri-flake",
84 "type": "github"
85 }
86 },
87 "niri-stable": {
88 "flake": false,
89 "locked": {
90 "lastModified": 1726304152,
91 "narHash": "sha256-4YDrKMwXGVOBkeaISbxqf24rLuHvO98TnqxWYfgiSeg=",
92 "owner": "YaLTeR",
93 "repo": "niri",
94 "rev": "6a48728ffb1e638839b07f9ab2f06b2adb41dc61",
95 "type": "github"
96 },
97 "original": {
98 "owner": "YaLTeR",
99 "ref": "v0.1.9",
100 "repo": "niri",
101 "type": "github"
102 }
103 },
104 "niri-unstable": {
105 "flake": false,
106 "locked": {
107 "lastModified": 1730263923,
108 "narHash": "sha256-HFOXeh+WNtAwuV/KNtOSKXGnOoy465a/dud2zvtsCt8=",
109 "owner": "YaLTeR",
110 "repo": "niri",
111 "rev": "d3e72245b003cbeed0810bf00c4a445b7c8a652a",
112 "type": "github"
113 },
114 "original": {
115 "owner": "YaLTeR",
116 "repo": "niri",
117 "type": "github"
118 }
119 },
120 "nixos-hardware": {
121 "locked": {
122 "lastModified": 1730161780,
123 "narHash": "sha256-z5ILcmwMtiCoHTXS1KsQWqigO7HJO8sbyK7f7wn9F/E=",
124 "owner": "nixos",
125 "repo": "nixos-hardware",
126 "rev": "07d15e8990d5d86a631641b4c429bc0a7400cfb8",
127 "type": "github"
128 },
129 "original": {
130 "owner": "nixos",
131 "repo": "nixos-hardware",
132 "type": "github"
133 }
134 },
135 "nixpkgs": {
136 "locked": {
137 "lastModified": 1730045389,
138 "narHash": "sha256-4spSNTZ6h8Xmvrr9oqfuxc9jarasGj1QOcsgw8BfNd8=",
139 "owner": "NixOS",
140 "repo": "nixpkgs",
141 "rev": "0fcb98acb6633445764dafe180e6833eb0f95208",
142 "type": "github"
143 },
144 "original": {
145 "owner": "NixOS",
146 "ref": "nixpkgs-unstable",
147 "repo": "nixpkgs",
148 "type": "github"
149 }
150 },
151 "nixpkgs-lib": {
152 "locked": {
153 "lastModified": 1727825735,
154 "narHash": "sha256-0xHYkMkeLVQAMa7gvkddbPqpxph+hDzdu1XdGPJR+Os=",
155 "type": "tarball",
156 "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
157 },
158 "original": {
159 "type": "tarball",
160 "url": "https://github.com/NixOS/nixpkgs/archive/fb192fec7cc7a4c26d51779e9bab07ce6fa5597a.tar.gz"
161 }
162 },
163 "nixpkgs-stable": {
164 "locked": {
165 "lastModified": 1730137625,
166 "narHash": "sha256-9z8oOgFZiaguj+bbi3k4QhAD6JabWrnv7fscC/mt0KE=",
167 "owner": "NixOS",
168 "repo": "nixpkgs",
169 "rev": "64b80bfb316b57cdb8919a9110ef63393d74382a",
170 "type": "github"
171 },
172 "original": {
173 "owner": "NixOS",
174 "ref": "nixos-24.05",
175 "repo": "nixpkgs",
176 "type": "github"
177 }
178 },
179 "nixpkgs_2": {
180 "locked": {
181 "lastModified": 1724748588,
182 "narHash": "sha256-NlpGA4+AIf1dKNq76ps90rxowlFXUsV9x7vK/mN37JM=",
183 "owner": "nixos",
184 "repo": "nixpkgs",
185 "rev": "a6292e34000dc93d43bccf78338770c1c5ec8a99",
186 "type": "github"
187 },
188 "original": {
189 "owner": "nixos",
190 "ref": "nixpkgs-unstable",
191 "repo": "nixpkgs",
192 "type": "github"
193 }
194 },
195 "prompt": {
196 "inputs": {
197 "nixpkgs": [
198 "nixpkgs"
199 ]
200 },
201 "locked": {
202 "lastModified": 1701510523,
203 "narHash": "sha256-uf0JCa+PP/aM77icihT79hew1/TTcMJV6AoIfmuLABM=",
204 "ref": "refs/heads/master",
205 "rev": "9450828084f42d3f1eb261c00820cfd2bf8b819b",
206 "revCount": 7,
207 "type": "git",
208 "url": "https://git.peppe.rs/cli/prompt"
209 },
210 "original": {
211 "type": "git",
212 "url": "https://git.peppe.rs/cli/prompt"
213 }
214 },
215 "readit": {
216 "inputs": {
217 "nixpkgs": "nixpkgs_2"
218 },
219 "locked": {
220 "lastModified": 1730847014,
221 "narHash": "sha256-ZnXEn7bUg43yeePXkG8THfCQTC7YmchigPnOx3pd0+w=",
222 "ref": "refs/heads/master",
223 "rev": "276f8e058d831429f171293e399f43c94719a504",
224 "revCount": 32,
225 "type": "git",
226 "url": "https://git.peppe.rs/web/readit"
227 },
228 "original": {
229 "type": "git",
230 "url": "https://git.peppe.rs/web/readit"
231 }
232 },
233 "root": {
234 "inputs": {
235 "better-text-objs": "better-text-objs",
236 "home-manager": "home-manager",
237 "niri": "niri",
238 "nixos-hardware": "nixos-hardware",
239 "nixpkgs": "nixpkgs",
240 "prompt": "prompt",
241 "readit": "readit",
242 "vim-colors-plain": "vim-colors-plain"
243 }
244 },
245 "vim-colors-plain": {
246 "inputs": {
247 "nixpkgs": [
248 "nixpkgs"
249 ]
250 },
251 "locked": {
252 "lastModified": 1730272245,
253 "narHash": "sha256-B5ADR+N8297uv9i6HazGaT/uSXM5aJ9RpXNnVQPQPQI=",
254 "owner": "oppiliappan",
255 "repo": "vim-colors-plain",
256 "rev": "d9b9c11a55ec5500c65d062490f60ea707eb46c8",
257 "type": "github"
258 },
259 "original": {
260 "owner": "oppiliappan",
261 "repo": "vim-colors-plain",
262 "type": "github"
263 }
264 },
265 "xwayland-satellite-stable": {
266 "flake": false,
267 "locked": {
268 "lastModified": 1718165778,
269 "narHash": "sha256-dwF9nI54a6Fo9XU5s4qmvMXSgCid3YQVGxch00qEMvI=",
270 "owner": "Supreeeme",
271 "repo": "xwayland-satellite",
272 "rev": "b6d281967cb0b7bf1dfdb8d0f597b517dc4aa5c5",
273 "type": "github"
274 },
275 "original": {
276 "owner": "Supreeeme",
277 "ref": "v0.4",
278 "repo": "xwayland-satellite",
279 "type": "github"
280 }
281 },
282 "xwayland-satellite-unstable": {
283 "flake": false,
284 "locked": {
285 "lastModified": 1730258684,
286 "narHash": "sha256-E+69sdxUhPSNI8+JlTL6KKbNv5qVD3L1y8hdVO37A44=",
287 "owner": "Supreeeme",
288 "repo": "xwayland-satellite",
289 "rev": "b0ee6db9fa9901c675b3c7e952c2a8ce987a0f58",
290 "type": "github"
291 },
292 "original": {
293 "owner": "Supreeeme",
294 "repo": "xwayland-satellite",
295 "type": "github"
296 }
297 }
298 },
299 "root": "root",
300 "version": 7
301}
diff --git a/flake.nix b/flake.nix
index c6f8c48..61b529a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,14 +22,14 @@
22 }; 22 };
23 23
24 vim-colors-plain = { 24 vim-colors-plain = {
25 url = "git+https://git.peppe.rs/vim/vim-colors-plain"; 25 url = "github:oppiliappan/vim-colors-plain";
26 inputs.nixpkgs.follows = "nixpkgs"; 26 inputs.nixpkgs.follows = "nixpkgs";
27 }; 27 };
28 28
29 flaresolverr = { 29 # flaresolverr = {
30 url = "git+https://git.peppe.rs/flakes/flaresolverr"; 30 # url = "git+https://git.peppe.rs/flakes/flaresolverr";
31 inputs.nixpkgs.follows = "nixpkgs"; 31 # inputs.nixpkgs.follows = "nixpkgs";
32 }; 32 # };
33 33
34 niri = { 34 niri = {
35 url = "github:sodiboo/niri-flake"; 35 url = "github:sodiboo/niri-flake";
@@ -50,7 +50,7 @@
50 , prompt 50 , prompt
51 , better-text-objs 51 , better-text-objs
52 , vim-colors-plain 52 , vim-colors-plain
53 , flaresolverr 53 # , flaresolverr
54 , niri 54 , niri
55 , readit 55 , readit
56 , ... 56 , ...
@@ -61,7 +61,8 @@
61 prompt = prompt.overlay; 61 prompt = prompt.overlay;
62 better-text-objs = better-text-objs.overlay; 62 better-text-objs = better-text-objs.overlay;
63 vim-colors-plain = vim-colors-plain.overlay; 63 vim-colors-plain = vim-colors-plain.overlay;
64 flaresolverr = flaresolverr.overlays.default; 64 # flaresolverr = flaresolverr.overlays.default;
65 niri = niri.overlays.niri;
65 }; 66 };
66 67
67 formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt; 68 formatter."x86_64-linux" = nixpkgs.legacyPackages."x86_64-linux".nixpkgs-fmt;
@@ -131,7 +132,7 @@
131 imports = [ ./hosts/laurel/configuration.nix ]; 132 imports = [ ./hosts/laurel/configuration.nix ];
132 _module.args.self = self; 133 _module.args.self = self;
133 } 134 }
134 flaresolverr.nixosModules.default 135 # flaresolverr.nixosModules.default
135 readit.nixosModules.default 136 readit.nixosModules.default
136 ]; 137 ];
137 }; 138 };
diff --git a/hosts/laurel/configuration.nix b/hosts/laurel/configuration.nix
index 61d8ed1..8ff1fe5 100644
--- a/hosts/laurel/configuration.nix
+++ b/hosts/laurel/configuration.nix
@@ -33,7 +33,7 @@
33 }; 33 };
34 34
35 # Enable sound. 35 # Enable sound.
36 sound.enable = true; 36 # sound.enable = true;
37 hardware.pulseaudio.enable = true; 37 hardware.pulseaudio.enable = true;
38 hardware.opengl = { 38 hardware.opengl = {
39 enable = true; 39 enable = true;
@@ -155,7 +155,7 @@
155 }; 155 };
156 }; 156 };
157 services.mautrix-whatsapp = { 157 services.mautrix-whatsapp = {
158 enable = true; 158 enable = false;
159 settings = { 159 settings = {
160 homeserver = { 160 homeserver = {
161 address = "http://localhost:6197"; 161 address = "http://localhost:6197";
diff --git a/hosts/laurel/servarr.nix b/hosts/laurel/servarr.nix
index cc225c1..e9c06c4 100644
--- a/hosts/laurel/servarr.nix
+++ b/hosts/laurel/servarr.nix
@@ -4,7 +4,7 @@
4 imports = [ ]; 4 imports = [ ];
5 5
6 nixpkgs.overlays = with self.overlays; [ 6 nixpkgs.overlays = with self.overlays; [
7 flaresolverr 7 #flaresolverr
8 ]; 8 ];
9 9
10 users.groups."torrent".members = [ 10 users.groups."torrent".members = [