diff options
| -rw-r--r-- | flake.nix | 53 | ||||
| -rw-r--r-- | machines/bosco/default.nix | 1 |
2 files changed, 14 insertions, 40 deletions
@@ -190,67 +190,42 @@ nixosConfigurations = { khad = lib.nixosSystem { # Main desktop - modules = minimalConfigSettings ++ [ - ./machines/khad + modules = minimalConfigSettings ++ [ ./machines/khad lix-module.nixosModules.default - - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/home.nix; - } + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/home.nix; } ]; }; zenbook = lib.nixosSystem { # Personal laptop # specialArgs = { inherit inputs; }; - modules = minimalConfigSettings ++ [ - ./machines/zenbook + modules = minimalConfigSettings ++ [ ./machines/zenbook lix-module.nixosModules.default # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} - - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/home.nix; - } + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/home.nix; } ]; }; betsy = lib.nixosSystem { # work laptop - modules = minimalConfigSettings ++ [ - ./machines/betsy + modules = minimalConfigSettings ++ [ ./machines/betsy # lix-module.nixosModules.default - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/home.nix; - } + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/home.nix; } ]; }; doretta = lib.nixosSystem { # build server - modules = minimalConfigSettings ++ [ - ./machines/doretta + modules = minimalConfigSettings ++ [ ./machines/doretta lix-module.nixosModules.default - - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/doretta.nix; - } + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/doretta.nix; } ]; }; bosco = lib.nixosSystem { # networking server - modules = minimalConfigSettings ++ [ - ./machines/bosco + modules = minimalConfigSettings ++ [ ./machines/bosco # lix-module.nixosModules.default - - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/default.nix; - } - - ./modules/nixos/headscale.nix + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; picast = lib.nixosSystem { # anger at chromecast - modules = minimalConfigSettings ++ [ - ./machines/picast - - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/default.nix; - } + modules = minimalConfigSettings ++ [ ./machines/picast + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; live = lib.nixosSystem { @@ -260,9 +235,7 @@ ./modules/users/defin.nix ./modules/nixos/system-packages.nix - home-manager.nixosModules.home-manager { - home-manager.users.defin = import ./home-manager/default.nix; - } + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } { nixpkgs.hostPlatform = "aarch64-linux"; } ]; }; diff --git a/machines/bosco/default.nix b/machines/bosco/default.nix index 25221b1..b37887e 100644 --- a/machines/bosco/default.nix +++ b/machines/bosco/default.nix @@ -12,6 +12,7 @@ ../../modules/nixos/nix-common.nix ../../modules/nixos/environment.nix ../../modules/nixos/tailscale.nix + ../../modules/nixos/headscale.nix ../../modules/nixos/cgit.nix ../../modules/nixos/system-packages.nix ../../modules/users/defin.nix |