diff --git a/flake.nix b/flake.nix
index 72173e2..93c91be 100644
--- a/flake.nix
+++ b/flake.nix
@@ -134,7 +134,7 @@
             }
           ];
         };
-        nebula = nixpkgs.lib.nixosSystem {
+        merlin = nixpkgs.lib.nixosSystem {
           inherit specialArgs;
           modules = [
             ./hosts/nebula
diff --git a/home/citadel.nix b/home/citadel.nix
index ac8cbad..ba5a804 100644
--- a/home/citadel.nix
+++ b/home/citadel.nix
@@ -1,4 +1,4 @@
-{config, ...}: {
+{config, pkgs, ...}: {
   imports = [
     # Import users
     ./users/sam
@@ -15,6 +15,10 @@
     ./common/optional/yazi.nix
   ];
 
+  home.packages = [
+    pkgs.qgis
+  ];
+
   colorScheme = {
     slug = "serene";
     name = "Serene";
diff --git a/home/common/optional/desktop/common/default.nix b/home/common/optional/desktop/common/default.nix
index ba805e3..1278fc9 100644
--- a/home/common/optional/desktop/common/default.nix
+++ b/home/common/optional/desktop/common/default.nix
@@ -15,7 +15,6 @@
     pkgs.kcolorchooser
     pkgs.zotero
     pkgs.transmission
-    pkgs.qgis
     pkgs.mpv
     pkgs.gnome.simple-scan
     pkgs.pandoc
diff --git a/home/fileserver.nix b/home/fileserver.nix
deleted file mode 100644
index b54e626..0000000
--- a/home/fileserver.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ ...
-}: {
-  imports = [
-    # Import users
-    ./users/admin
-
-    ./common/core
-    ./common/optional/sops.nix
-
-    # Import optional
-    ./common/optional/git.nix
-
-  ];
-}
diff --git a/home/nebula.nix b/home/nebula.nix
deleted file mode 100644
index 1445a0d..0000000
--- a/home/nebula.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ ...
-}: {
-  imports = [
-    # Import users
-    ./users/admin
-
-    ./common/core
-
-    # Import optional
-    ./common/optional/git.nix
-
-  ];
-}
diff --git a/home/nixdev.nix b/home/nixdev.nix
deleted file mode 100644
index cc5c5f7..0000000
--- a/home/nixdev.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ ...
-}: {
-  imports = [
-    # Import users
-    ./users/sam
-
-    ./common/core
-    ./common/optional/desktop/hyprland
-    ./common/optional/desktop/waybar.nix
-    ./common/optional/sops.nix
-
-    # Import optional
-    ./common/optional/git.nix
-  ];
-
-  #  ------  
-  # | DP-1
-  #  ------  
-  monitors = [
-    {
-      name = "Virtual-1";
-      width = 2048;
-      height = 1152;
-      x = 0;
-      workspace = "1";
-      primary = true;
-    }
-  ];
-}
diff --git a/home/semita.nix b/home/semita.nix
index a13b298..1827a3b 100644
--- a/home/semita.nix
+++ b/home/semita.nix
@@ -20,6 +20,10 @@
     ./common/optional/transmission.nix
   ];
 
+  home.packages = [
+    pkgs.qgis
+  ];
+
   colorScheme = {
     slug = "serene";
     name = "Serene";
diff --git a/hosts/nebula/default.nix b/hosts/merlin/default.nix
similarity index 97%
rename from hosts/nebula/default.nix
rename to hosts/merlin/default.nix
index 9897458..9ceeadf 100644
--- a/hosts/nebula/default.nix
+++ b/hosts/merlin/default.nix
@@ -37,7 +37,7 @@ in
   };
 
   networking = {
-    hostName = "nebula";
+    hostName = "merlin";
     networkmanager.enable = true;
     enableIPv6 = false;
   };
diff --git a/hosts/nebula/hardware-configuration.nix b/hosts/merlin/hardware-configuration.nix
similarity index 100%
rename from hosts/nebula/hardware-configuration.nix
rename to hosts/merlin/hardware-configuration.nix