From af40906bc5e21776efc3b8bac819d7f9ccafd1cd Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Thu, 30 May 2024 22:35:17 +0200 Subject: cleanup flake.nix inputs --- flake.nix | 28 +++++----------------------- 1 file changed, 5 insertions(+), 23 deletions(-) (limited to 'flake.nix') 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 = [ -- cgit 1.4.1