diff --git a/base.nix b/base.nix index 09641a4..7dc4554 100644 --- a/base.nix +++ b/base.nix @@ -15,6 +15,18 @@ ) ]; + environment.systemPackages = with pkgs; [ + ddrescue + gptfdisk + ms-sys + nvme-cli + parted + pciutils + smartmontools + testdisk + usbutils + ]; + # TODO: selectively whitelist? nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfreePredicate = (pkg: true); diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix index 4d86708..c52c959 100644 --- a/hosts/nord/default.nix +++ b/hosts/nord/default.nix @@ -29,6 +29,7 @@ ../../profiles/shell/nix-utils.nix ../../profiles/shell/binfmt-emu.nix + ../../profiles/desktop/base.nix ../../profiles/desktop/gnome # configures gdm #../../profiles/desktop/sound/alsa.nix #../../profiles/desktop/sound/pulseaudio.nix diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix index 32e0176..ee78084 100644 --- a/hosts/sopp/default.nix +++ b/hosts/sopp/default.nix @@ -34,6 +34,7 @@ ../../profiles/shell/nix-utils.nix ../../profiles/shell/binfmt-emu.nix + ../../profiles/desktop/base.nix ../../profiles/desktop/gnome # configures gdm #../../profiles/desktop/sound/alsa.nix #../../profiles/desktop/sound/pulseaudio.nix diff --git a/profiles/desktop/base.nix b/profiles/desktop/base.nix new file mode 100644 index 0000000..d5c3018 --- /dev/null +++ b/profiles/desktop/base.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + + environment.systemPackages = with pkgs; [ + gparted + ]; + +} diff --git a/profiles/web/default.nix b/profiles/web/default.nix index c1d1785..9c237a6 100644 --- a/profiles/web/default.nix +++ b/profiles/web/default.nix @@ -5,7 +5,7 @@ in { _module.args.mkDomain = mkDomain; _module.args.allSubdomains = lib.pipe config.services.nginx.virtualHosts [ - (lib.mapAttrsToList (domain: vhost: [ domain ] ++ vhost.serverAliases)) + #(lib.mapAttrsToList (domain: vhost: [ domain ] ++ vhost.serverAliases)) (lib.mapAttrsToList (domain: vhost: [ domain ])) lib.flatten (lib.sort (x: y: x