diff options
| -rw-r--r-- | flake.lock | 137 | ||||
| -rw-r--r-- | flake.nix | 28 |
2 files changed, 48 insertions, 117 deletions
diff --git a/flake.lock b/flake.lock index df914e6b..5e9ac870 100644 --- a/flake.lock +++ b/flake.lock @@ -45,28 +45,6 @@ "type": "github" } }, - "emacs-overlay": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" - }, - "locked": { - "lastModified": 1715418343, - "narHash": "sha256-DieMydUZ8oZkH2jdjPv02FXTujJoJ8u0cLXQIYApX5o=", - "owner": "nix-community", - "repo": "emacs-overlay", - "rev": "e41288bc8adbd180681d12eb4b9274a7bae7f974", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "emacs-overlay", - "type": "github" - } - }, "flake-compat": { "flake": false, "locked": { @@ -88,11 +66,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1709126324, + "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "d465f4819400de7c8d874d50b982301f28a84605", "type": "github" }, "original": { @@ -141,6 +119,27 @@ "type": "github" } }, + "golink": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs-small" + ] + }, + "locked": { + "lastModified": 1717093333, + "narHash": "sha256-D050npC0XbDiNPB1xUOzUNLSp0JyUUl015WEA0h8yf4=", + "owner": "tailscale", + "repo": "golink", + "rev": "ef8d461b8546ca45079254d134af2d15ad03ea61", + "type": "github" + }, + "original": { + "owner": "tailscale", + "repo": "golink", + "type": "github" + } + }, "gomod2nix": { "inputs": { "flake-utils": [ @@ -153,11 +152,11 @@ ] }, "locked": { - "lastModified": 1710154385, - "narHash": "sha256-4c3zQ2YY4BZOufaBJB4v9VBBeN2dH7iVdoJw8SDNCfI=", + "lastModified": 1716202913, + "narHash": "sha256-zjPNXI4DWBOrPsrK8u/XTsm5Q36quONQvz0jhAKHEeg=", "owner": "nix-community", "repo": "gomod2nix", - "rev": "872b63ddd28f318489c929d25f1f0a3c6039c971", + "rev": "4702caff8e201f4c98fe3583637a930d253447c8", "type": "github" }, "original": { @@ -207,21 +206,6 @@ "type": "github" } }, - "nixos-hardware": { - "locked": { - "lastModified": 1715148395, - "narHash": "sha256-lRxjTxY3103LGMjWdVqntKZHhlmMX12QUjeFrQMmGaE=", - "owner": "NixOS", - "repo": "nixos-hardware", - "rev": "a4e2b7909fc1bdf30c30ef21d388fde0b5cdde4a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixos-hardware", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1715266358, @@ -240,11 +224,11 @@ }, "nixpkgs-small": { "locked": { - "lastModified": 1716438273, - "narHash": "sha256-qgmg3oXm+PYWnO06g2aetPOAKvQkgC63NjNh0m9ZHNI=", + "lastModified": 1717068402, + "narHash": "sha256-olLqhxrBPdq4Y6GA9voLSUkyvVcfmVP5lQWnewlZGq0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3efa0a2a30e551229188707569e85495e73090f3", + "rev": "66c951d1278b9c105c750cb70ca37f1e3e3d0e57", "type": "github" }, "original": { @@ -256,22 +240,6 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1715218190, - "narHash": "sha256-R98WOBHkk8wIi103JUVQF3ei3oui4HvoZcz9tYOAwlk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9a9960b98418f8c385f52de3b09a63f9c561427a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { - "locked": { "lastModified": 1710695816, "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=", "owner": "NixOS", @@ -288,22 +256,6 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1715447595, - "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { "lastModified": 1710765496, "narHash": "sha256-p7ryWEeQfMwTB6E0wIUd5V2cFTgq+DRRBz2hYGnJZyA=", "owner": "NixOS", @@ -321,20 +273,16 @@ "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat", - "flake-utils": [ - "searchix", - "flake-utils" - ], "gitignore": "gitignore", - "nixpkgs": "nixpkgs_3", - "nixpkgs-stable": "nixpkgs-stable_2" + "nixpkgs": "nixpkgs_2", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1714478972, - "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=", + "lastModified": 1716213921, + "narHash": "sha256-xrsYFST8ij4QWaV6HEokCUNIZLjjLP1bYC60K8XiBVA=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "2849da033884f54822af194400f8dff435ada242", + "rev": "0e8fcc54b842ad8428c9e705cb5994eaf05c26a0", "type": "github" }, "original": { @@ -346,9 +294,8 @@ "root": { "inputs": { "agenix": "agenix", - "emacs-overlay": "emacs-overlay", + "golink": "golink", "home-manager": "home-manager_2", - "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "nixpkgs-small": "nixpkgs-small", "searchix": "searchix", @@ -360,16 +307,18 @@ "inputs": { "flake-utils": "flake-utils_2", "gomod2nix": "gomod2nix", - "nixpkgs": "nixpkgs_2", + "nixpkgs": [ + "nixpkgs-small" + ], "pre-commit-hooks": "pre-commit-hooks", "simple-css": "simple-css" }, "locked": { - "lastModified": 1716463673, - "narHash": "sha256-DPGtV+oipRuisJDynVrFNpLbstDlnUCQITddVBOtGiw=", + "lastModified": 1717070495, + "narHash": "sha256-FwRQLV36SwgZPPDxq/Gc8sd24dAPfYK4eeyjeHbtKis=", "ref": "refs/heads/main", - "rev": "042dadb9ee2c8ea32a8cda063732c0d0be62cec6", - "revCount": 208, + "rev": "b53769462bf830f860b7d741a3d0801afdbc9aa2", + "revCount": 228, "type": "git", "url": "https://git.alanpearce.eu/searchix" }, diff --git a/flake.nix b/flake.nix index 05939ac1..a94afc29 100644 --- a/flake.nix +++ b/flake.nix @@ -2,18 +2,18 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; - nixos-hardware.url = "github:NixOS/nixos-hardware"; home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; - emacs-overlay.url = "github:nix-community/emacs-overlay"; - emacs-overlay.inputs.nixpkgs.follows = "nixpkgs"; secrets = { flake = false; }; utils.url = "github:numtide/flake-utils"; agenix.url = "github:ryantm/agenix"; agenix.inputs.nixpkgs.follows = "nixpkgs"; - searchix.url = "git+https://git.alanpearce.eu/searchix"; + searchix = { + url = "git+https://git.alanpearce.eu/searchix"; + inputs.nixpkgs.follows = "nixpkgs-small"; + }; golink = { url = "github:tailscale/golink"; inputs.nixpkgs.follows = "nixpkgs-small"; @@ -26,10 +26,8 @@ , utils , nixpkgs , nixpkgs-small - , nixos-hardware , home-manager , secrets - , emacs-overlay , agenix , searchix , golink @@ -50,7 +48,7 @@ mkHomeConfiguration = { modules, system }: home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { inherit system; - overlays = readOverlays (toString ./overlays) ++ [ emacs-overlay.overlay ]; + overlays = readOverlays (toString ./overlays); }; inherit modules; @@ -60,15 +58,6 @@ }; in { - nixosConfigurations.nanopi = nixpkgs-small.lib.nixosSystem { - system = utils.lib.system.aarch64-linux; - specialArgs = { inherit inputs; }; - modules = [ - agenix.nixosModules.default - nixos-hardware.nixosModules.friendlyarm-nanopi-r5s - ./system/nanopi.nix - ]; - }; nixosConfigurations.linde = nixpkgs-small.lib.nixosSystem { system = utils.lib.system.aarch64-linux; specialArgs = { inherit inputs; }; @@ -79,13 +68,6 @@ ./system/linde.nix ]; }; - homeConfigurations."alan@nanopi" = mkHomeConfiguration { - system = utils.lib.system.aarch64-linux; - modules = [ - ./user/nanopi.nix - (secrets + "/default.nix") - ]; - }; homeConfigurations."alan@linde" = mkHomeConfiguration { system = utils.lib.system.aarch64-linux; modules = [ |