diff options
-rw-r--r-- | flake.lock | 141 | ||||
-rw-r--r-- | flake.nix | 4 | ||||
-rw-r--r-- | home.nix | 1 | ||||
-rw-r--r-- | hosts/olive/configuration.nix | 13 |
4 files changed, 91 insertions, 68 deletions
@@ -1,5 +1,27 @@ | |||
1 | { | 1 | { |
2 | "nodes": { | 2 | "nodes": { |
3 | "fenix": { | ||
4 | "inputs": { | ||
5 | "nixpkgs": [ | ||
6 | "statix", | ||
7 | "nixpkgs" | ||
8 | ], | ||
9 | "rust-analyzer-src": "rust-analyzer-src" | ||
10 | }, | ||
11 | "locked": { | ||
12 | "lastModified": 1638080655, | ||
13 | "narHash": "sha256-ZPx8e8CukEBx31IcgivAWnN9Jg0r+LTBPHV7fREf+QI=", | ||
14 | "owner": "nix-community", | ||
15 | "repo": "fenix", | ||
16 | "rev": "78a0c55b6f9d8bb6f3b89eb995fa5bbdd73e9475", | ||
17 | "type": "github" | ||
18 | }, | ||
19 | "original": { | ||
20 | "owner": "nix-community", | ||
21 | "repo": "fenix", | ||
22 | "type": "github" | ||
23 | } | ||
24 | }, | ||
3 | "flake-compat": { | 25 | "flake-compat": { |
4 | "flake": false, | 26 | "flake": false, |
5 | "locked": { | 27 | "locked": { |
@@ -31,55 +53,45 @@ | |||
31 | "type": "github" | 53 | "type": "github" |
32 | } | 54 | } |
33 | }, | 55 | }, |
34 | "home-manager": { | 56 | "gitignore": { |
35 | "inputs": { | 57 | "inputs": { |
36 | "nixpkgs": [ | 58 | "nixpkgs": [ |
59 | "statix", | ||
37 | "nixpkgs" | 60 | "nixpkgs" |
38 | ] | 61 | ] |
39 | }, | 62 | }, |
40 | "locked": { | 63 | "locked": { |
41 | "lastModified": 1634544068, | 64 | "lastModified": 1635165013, |
42 | "narHash": "sha256-RlRQBaAHfdWqfRyHdWuDPMkplBTYwuyDQqDcNbP/Sog=", | 65 | "narHash": "sha256-o/BdVjNwcB6jOmzZjOH703BesSkkS5O7ej3xhyO8hAY=", |
43 | "owner": "nix-community", | 66 | "owner": "hercules-ci", |
44 | "repo": "home-manager", | 67 | "repo": "gitignore.nix", |
45 | "rev": "ff2bed9dac84fb202bbb3c49fdcfe30c29d0b12f", | 68 | "rev": "5b9e0ff9d3b551234b4f3eb3983744fa354b17f1", |
46 | "type": "github" | 69 | "type": "github" |
47 | }, | 70 | }, |
48 | "original": { | 71 | "original": { |
49 | "owner": "nix-community", | 72 | "owner": "hercules-ci", |
50 | "ref": "release-21.05", | 73 | "repo": "gitignore.nix", |
51 | "repo": "home-manager", | ||
52 | "type": "github" | 74 | "type": "github" |
53 | } | 75 | } |
54 | }, | 76 | }, |
55 | "import-cargo": { | 77 | "home-manager": { |
56 | "locked": { | 78 | "inputs": { |
57 | "lastModified": 1594305518, | 79 | "nixpkgs": [ |
58 | "narHash": "sha256-frtArgN42rSaEcEOYWg8sVPMUK+Zgch3c+wejcpX3DY=", | 80 | "nixpkgs" |
59 | "owner": "edolstra", | 81 | ] |
60 | "repo": "import-cargo", | ||
61 | "rev": "25d40be4a73d40a2572e0cc233b83253554f06c5", | ||
62 | "type": "github" | ||
63 | }, | 82 | }, |
64 | "original": { | ||
65 | "owner": "edolstra", | ||
66 | "repo": "import-cargo", | ||
67 | "type": "github" | ||
68 | } | ||
69 | }, | ||
70 | "mozillapkgs": { | ||
71 | "flake": false, | ||
72 | "locked": { | 83 | "locked": { |
73 | "lastModified": 1629225446, | 84 | "lastModified": 1639871969, |
74 | "narHash": "sha256-HJX4Pc5ZUAg4apxB/XHuJ+6ukzvRQqeZMjscOBst2bA=", | 85 | "narHash": "sha256-6feWUnMygRzA9tzkrfAzpA5/NBYg75bkFxnqb1DtD7E=", |
75 | "owner": "mozilla", | 86 | "owner": "nix-community", |
76 | "repo": "nixpkgs-mozilla", | 87 | "repo": "home-manager", |
77 | "rev": "0510159186dd2ef46e5464484fbdf119393afa58", | 88 | "rev": "697cc8c68ed6a606296efbbe9614c32537078756", |
78 | "type": "github" | 89 | "type": "github" |
79 | }, | 90 | }, |
80 | "original": { | 91 | "original": { |
81 | "owner": "mozilla", | 92 | "owner": "nix-community", |
82 | "repo": "nixpkgs-mozilla", | 93 | "ref": "release-21.11", |
94 | "repo": "home-manager", | ||
83 | "type": "github" | 95 | "type": "github" |
84 | } | 96 | } |
85 | }, | 97 | }, |
@@ -90,11 +102,11 @@ | |||
90 | "nixpkgs": "nixpkgs" | 102 | "nixpkgs": "nixpkgs" |
91 | }, | 103 | }, |
92 | "locked": { | 104 | "locked": { |
93 | "lastModified": 1635322515, | 105 | "lastModified": 1639901638, |
94 | "narHash": "sha256-PdD6Q+Fo+0uahqj5uYDZ2T8s647W1WDx6HgQ5LDDp5Q=", | 106 | "narHash": "sha256-ZMP2xjjo3tHlWfgCd3Odn6qKNpNbvbawjcVpww54A1U=", |
95 | "owner": "nix-community", | 107 | "owner": "nix-community", |
96 | "repo": "neovim-nightly-overlay", | 108 | "repo": "neovim-nightly-overlay", |
97 | "rev": "fe10413485850c15c53744644721fd0c8a351d70", | 109 | "rev": "8f7a0bbc9080f55c000344658a071994aa9c6b4b", |
98 | "type": "github" | 110 | "type": "github" |
99 | }, | 111 | }, |
100 | "original": { | 112 | "original": { |
@@ -113,11 +125,11 @@ | |||
113 | }, | 125 | }, |
114 | "locked": { | 126 | "locked": { |
115 | "dir": "contrib", | 127 | "dir": "contrib", |
116 | "lastModified": 1635277393, | 128 | "lastModified": 1639886342, |
117 | "narHash": "sha256-pFFB7267CdwMXK/rrWpmLFYzA3e7+2AD8MAh2EX1+PI=", | 129 | "narHash": "sha256-OkI09enAc4ID1zrxLkHR5b+WgUL2r2C9BIG4+gwVDFU=", |
118 | "owner": "neovim", | 130 | "owner": "neovim", |
119 | "repo": "neovim", | 131 | "repo": "neovim", |
120 | "rev": "a5d6f36fc7e67aa008b4ae8a72b1367a765660b8", | 132 | "rev": "abdf3a8128b78fb98ee944bc5d3086c680d779ed", |
121 | "type": "github" | 133 | "type": "github" |
122 | }, | 134 | }, |
123 | "original": { | 135 | "original": { |
@@ -129,11 +141,11 @@ | |||
129 | }, | 141 | }, |
130 | "nixos-hardware": { | 142 | "nixos-hardware": { |
131 | "locked": { | 143 | "locked": { |
132 | "lastModified": 1635319124, | 144 | "lastModified": 1639240632, |
133 | "narHash": "sha256-Ldh40imhLYF8kGy9wSI2NWW6qiB/9lJ0C6CT2Yr1L6E=", | 145 | "narHash": "sha256-BAXhgnPOW1COIfZ9EOOFTdolalYS73MFHSRajgrSdZw=", |
134 | "owner": "nixos", | 146 | "owner": "nixos", |
135 | "repo": "nixos-hardware", | 147 | "repo": "nixos-hardware", |
136 | "rev": "0bb7b0906c353703c2eea36bd73134f0216f3e62", | 148 | "rev": "2a7063461c3751d83869a2a0a8ebc59e34bec5b2", |
137 | "type": "github" | 149 | "type": "github" |
138 | }, | 150 | }, |
139 | "original": { | 151 | "original": { |
@@ -144,11 +156,11 @@ | |||
144 | }, | 156 | }, |
145 | "nixpkgs": { | 157 | "nixpkgs": { |
146 | "locked": { | 158 | "locked": { |
147 | "lastModified": 1634782485, | 159 | "lastModified": 1639699734, |
148 | "narHash": "sha256-psfh4OQSokGXG0lpq3zKFbhOo3QfoeudRcaUnwMRkQo=", | 160 | "narHash": "sha256-tlX6WebGmiHb2Hmniff+ltYp+7dRfdsBxw9YczLsP60=", |
149 | "owner": "nixos", | 161 | "owner": "nixos", |
150 | "repo": "nixpkgs", | 162 | "repo": "nixpkgs", |
151 | "rev": "34ad3ffe08adfca17fcb4e4a47bb5f3b113687be", | 163 | "rev": "03ec468b14067729a285c2c7cfa7b9434a04816c", |
152 | "type": "github" | 164 | "type": "github" |
153 | }, | 165 | }, |
154 | "original": { | 166 | "original": { |
@@ -160,27 +172,27 @@ | |||
160 | }, | 172 | }, |
161 | "nixpkgs_2": { | 173 | "nixpkgs_2": { |
162 | "locked": { | 174 | "locked": { |
163 | "lastModified": 1635280654, | 175 | "lastModified": 1640443850, |
164 | "narHash": "sha256-n0DKD1rG4gLZx6vDnalrQ5obZA9Y7uaOShTDSaOWGhM=", | 176 | "narHash": "sha256-s3EhD+iNjyIE/gZkV5vES6d0eI4dJ2WBlaXyUsEmaek=", |
165 | "owner": "NixOS", | 177 | "owner": "NixOS", |
166 | "repo": "nixpkgs", | 178 | "repo": "nixpkgs", |
167 | "rev": "5ebb1dca9bb056649cbd023f953c0c4e7970bb72", | 179 | "rev": "6979c0e49bb491e18dd4870abb104cc7375aa7e8", |
168 | "type": "github" | 180 | "type": "github" |
169 | }, | 181 | }, |
170 | "original": { | 182 | "original": { |
171 | "owner": "NixOS", | 183 | "owner": "NixOS", |
172 | "ref": "nixos-21.05", | 184 | "ref": "nixos-21.11", |
173 | "repo": "nixpkgs", | 185 | "repo": "nixpkgs", |
174 | "type": "github" | 186 | "type": "github" |
175 | } | 187 | } |
176 | }, | 188 | }, |
177 | "nixpkgs_3": { | 189 | "nixpkgs_3": { |
178 | "locked": { | 190 | "locked": { |
179 | "lastModified": 1633422745, | 191 | "lastModified": 1638036523, |
180 | "narHash": "sha256-gA6Ok64nPbkjHk3Oanq4641EeYkjcKhisDF9wBjLxEk=", | 192 | "narHash": "sha256-ZL6gogsuBmhBvIro+YwRKrypYhwVPCOOO7FmhOV/xyE=", |
181 | "owner": "nixos", | 193 | "owner": "nixos", |
182 | "repo": "nixpkgs", | 194 | "repo": "nixpkgs", |
183 | "rev": "8e1eab9eae4278c9bb1dcae426848a581943db5a", | 195 | "rev": "9c191ebcdfe917043195c54ab6ae8e934434fe7b", |
184 | "type": "github" | 196 | "type": "github" |
185 | }, | 197 | }, |
186 | "original": { | 198 | "original": { |
@@ -199,18 +211,35 @@ | |||
199 | "statix": "statix" | 211 | "statix": "statix" |
200 | } | 212 | } |
201 | }, | 213 | }, |
214 | "rust-analyzer-src": { | ||
215 | "flake": false, | ||
216 | "locked": { | ||
217 | "lastModified": 1638036899, | ||
218 | "narHash": "sha256-vh7z8jupVxXPOko3sWUsOB7eji/7lKfwJ/CE3iw97Sw=", | ||
219 | "owner": "rust-analyzer", | ||
220 | "repo": "rust-analyzer", | ||
221 | "rev": "d9b2291f546abc77d24499339a72a89127464b95", | ||
222 | "type": "github" | ||
223 | }, | ||
224 | "original": { | ||
225 | "owner": "rust-analyzer", | ||
226 | "ref": "nightly", | ||
227 | "repo": "rust-analyzer", | ||
228 | "type": "github" | ||
229 | } | ||
230 | }, | ||
202 | "statix": { | 231 | "statix": { |
203 | "inputs": { | 232 | "inputs": { |
204 | "import-cargo": "import-cargo", | 233 | "fenix": "fenix", |
205 | "mozillapkgs": "mozillapkgs", | 234 | "gitignore": "gitignore", |
206 | "nixpkgs": "nixpkgs_3" | 235 | "nixpkgs": "nixpkgs_3" |
207 | }, | 236 | }, |
208 | "locked": { | 237 | "locked": { |
209 | "lastModified": 1635335003, | 238 | "lastModified": 1639455627, |
210 | "narHash": "sha256-qFzUBZkKWSPll6g+ZfXnNAUMWy9sppK8o5gdZ56SFCk=", | 239 | "narHash": "sha256-vqGwh1AndJAG4lpHtRhfkvu+yAoo0Qxym0c6Imr7StA=", |
211 | "owner": "nerdypepper", | 240 | "owner": "nerdypepper", |
212 | "repo": "statix", | 241 | "repo": "statix", |
213 | "rev": "f909b20c540ea99dddfd04b8439ee35b8dd703b8", | 242 | "rev": "94a2edf57340ac3f3a2276c88a221ba3125172af", |
214 | "type": "github" | 243 | "type": "github" |
215 | }, | 244 | }, |
216 | "original": { | 245 | "original": { |
@@ -2,10 +2,10 @@ | |||
2 | description = "nerdypepper's nixos config"; | 2 | description = "nerdypepper's nixos config"; |
3 | 3 | ||
4 | inputs = { | 4 | inputs = { |
5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.05"; | 5 | nixpkgs.url = "github:NixOS/nixpkgs/nixos-21.11"; |
6 | nixos-hardware.url = "github:nixos/nixos-hardware"; | 6 | nixos-hardware.url = "github:nixos/nixos-hardware"; |
7 | home-manager = { | 7 | home-manager = { |
8 | url = "github:nix-community/home-manager/release-21.05"; | 8 | url = "github:nix-community/home-manager/release-21.11"; |
9 | inputs.nixpkgs.follows = "nixpkgs"; | 9 | inputs.nixpkgs.follows = "nixpkgs"; |
10 | }; | 10 | }; |
11 | neovim.url = "github:nix-community/neovim-nightly-overlay"; | 11 | neovim.url = "github:nix-community/neovim-nightly-overlay"; |
@@ -63,7 +63,6 @@ | |||
63 | nixpkgs-review | 63 | nixpkgs-review |
64 | nixpkgs-fmt | 64 | nixpkgs-fmt |
65 | nix-prefetch-scripts | 65 | nix-prefetch-scripts |
66 | statix | ||
67 | 66 | ||
68 | ] ++ (import ./scripts { inherit pkgs; }); | 67 | ] ++ (import ./scripts { inherit pkgs; }); |
69 | 68 | ||
diff --git a/hosts/olive/configuration.nix b/hosts/olive/configuration.nix index f36bc3f..f25e6e4 100644 --- a/hosts/olive/configuration.nix +++ b/hosts/olive/configuration.nix | |||
@@ -23,15 +23,10 @@ | |||
23 | "wlp2s0" | 23 | "wlp2s0" |
24 | ]; | 24 | ]; |
25 | networks = { | 25 | networks = { |
26 | Sanic = { | 26 | Sanic.pskRaw = "03fbbe8c6b400af40c64ea475be59812ca1d13f40beaf0bf188c50a1e959c8fd"; |
27 | pskRaw = "03fbbe8c6b400af40c64ea475be59812ca1d13f40beaf0bf188c50a1e959c8fd"; | 27 | Gopalan.pskRaw = "52f7f6548fa6f7f24965aae2bd7aa1a34d22a650cdc319d9d6a8567f91be85c8"; |
28 | }; | 28 | Srividhya.pskRaw = "f4302c17d20d0ac8791960495bb3ca4e790677d87d16a7d8c414350dd67c9713"; |
29 | Gopalan = { | 29 | sage.pskRaw = "576e51f80e4a6c2c6928f5655b9a75db0dac80aba30626a96b93b67c7c66c761"; |
30 | pskRaw = "52f7f6548fa6f7f24965aae2bd7aa1a34d22a650cdc319d9d6a8567f91be85c8"; | ||
31 | }; | ||
32 | Srividhya = { | ||
33 | pskRaw = "f4302c17d20d0ac8791960495bb3ca4e790677d87d16a7d8c414350dd67c9713"; | ||
34 | }; | ||
35 | }; | 30 | }; |
36 | extraConfig = '' | 31 | extraConfig = '' |
37 | ctrl_interface=/run/wpa_supplicant | 32 | ctrl_interface=/run/wpa_supplicant |