From f38f05c4e7ab5b1e9c92f23c854e69f8135ca0c8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Thu, 29 Jun 2023 02:16:16 +0200
Subject: [PATCH] ljfdljkfsdlkj

---
 base.nix                     | 12 ++++++++++++
 hosts/nord/default.nix       |  1 +
 hosts/sopp/default.nix       |  1 +
 profiles/desktop/base.nix    |  8 ++++++++
 profiles/web/default.nix     |  2 +-
 users/pbsds/home/default.nix |  1 +
 6 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 profiles/desktop/base.nix

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<y))
diff --git a/users/pbsds/home/default.nix b/users/pbsds/home/default.nix
index 2f0317f..b5f477a 100644
--- a/users/pbsds/home/default.nix
+++ b/users/pbsds/home/default.nix
@@ -73,6 +73,7 @@
     nix-output-monitor
     nixpkgs-review
     nixpkgs-hammering
+    nurl
     manix
     comma