8 files changed, 13 insertions, 12 deletions
diff --git a/hosts/arrakis/default.nix b/hosts/arrakis/default.nix
index 80509cb..d4cb7f3 100644
--- a/hosts/arrakis/default.nix
+++ b/hosts/arrakis/default.nix
@@ -79,7 +79,7 @@
   environment.systemPackages = with pkgs; [
     angband
     assaultcube
-    master.bsdgames
+    bsdgames
     bzflag
     extremetuxracer
     #frozen-bubble
@@ -106,7 +106,7 @@
     warzone2100
     wpa_supplicant
     xonotic-sdl
-    master.xpilot-ng
+    xpilot-ng
   ];
 
   imports = [
diff --git a/hosts/arrakis/services.nix b/hosts/arrakis/services.nix
index b026cc1..ceb60c4 100644
--- a/hosts/arrakis/services.nix
+++ b/hosts/arrakis/services.nix
@@ -64,7 +64,7 @@
 
     jellyfin = {
       enable = true;
-      package = pkgs.master.jellyfin;
+      #package = pkgs.master.jellyfin;
     };
 
     nfs = {
diff --git a/hosts/common/core/default.nix b/hosts/common/core/default.nix
index 2bc8d14..4f7b058 100644
--- a/hosts/common/core/default.nix
+++ b/hosts/common/core/default.nix
@@ -40,6 +40,7 @@
     gnutar
     gptfdisk
     gzip
+    htop
     iproute2
     iputils
     jq
@@ -83,7 +84,7 @@
     strace
     sysstat
     tcpdump
-    master.tftp-hpa
+    tftp-hpa
     traceroute
     tree
     tshark
diff --git a/hosts/common/optional/ebooks.nix b/hosts/common/optional/ebooks.nix
index b2cbb2b..e25a76d 100644
--- a/hosts/common/optional/ebooks.nix
+++ b/hosts/common/optional/ebooks.nix
@@ -2,7 +2,7 @@
 {
   environment.systemPackages = with pkgs; [
     libgourou
-    master.calibre
+    calibre
   ];
 
   services.udisks2.enable = true;
diff --git a/hosts/common/optional/misc.nix b/hosts/common/optional/misc.nix
index f996274..4379afc 100644
--- a/hosts/common/optional/misc.nix
+++ b/hosts/common/optional/misc.nix
@@ -6,7 +6,7 @@
     aspellDicts.en
     aspellDicts.en-computers
     aspellDicts.en-science
-    #dict
+    master.dict
     encfs
     enscript
     expect
diff --git a/hosts/common/optional/services/dhcp.nix b/hosts/common/optional/services/dhcp.nix
index cc21ef9..3eed193 100644
--- a/hosts/common/optional/services/dhcp.nix
+++ b/hosts/common/optional/services/dhcp.nix
@@ -9,8 +9,8 @@
 
     systemPackages = with pkgs; [
       ipxe
-      master.tftp-hpa
-      master.wol
+      tftp-hpa
+      wol
     ];
   };
 
@@ -123,7 +123,7 @@
         Restart = "always";
         RestartSec = 5;
         Type = "exec";
-        ExecStart = "${pkgs.master.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
+        ExecStart = "${pkgs.tftp-hpa}/bin/in.tftpd -l -a 192.168.1.1:69 -P /run/tftpd.pid /etc/tftp";
         TimeoutStopSec = 20;
         PIDFile = "/run/tftpd.pid";
       };
diff --git a/hosts/common/optional/services/xorg.nix b/hosts/common/optional/services/xorg.nix
index c9aaeaa..13d9144 100644
--- a/hosts/common/optional/services/xorg.nix
+++ b/hosts/common/optional/services/xorg.nix
@@ -7,7 +7,7 @@
     feh
     gcr
     geeqie
-    master.ghostty
+    ghostty
     gimp
     #gimp-with-plugins
     google-chrome
@@ -18,7 +18,7 @@
     mesa-demos
     mpv
     polkit_gnome
-    master.rdesktop
+    rdesktop
     read-edid
     st
     sxiv
diff --git a/hosts/common/optional/sound.nix b/hosts/common/optional/sound.nix
index b05ef1e..ec7f41d 100644
--- a/hosts/common/optional/sound.nix
+++ b/hosts/common/optional/sound.nix
@@ -15,7 +15,7 @@
       polyphone
       qsynth
       reaper
-      #master.rosegarden
+      master.rosegarden
       samplv1
       sfizz
       surge-XT