diff options
| -rw-r--r-- | users/glittershark/system/system/default.nix | 40 |
1 files changed, 14 insertions, 26 deletions
diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix index aa0afb4c59..a640b3337c 100644 --- a/users/glittershark/system/system/default.nix +++ b/users/glittershark/system/system/default.nix @@ -19,36 +19,24 @@ rec { roswell = import ./machines/roswell.nix; - roswellSystem = (pkgs.nixos { - configuration = { ... }: { - imports = [ - ./machines/roswell.nix - "${nixpkgs.home-manager.src}/nixos" - "${depot.depotPath}/ops/nixos/depot.nix" - ]; - inherit depot; - - home-manager.users.grfn = { config, lib, ... }: { - imports = [ ../home/machines/roswell.nix ]; - lib.depot = depot; - _module.args.pkgs = lib.mkForce - (import pkgs.nixpkgsSrc - (lib.filterAttrs (n: v: v != null) config.nixpkgs)); - }; + roswellSystem = (depot.ops.nixos.nixosFor ({ ... }: { + imports = [ + ./machines/roswell.nix + "${nixpkgs.home-manager.src}/nixos" + ]; + + home-manager.users.grfn = { config, lib, ... }: { + imports = [ ../home/machines/roswell.nix ]; + lib.depot = depot; + _module.args.pkgs = lib.mkForce + (import pkgs.nixpkgsSrc + (lib.filterAttrs (n: v: v != null) config.nixpkgs)); }; - }).system; + })).system; yeren = import ./machines/yeren.nix; - yerenSystem = (pkgs.nixos { - configuration = { ... }: { - imports = [ - ./machines/yeren.nix - "${depot.depotPath}/ops/nixos/depot.nix" - ]; - inherit depot; - }; - }).system; + yerenSystem = depot.ops.nixos.nixosFor yeren; iso = import ./iso.nix args; |