diff options
Diffstat (limited to 'flake.nix')
| -rw-r--r-- | flake.nix | 81 |
1 files changed, 36 insertions, 45 deletions
@@ -211,21 +211,16 @@ } ]; minimalModuleConfig = minimalHomeManagerSettings ++ nixIndex ++ [ - # lib.nixosSystem { - # modules = [ - ./modules/nixos/nix-common.nix - ./modules/nixos/environment.nix - ./modules/nixos/system-packages.nix - - ./modules/users/defin.nix - ./modules/users/root.nix - # nix-index-database.nixosModules.nix-index - # { programs.nix-index-database.comma.enable = true;} - # ]; - # # # Let 'nixos-version --json' know the Git revision of this flake. (for containers?) - # # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; - # # nix.registry.nixpkgs.flake = nixpkgs; - # } + ./modules/nixos/nix-common.nix + ./modules/nixos/environment.nix + ./modules/nixos/system-packages.nix + ./modules/nixos/tailscale.nix + + ./modules/users/defin.nix + ./modules/users/root.nix + # # Let 'nixos-version --json' know the Git revision of this flake. (for containers?) + # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; + # nix.registry.nixpkgs.flake = nixpkgs; ]; # vm = lib.nixosSystem { # system = "x86_64-linux"; @@ -254,7 +249,7 @@ nixosConfigurations = { khad = lib.nixosSystem { # Main desktop - modules = minimalHomeManagerSettings ++ [ ./machines/khad + modules = minimalModuleConfig ++ [ ./machines/khad # lix-module.nixosModules.default sops-nix.nixosModules.sops home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; } @@ -263,8 +258,6 @@ zenbook = lib.nixosSystem { # Personal laptop # specialArgs = { inherit inputs; }; modules = minimalModuleConfig ++ [ ./machines/zenbook - # minimalNixConfig - # nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true;} # lix-module.nixosModules.default # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;} home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; } @@ -272,7 +265,7 @@ }; betsy = lib.nixosSystem { # work laptop - modules = minimalHomeManagerSettings ++ [ ./machines/betsy + modules = minimalModuleConfig ++ [ ./machines/betsy # lix-module.nixosModules.default home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/home.nix; } @@ -280,21 +273,21 @@ }; doretta = lib.nixosSystem { # build server specialArgs = { inherit inputs; }; - modules = minimalHomeManagerSettings ++ [ ./machines/doretta + modules = minimalModuleConfig ++ [ ./machines/doretta + home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/doretta.nix; } # lix-module.nixosModules.default microvm.nixosModules.host - home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/doretta.nix; } { microvm.autostart = [ "foolcreek" ]; } ]; }; bosco = lib.nixosSystem { # networking server - modules = minimalHomeManagerSettings ++ [ ./machines/bosco + modules = minimalModuleConfig ++ [ ./machines/bosco # lix-module.nixosModules.default home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; biski = lib.nixosSystem { # another networking server, physical instead of cloud - modules = minimalHomeManagerSettings ++ [ ./machines/biski + modules = minimalModuleConfig ++ [ ./machines/biski disko.nixosModules.disko home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; @@ -306,13 +299,13 @@ config.allowUnfree = true; }; }; - modules = minimalHomeManagerSettings ++ [ ./machines/picast + modules = minimalModuleConfig ++ [ ./machines/picast home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; microvm-test = lib.nixosSystem { # test system = "x86_64-linux"; - modules = minimalHomeManagerSettings ++ [ + modules = minimalModuleConfig ++ [ microvm.nixosModules.microvm # home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } { @@ -323,17 +316,15 @@ }; foolcreek = lib.nixosSystem { # vm for website specialArgs = { inherit inputs; }; - modules = minimalHomeManagerSettings ++ [ ./machines/vm/foolcreek + modules = minimalModuleConfig ++ [ ./machines/vm/foolcreek microvm.nixosModules.microvm home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } ]; }; live = lib.nixosSystem { - modules = minimalHomeManagerSettings ++ [ + modules = minimalModuleConfig ++ [ (nixpkgs + "/nixos/modules/installer/sd-card/sd-image-aarch64-installer.nix") ./machines/iso/configuration.nix - ./modules/users/defin.nix - ./modules/nixos/system-packages.nix home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/default.nix; } { nixpkgs.hostPlatform = "aarch64-linux"; } @@ -351,20 +342,20 @@ # vms = { # expose the build attribute directly # foolcreekwireless = foolcreekwireless.config.system.build.vm; # }; - homeConfigurations = { #NOTE: no worky yet - # Standalone HM only - # # Desktop - # "defin@khad" = lib.homeManagerConfiguration { - # modules = [ ./home-manager/home.nix ]; - # pkgs = pkgsFor.x86_64-linux; - # extraSpecialArgs = { inherit inputs outputs; }; - # }; - # Laptop - "defin@nixos-zenbook" = lib.homeManagerConfiguration { - modules = [ ./home-manager/home.nix ]; - pkgs = pkgsFor.x86_64-linux; - extraSpecialArgs = { inherit inputs outputs; }; - }; - }; - }; + # homeConfigurations = { #NOTE: no worky yet + # # Standalone HM only + # # # Desktop + # # "defin@khad" = lib.homeManagerConfiguration { + # # modules = [ ./home-manager/home.nix ]; + # # pkgs = pkgsFor.x86_64-linux; + # # extraSpecialArgs = { inherit inputs outputs; }; + # # }; + # # Laptop -- example + # # "defin@nixos-zenbook" = lib.homeManagerConfiguration { + # # modules = [ ./home-manager/home.nix ]; + # # pkgs = pkgsFor.x86_64-linux; + # # extraSpecialArgs = { inherit inputs outputs; }; + # # }; + # }; + }; } |