diff options
| author | seth <[email protected]> | 2023-07-11 02:20:29 -0400 |
|---|---|---|
| committer | seth <[email protected]> | 2023-07-11 04:03:02 -0400 |
| commit | d7769d757187bcfae3667f6f401d457d1a3c0a96 (patch) | |
| tree | 8bb1e4df773a29ed36a471438698ad3f740a14dd | |
| parent | 35e312bfb41145fdcafe43ffe52f6808c231a360 (diff) | |
hosts/users: mkNixOS/mkHMUser -> mkSystems/mkHMUsers
| -rw-r--r-- | flake.lock | 6 | ||||
| -rw-r--r-- | hosts/default.nix | 53 | ||||
| -rw-r--r-- | users/default.nix | 7 |
3 files changed, 31 insertions, 35 deletions
@@ -155,11 +155,11 @@ ] }, "locked": { - "lastModified": 1688522774, - "narHash": "sha256-XKeVsHS/EVckAxMUP4QlgsWirH3Lk5+WRKtJGHSxbBc=", + "lastModified": 1689061888, + "narHash": "sha256-dgMdmTJ1alm+T2i/NYk/lZeGeDvQCFJc5mma37tjjf4=", "owner": "getchoo", "repo": "nix-exprs", - "rev": "d207d629aff4cdc6b046c92242229e976a0f296b", + "rev": "3b35f9bfd90c0e5ce82084796c4ea109b8e0a49c", "type": "github" }, "original": { diff --git a/hosts/default.nix b/hosts/default.nix index af63c5a..f3db7e6 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -7,40 +7,37 @@ }: { flake = { nixosConfigurations = let - inherit (myLib.configs inputs) mkNixOS; + inherit (myLib.configs inputs) mkSystems; profiles = import ./profiles.nix {inherit self inputs;}; - in { - glados = mkNixOS { - name = "glados"; - modules = with inputs; [ - nixos-hardware.nixosModules.common-cpu-amd-pstate - nixos-hardware.nixosModules.common-gpu-nvidia-nonprime - nixos-hardware.nixosModules.common-pc-ssd - lanzaboote.nixosModules.lanzaboote - ]; - profile = profiles.personal; - }; + in + mkSystems { + glados = { + modules = with inputs; [ + nixos-hardware.nixosModules.common-cpu-amd-pstate + nixos-hardware.nixosModules.common-gpu-nvidia-nonprime + nixos-hardware.nixosModules.common-pc-ssd + lanzaboote.nixosModules.lanzaboote + ]; + profile = profiles.personal; + }; - glados-wsl = mkNixOS { - name = "glados-wsl"; - modules = [inputs.nixos-wsl.nixosModules.wsl]; - profile = profiles.personal; - }; + glados-wsl = { + modules = [inputs.nixos-wsl.nixosModules.wsl]; + profile = profiles.personal; + }; - atlas = mkNixOS { - name = "atlas"; - system = "aarch64-linux"; - profile = profiles.server; - }; + atlas = { + system = "aarch64-linux"; + profile = profiles.server; + }; - p-body = mkNixOS { - name = "p-body"; - modules = [inputs.guzzle_api.nixosModules.guzzle_api]; - system = "x86_64-linux"; - profile = profiles.server; + p-body = { + modules = [inputs.guzzle_api.nixosModules.guzzle_api]; + system = "x86_64-linux"; + profile = profiles.server; + }; }; - }; nixosModules.getchoo = import ../modules/nixos; diff --git a/users/default.nix b/users/default.nix index 4be79c3..83d8ce5 100644 --- a/users/default.nix +++ b/users/default.nix @@ -4,11 +4,10 @@ ... }: { perSystem = {system, ...}: let - inherit (myLib.configs inputs) mkHMUser; + inherit (myLib.configs inputs) mkHMUsers; in { - homeConfigurations = { - seth = mkHMUser { - name = "seth"; + homeConfigurations = mkHMUsers { + seth = { pkgs = import inputs.nixpkgs { inherit system; overlays = with inputs; [nur.overlay getchoo.overlays.default]; |