summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock121
-rw-r--r--flake.nix10
2 files changed, 111 insertions, 20 deletions
diff --git a/flake.lock b/flake.lock
index 66a9c19a..78ef3227 100644
--- a/flake.lock
+++ b/flake.lock
@@ -11,11 +11,11 @@
11 "utils": "utils" 11 "utils": "utils"
12 }, 12 },
13 "locked": { 13 "locked": {
14 "lastModified": 1652079807, 14 "lastModified": 1653594315,
15 "narHash": "sha256-aCs1EwO9K2yJ1DcT4+4g7BMlJBWP7Xjs4k5i8ueR8PU=", 15 "narHash": "sha256-kJ0ENmnQJ4qL2FeYKZba9kvv1KmIuB3NVpBwMeI7AJQ=",
16 "owner": "serokell", 16 "owner": "serokell",
17 "repo": "deploy-rs", 17 "repo": "deploy-rs",
18 "rev": "690f698b18345d894784752b5fa93b9b8f3cc29f", 18 "rev": "184349d8149436748986d1bdba087e4149e9c160",
19 "type": "github" 19 "type": "github"
20 }, 20 },
21 "original": { 21 "original": {
@@ -59,16 +59,22 @@
59 }, 59 },
60 "home-manager": { 60 "home-manager": {
61 "inputs": { 61 "inputs": {
62 "flake-compat": [
63 "flake-compat"
64 ],
62 "nixpkgs": [ 65 "nixpkgs": [
63 "nixpkgs" 66 "nixpkgs"
64 ] 67 ],
68 "nmd": "nmd",
69 "nmt": "nmt",
70 "utils": "utils_2"
65 }, 71 },
66 "locked": { 72 "locked": {
67 "lastModified": 1652214259, 73 "lastModified": 1655594877,
68 "narHash": "sha256-kbribVik1m3SU6QNpZ3euybljqs0CEQ0lEEz7MN+u8U=", 74 "narHash": "sha256-AQ39Vlb6zhsJqIRz2cN923+ESBxHmeHMHoPqA80xOCE=",
69 "owner": "nix-community", 75 "owner": "nix-community",
70 "repo": "home-manager", 76 "repo": "home-manager",
71 "rev": "f735a8502b098962ae965c2600c7be9f7711b814", 77 "rev": "5197e5df7d3a148b1ad080235f70800987bc3549",
72 "type": "github" 78 "type": "github"
73 }, 79 },
74 "original": { 80 "original": {
@@ -80,11 +86,11 @@
80 }, 86 },
81 "nixpkgs": { 87 "nixpkgs": {
82 "locked": { 88 "locked": {
83 "lastModified": 1652424998, 89 "lastModified": 1655630673,
84 "narHash": "sha256-6rqAwXEVlnXzCcju+ZcxZnLNql6bdiG9deREbBAb2Pc=", 90 "narHash": "sha256-kYhka8nZ7hp3Pg6f21SDEcyt7aYfjIIbLlcDKRj2jhk=",
85 "owner": "NixOS", 91 "owner": "NixOS",
86 "repo": "nixpkgs", 92 "repo": "nixpkgs",
87 "rev": "d999ca3e08b053b80d4e52e700a4627e692479eb", 93 "rev": "baac374635d18c960df37658b0f0b59d0767d468",
88 "type": "github" 94 "type": "github"
89 }, 95 },
90 "original": { 96 "original": {
@@ -94,6 +100,70 @@
94 "type": "github" 100 "type": "github"
95 } 101 }
96 }, 102 },
103 "nixpkgs-21_11": {
104 "locked": {
105 "lastModified": 1655562720,
106 "narHash": "sha256-OrN8DkBRZqZMzMuECuQNvSQ5gWoFBCxDvxYXjIQ/pH0=",
107 "owner": "NixOS",
108 "repo": "nixpkgs",
109 "rev": "27dffce7eaa9648b4a13a461e786f169a17c0889",
110 "type": "github"
111 },
112 "original": {
113 "owner": "NixOS",
114 "ref": "release-21.11",
115 "repo": "nixpkgs",
116 "type": "github"
117 }
118 },
119 "nixpkgs-22_05": {
120 "locked": {
121 "lastModified": 1655584987,
122 "narHash": "sha256-YmWxPm6ctu+9nV80DtYtMfOBosNymeTpj8+Z0JTDfhU=",
123 "owner": "NixOS",
124 "repo": "nixpkgs",
125 "rev": "57622cb817210146b379adbbd036d3da0d1f367c",
126 "type": "github"
127 },
128 "original": {
129 "owner": "NixOS",
130 "ref": "release-22.05",
131 "repo": "nixpkgs",
132 "type": "github"
133 }
134 },
135 "nmd": {
136 "flake": false,
137 "locked": {
138 "lastModified": 1653339422,
139 "narHash": "sha256-8nc7lcYOgih3YEmRMlBwZaLLJYpLPYKBlewqHqx8ieg=",
140 "owner": "rycee",
141 "repo": "nmd",
142 "rev": "9e7a20e6ee3f6751f699f79c0b299390f81f7bcd",
143 "type": "gitlab"
144 },
145 "original": {
146 "owner": "rycee",
147 "repo": "nmd",
148 "type": "gitlab"
149 }
150 },
151 "nmt": {
152 "flake": false,
153 "locked": {
154 "lastModified": 1648075362,
155 "narHash": "sha256-u36WgzoA84dMVsGXzml4wZ5ckGgfnvS0ryzo/3zn/Pc=",
156 "owner": "rycee",
157 "repo": "nmt",
158 "rev": "d83601002c99b78c89ea80e5e6ba21addcfe12ae",
159 "type": "gitlab"
160 },
161 "original": {
162 "owner": "rycee",
163 "repo": "nmt",
164 "type": "gitlab"
165 }
166 },
97 "nvfetcher": { 167 "nvfetcher": {
98 "inputs": { 168 "inputs": {
99 "flake-compat": [ 169 "flake-compat": [
@@ -105,11 +175,11 @@
105 ] 175 ]
106 }, 176 },
107 "locked": { 177 "locked": {
108 "lastModified": 1650169042, 178 "lastModified": 1654975372,
109 "narHash": "sha256-x8469XNOU/ebIh5YCuvjcOAaAptwHjkEl1aTFrevu1o=", 179 "narHash": "sha256-wkNZ16akgKViuZzE/IM+bux4uaJ04KIwUeexH8gBjgw=",
110 "owner": "berberman", 180 "owner": "berberman",
111 "repo": "nvfetcher", 181 "repo": "nvfetcher",
112 "rev": "db780dba6923e531b5aedca502a36d3d9627fca9", 182 "rev": "d4b237c10f14f72f8266b0f658faad822e491e55",
113 "type": "github" 183 "type": "github"
114 }, 184 },
115 "original": { 185 "original": {
@@ -133,14 +203,16 @@
133 "inputs": { 203 "inputs": {
134 "nixpkgs": [ 204 "nixpkgs": [
135 "nixpkgs" 205 "nixpkgs"
136 ] 206 ],
207 "nixpkgs-21_11": "nixpkgs-21_11",
208 "nixpkgs-22_05": "nixpkgs-22_05"
137 }, 209 },
138 "locked": { 210 "locked": {
139 "lastModified": 1649756291, 211 "lastModified": 1655611128,
140 "narHash": "sha256-KTll8bCINAzIUGaaMrbn9wb5nfhkXRLgmFrWGR/Dku0=", 212 "narHash": "sha256-+Rfr9i0UvQL0hK1npP7X1sf0Zb2C1YDff0acj0lhyWA=",
141 "owner": "Mic92", 213 "owner": "Mic92",
142 "repo": "sops-nix", 214 "repo": "sops-nix",
143 "rev": "c2614c4fe61943b3d280ac1892fcebe6e8eaf8c8", 215 "rev": "6692484ba5339b77c7e62eafcfff2263a5488fb7",
144 "type": "github" 216 "type": "github"
145 }, 217 },
146 "original": { 218 "original": {
@@ -164,6 +236,21 @@
164 "repo": "flake-utils", 236 "repo": "flake-utils",
165 "type": "github" 237 "type": "github"
166 } 238 }
239 },
240 "utils_2": {
241 "locked": {
242 "lastModified": 1653893745,
243 "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
244 "owner": "numtide",
245 "repo": "flake-utils",
246 "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
247 "type": "github"
248 },
249 "original": {
250 "owner": "numtide",
251 "repo": "flake-utils",
252 "type": "github"
253 }
167 } 254 }
168 }, 255 },
169 "root": "root", 256 "root": "root",
diff --git a/flake.nix b/flake.nix
index 1218ef31..f173c560 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,10 @@
13 owner = "nix-community"; 13 owner = "nix-community";
14 repo = "home-manager"; 14 repo = "home-manager";
15 ref = "master"; 15 ref = "master";
16 inputs.nixpkgs.follows = "nixpkgs"; 16 inputs = {
17 flake-compat.follows = "flake-compat";
18 nixpkgs.follows = "nixpkgs";
19 };
17 }; 20 };
18 sops-nix = { 21 sops-nix = {
19 type = "github"; 22 type = "github";
@@ -138,8 +141,9 @@
138 // outputs 141 // outputs
139 // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); }); 142 // { imports = [self.nixosModules.users.${userName} or ({...}: { imports = defaultUserProfiles userName; })] ++ (outputs.imports or []); });
140 143
141 systemsSelector = "x86_64-linux"; 144 # systemsSelector = "x86_64-linux";
142 systems = filter (system: !(isNull (builtins.match systemsSelector system))) nixpkgs.lib.systems.supported.hydra; 145 # systems = filter (system: !(isNull (builtins.match systemsSelector system))) nixpkgs.lib.systems.flakeExposed;
146 systems = nixpkgs.lib.systems.flakeExposed;
143 nixpkgsPackages = localSystem: (makeOverridable (import (nixpkgs.outPath + "/pkgs/top-level"))) { inherit localSystem; }; 147 nixpkgsPackages = localSystem: (makeOverridable (import (nixpkgs.outPath + "/pkgs/top-level"))) { inherit localSystem; };
144 forAllSystems = f: mapAttrs f (genAttrs systems nixpkgsPackages); 148 forAllSystems = f: mapAttrs f (genAttrs systems nixpkgsPackages);
145 forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts))); 149 forAllUsers = genAttrs (unique (map accountUserName (attrNames self.nixosModules.accounts)));