diff options
Diffstat (limited to 'users/glittershark/system/system')
-rw-r--r-- | users/glittershark/system/system/default.nix | 14 | ||||
-rw-r--r-- | users/glittershark/system/system/iso.nix | 10 |
2 files changed, 10 insertions, 14 deletions
diff --git a/users/glittershark/system/system/default.nix b/users/glittershark/system/system/default.nix index a640b3337c9c..78cab61a01f9 100644 --- a/users/glittershark/system/system/default.nix +++ b/users/glittershark/system/system/default.nix @@ -1,19 +1,15 @@ args @ { depot, pkgs, ... }: -let - nixpkgs = import pkgs.nixpkgsSrc {}; -in - rec { chupacabra = import ./machines/chupacabra.nix; - chupacabraSystem = (pkgs.nixos { + chupacabraSystem = (depot.third_party.nixos { configuration = chupacabra; }).system; mugwump = import ./machines/mugwump.nix; - mugwumpSystem = (pkgs.nixos { + mugwumpSystem = (depot.third_party.nixos { configuration = mugwump; }).system; @@ -22,14 +18,14 @@ rec { roswellSystem = (depot.ops.nixos.nixosFor ({ ... }: { imports = [ ./machines/roswell.nix - "${nixpkgs.home-manager.src}/nixos" + "${pkgs.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 + (import pkgs.path (lib.filterAttrs (n: v: v != null) config.nixpkgs)); }; })).system; @@ -60,7 +56,7 @@ rec { system=$(nix-build -E '(import ${depotPath} {}).users.glittershark.system.system.${hostname}' --no-out-link) ;; ''; - in depot.third_party.writeShellScriptBin "rebuilder" '' + in pkgs.writeShellScriptBin "rebuilder" '' set -ue if [[ $EUID -ne 0 ]]; then echo "Oh no! Only root is allowed to rebuild the system!" >&2 diff --git a/users/glittershark/system/system/iso.nix b/users/glittershark/system/system/iso.nix index 056922ee1e82..256aee6a5e3a 100644 --- a/users/glittershark/system/system/iso.nix +++ b/users/glittershark/system/system/iso.nix @@ -1,17 +1,17 @@ -{ pkgs, ... }: +{ depot, lib, pkgs, ... }: let configuration = { ... }: { imports = [ - "${pkgs.nixpkgsSrc}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix" - "${pkgs.nixpkgsSrc}/nixos/modules/installer/cd-dvd/channel.nix" + "${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel.nix" + "${pkgs.path}/nixos/modules/installer/cd-dvd/channel.nix" ]; networking.networkmanager.enable = true; networking.useDHCP = false; networking.firewall.enable = false; - networking.wireless.enable = pkgs.lib.mkForce false; + networking.wireless.enable = lib.mkForce false; }; -in (pkgs.nixos { +in (depot.third_party.nixos { inherit configuration; }).config.system.build.isoImage |