From 68c1a1f808e8c0adf421226a4cb9c05a8b58e8f8 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 16 May 2025 01:24:40 +0200 Subject: [PATCH 1/2] feat: adds lily to readme --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0ce532e..c42c555 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ - [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 From 1d91a363dfc8acd5f06bc1000c2c650042e11a62 Mon Sep 17 00:00:00 2001 From: Ahwx Date: Fri, 16 May 2025 01:35:44 +0200 Subject: [PATCH 2/2] feat: adds lily to flake --- flake.nix | 171 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 105 insertions(+), 66 deletions(-) diff --git a/flake.nix b/flake.nix index 8db7ef7..2e189ed 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,74 +32,113 @@ 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 { - inherit system; - }; - lib = nixpkgs.lib; - in - { - overlays.default = overlays.addition; - nixosConfigurations = { - desktop = nixpkgs.lib.nixosSystem { + outputs = + { + self, + nixpkgs, + catppuccin, + agenix, + ... + }@inputs: + let + overlays = import ./overlays/default.nix; + username = "liv"; + system = "x86_64-linux"; + pkgs = import nixpkgs { 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; + }; + }; }; }; - }; }