diff --git a/flake.nix b/flake.nix index 11e0cbfd..228f98ba 100644 --- a/flake.nix +++ b/flake.nix @@ -53,7 +53,7 @@ libx = import ./lib { inherit self inputs outputs stateVersion hmStateVersion; }; in { nixosConfigurations = { - # Linode VM's + # Linode VMs osaka-linode-01 = libx.mkHost { hostname = "osaka-linode-01"; type = "small";}; milan-linode-01 = libx.mkHost { hostname = "milan-linode-01"; type = "small";}; frankfurt-linode-01 = libx.mkHost { hostname = "frankfurt-linode-01"; type = "small";}; @@ -75,7 +75,7 @@ bakersfield-rpi4 = libx.mkHost { hostname = "bakersfield-rpi4"; system = "aarch64-linux"; type = "small"; }; }; homeConfigurations = { - # Linode VM's + # Linode VMs "albert@osaka-linode-01" = libx.mkHome { hostname = "osaka-linode-01"; type = "small"; }; "albert@milan-linode-01" = libx.mkHome { hostname = "milan-linode-01"; type = "small"; }; "albert@frankfurt-linode-01" = libx.mkHome { hostname = "frankfurt-linode-01"; type = "small"; }; @@ -100,7 +100,7 @@ "albert@rdesktop" = libx.mkHome { hostname = "rdesktop"; desktop = "plasma6"; }; }; deploy.nodes = { - # Linode VM's + # Linode VMs osaka-linode-01 = libx.deploy { hostname = "osaka-linode-01"; }; milan-linode-01 = libx.deploy { hostname = "milan-linode-01"; }; frankfurt-linode-01 = libx.deploy { hostname = "frankfurt-linode-01"; }; diff --git a/home-manager/default.nix b/home-manager/default.nix index 4d1e6840..12e528d8 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -1,4 +1,4 @@ -{ lib, inputs, hostname, username, desktop, hmStateVersion, system, image, ... }: { +{ lib, inputs, hostname, username, desktop, hmStateVersion, system, ... }: { imports = [ # Common configs ./common/software/cli @@ -16,7 +16,6 @@ ++ lib.optional (builtins.isString desktop) ./common/software/gui # GUI packages ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop} # Machine-agnostic desktop configs ++ lib.optional (builtins.isString desktop) ./hosts/${hostname}/desktops/${desktop} # Machine-specific desktop configs - ++ lib.optional (builtins.isString image ) ./common/image-specific.nix # Image specific items ; news.display = "silent"; diff --git a/lib/default.nix b/lib/default.nix index 4cb5b348..1e9e607e 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -24,10 +24,9 @@ system ? "x86_64-linux", theme ? "default", type ? "default", - image ? null }: inputs.home-manager.lib.homeManagerConfiguration { pkgs = inputs.nixpkgs.legacyPackages.${system}; - extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme image; }; + extraSpecialArgs = { inherit inputs outputs desktop hostname system username hmStateVersion theme; }; modules = [ ../home-manager/${type}.nix ]; }; @@ -156,11 +155,10 @@ theme ? "default", repo ? "nixpkgs", unfree ? false, - image ? true, format }: inputs.nixos-generators.nixosGenerate { specialArgs = { - inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format image; + inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; # Choose whether to pull from stable or unstable pkgs = import inputs.${repo} { inherit system; @@ -184,7 +182,7 @@ inputs.sops-nix.nixosModules.sops inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.home-manager { - home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format image; }; + home-manager.extraSpecialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme format; }; home-manager.users."${username}" = import ../home-manager; } ]; diff --git a/nixos/common/modules/installer.nix b/nixos/common/modules/installer.nix index c810fcbb..87b7fc28 100644 --- a/nixos/common/modules/installer.nix +++ b/nixos/common/modules/installer.nix @@ -1,6 +1,5 @@ { config, desktop, lib, pkgs, username, ... }: let - ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; install-system = pkgs.writeScriptBin "install-system" "${builtins.readFile ../../../docs/install.sh}"; in { diff --git a/nixos/common/modules/networking.nix b/nixos/common/modules/networking.nix index 2bc58733..3da38f86 100644 --- a/nixos/common/modules/networking.nix +++ b/nixos/common/modules/networking.nix @@ -4,7 +4,6 @@ networkmanager = { enable = true; logLevel = "INFO"; - dns = "dnsmasq"; }; useDHCP = lib.mkDefault true;