diff --git a/README.md b/README.md index c42c555..0ce532e 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,6 @@ - [ichiyo](hosts/ichiyo/): Laptop (ichiyo) specific configuration - [violet](hosts/violet/): Server (violet) specific configuration - [dandelion](hosts/dandelion/): Server (dandelion) specific configuration - - [lily](hosts/lily/): Router (lily) specific configuration - [modules](modules): modularized NixOS configurations - [core](modules/core/): core NixOS configuration - [homes](modules/home/): my [Home-Manager](https://github.com/nix-community/home-manager) config diff --git a/flake.nix b/flake.nix index 2e189ed..8db7ef7 100644 --- a/flake.nix +++ b/flake.nix @@ -9,7 +9,7 @@ url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; }; - + hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; @@ -32,113 +32,74 @@ nix-gaming.url = "github:fufexan/nix-gaming"; }; - outputs = - { - self, - nixpkgs, - catppuccin, - agenix, - ... - }@inputs: - let - overlays = import ./overlays/default.nix; - username = "liv"; - system = "x86_64-linux"; - pkgs = import nixpkgs { + outputs = { self, nixpkgs, catppuccin, agenix, ...} @ inputs: + let + overlays = import ./overlays/default.nix; + username = "liv"; + system = "x86_64-linux"; + pkgs = import nixpkgs { + inherit system; + }; + lib = nixpkgs.lib; + in + { + overlays.default = overlays.addition; + nixosConfigurations = { + desktop = nixpkgs.lib.nixosSystem { inherit system; + modules = [( + import ./hosts/desktop + )]; + specialArgs = { host="desktop"; inherit self inputs username ; }; + }; + sakura = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/sakura) + agenix.nixosModules.default + ]; + specialArgs = { host="sakura"; inherit self inputs username ; }; + }; + yoshino = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/yoshino) + agenix.nixosModules.default + ]; + specialArgs = { host="yoshino"; inherit self inputs username ; }; + }; + ichiyo = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/ichiyo) + agenix.nixosModules.default + ]; + specialArgs = { host="ichiyo"; inherit self inputs username ; }; + }; + violet = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/violet) + agenix.nixosModules.default + ]; + specialArgs = { host="violet"; inherit self inputs username; }; + }; + dandelion = nixpkgs.lib.nixosSystem { + inherit system; + modules = [ + (import ./hosts/dandelion) + agenix.nixosModules.default + ]; + specialArgs = { host="dandelion"; inherit self inputs username; }; }; - lib = nixpkgs.lib; - in - { - overlays.default = overlays.addition; - nixosConfigurations = { - desktop = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/desktop) - ]; - specialArgs = { - host = "desktop"; - inherit self inputs username; - }; - }; - sakura = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/sakura) - agenix.nixosModules.default - ]; - specialArgs = { - host = "sakura"; - inherit self inputs username; - }; - }; - yoshino = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/yoshino) - agenix.nixosModules.default - ]; - specialArgs = { - host = "yoshino"; - inherit self inputs username; - }; - }; - ichiyo = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/ichiyo) - agenix.nixosModules.default - ]; - specialArgs = { - host = "ichiyo"; - inherit self inputs username; - }; - }; - violet = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/violet) - agenix.nixosModules.default - ]; - specialArgs = { - host = "violet"; - inherit self inputs username; - }; - }; - dandelion = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/dandelion) - agenix.nixosModules.default - ]; - specialArgs = { - host = "dandelion"; - inherit self inputs username; - }; - }; - lily = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/lily) - agenix.nixosModules.default - ]; - specialArgs = { - host = "lily"; - inherit self inputs username; - }; - }; - vm = nixpkgs.lib.nixosSystem { - inherit system; - modules = [ - (import ./hosts/vm) - ]; - specialArgs = { - host = "vm"; - inherit self inputs username; - }; - }; + vm = nixpkgs.lib.nixosSystem { + inherit system; + modules = [( + import ./hosts/vm + )]; + specialArgs = { host="vm"; inherit self inputs username ; }; }; }; + }; }