configurations for my servers and desktops
nix nixos flake dots dotfiles

chore: cleanup

+38 -46
+38 -46
flake.nix
··· 2 2 inputs = { 3 3 nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; 4 4 nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11"; 5 - nixpkgs-tlp-pr.url = "github:NixOS/nixpkgs/pull/473626/head"; 6 5 home-manager = { 7 6 url = "github:nix-community/home-manager"; 8 7 inputs.nixpkgs.follows = "nixpkgs"; ··· 21 20 }; 22 21 23 22 outputs = { 24 - self, 25 23 nixpkgs, 26 24 nixpkgs-stable, 27 - nixpkgs-tlp-pr, 28 25 nix-darwin, 29 26 home-manager, 30 27 home-manager-stable, 31 28 mac-app-util, 32 29 nixos-wsl, 33 30 agenix, 34 - }: let 35 - commonModules = [./modules/common]; 36 - in { 31 + ... 32 + }: { 37 33 darwinConfigurations.neo = nix-darwin.lib.darwinSystem { 38 - modules = 39 - commonModules 40 - ++ [ 41 - ./modules/darwin 42 - ./hosts/neo 43 - home-manager.darwinModules.home-manager 44 - mac-app-util.darwinModules.default 45 - {home-manager.sharedModules = [mac-app-util.homeManagerModules.default];} 46 - ]; 34 + modules = [ 35 + ./modules/common 36 + ./modules/darwin 37 + ./hosts/neo 38 + home-manager.darwinModules.home-manager 39 + mac-app-util.darwinModules.default 40 + {home-manager.sharedModules = [mac-app-util.homeManagerModules.default];} 41 + ]; 47 42 }; 48 43 49 44 nixosConfigurations = { 50 - trinity = nixpkgs-tlp-pr.lib.nixosSystem { 51 - modules = 52 - commonModules 53 - ++ [ 54 - ./modules/nixos 55 - ./hosts/trinity 56 - home-manager.nixosModules.home-manager 57 - ]; 45 + trinity = nixpkgs.lib.nixosSystem { 46 + modules = [ 47 + ./modules/common 48 + ./modules/nixos 49 + ./hosts/trinity 50 + home-manager.nixosModules.home-manager 51 + ]; 58 52 }; 59 53 60 54 bluepill = nixpkgs-stable.lib.nixosSystem { 61 - modules = 62 - commonModules 63 - ++ [ 64 - ./modules/nixos 65 - ./hosts/bluepill 66 - agenix.nixosModules.default 67 - home-manager-stable.nixosModules.home-manager 68 - { 69 - nixpkgs.overlays = [ 70 - (final: prev: { 71 - tailscale = nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.tailscale; 72 - }) 73 - ]; 74 - } 75 - ]; 55 + modules = [ 56 + ./modules/common 57 + ./modules/nixos 58 + ./hosts/bluepill 59 + agenix.nixosModules.default 60 + home-manager-stable.nixosModules.home-manager 61 + { 62 + nixpkgs.overlays = [ 63 + (final: prev: { 64 + tailscale = nixpkgs.legacyPackages.${prev.stdenv.hostPlatform.system}.tailscale; 65 + }) 66 + ]; 67 + } 68 + ]; 76 69 }; 77 70 78 71 tank-wsl = nixpkgs.lib.nixosSystem { 79 - modules = 80 - commonModules 81 - ++ [ 82 - ./modules/nixos 83 - ./hosts/tank-wsl 84 - home-manager.nixosModules.home-manager 85 - nixos-wsl.nixosModules.default 86 - ]; 72 + modules = [ 73 + ./modules/common 74 + ./modules/nixos 75 + ./hosts/tank-wsl 76 + home-manager.nixosModules.home-manager 77 + nixos-wsl.nixosModules.default 78 + ]; 87 79 }; 88 80 }; 89 81