diff --git a/config/derek.nix b/config/derek.nix
index 7c81a6f..9a93f01 100644
--- a/config/derek.nix
+++ b/config/derek.nix
@@ -4,31 +4,28 @@
   pkgs,
   ...
 }:
+let
+  enableForDerek = {
+    enable = true;
+    users = "bearded_dragonn";
+  };
+in
 {
   my = {
     apps = {
-      art.enable = true;
-      art.users = "bearded_dragonn";
-      gaming.enable = true;
-      gaming.users = "bearded_dragonn";
-      multimedia.videoEditing.enable = true;
-      multimedia.videoEditing.users = "bearded_dragonn";
+      art = enableForDerek;
+      gaming = enableForDerek;
+      multimedia.videoEditing = enableForDerek;
     };
     dev = {
-      nix.enable = true;
-      nix.users = "bearded_dragonn";
-      python.enable = true;
-      python.users = "bearded_dragonn";
-      sh.enable = true;
-      sh.users = "bearded_dragonn";
+      nix = enableForDerek;
+      python = enableForDerek;
+      sh = enableForDerek;
     };
     shell = {
-      exercism.enable = true;
-      exercism.users = "bearded_dragonn";
-      tools.enable = true;
-      tools.users = "bearded_dragonn";
-      multimedia.enable = true;
-      multimedia.users = "bearded_dragonn";
+      exercism = enableForDerek;
+      tools = enableForDerek;
+      multimedia = enableForDerek;
     };
   };
   sops.secrets = lib.mkIf config.my.secureHost {
diff --git a/hosts/miniserver/toggles.nix b/hosts/miniserver/toggles.nix
index a4f148a..3ffdaf0 100644
--- a/hosts/miniserver/toggles.nix
+++ b/hosts/miniserver/toggles.nix
@@ -1,22 +1,27 @@
 { inputs }:
 let
-  inherit (inputs.self.lib) mkEnabled mkEnabledWithProxy enableList;
+  inherit (inputs.self.lib)
+    mkEnabled
+    mkEnabledWithUsers
+    mkEnabledWithProxy
+    enableList
+    ;
 in
 {
   emacs.enable = true;
   enableProxy = true;
   websites.portfolio.enableProxy = true;
-  apps = enableList mkEnabled [
+  apps = enableList mkEnabledWithUsers [
     "dictionaries"
   ];
   services = enableList mkEnabled [
     "network"
   ];
-  shell = enableList mkEnabled [
+  shell = enableList mkEnabledWithUsers [
     "tools"
     "multimedia"
   ];
-  dev = enableList mkEnabled [
+  dev = enableList mkEnabledWithUsers [
     "nix"
     "python"
     "sh"
diff --git a/hosts/server/toggles.nix b/hosts/server/toggles.nix
index d9e5c58..d170612 100644
--- a/hosts/server/toggles.nix
+++ b/hosts/server/toggles.nix
@@ -1,6 +1,6 @@
 { config, inputs }:
 let
-  inherit (inputs.self.lib) mkEnabled enableList;
+  inherit (inputs.self.lib) mkEnabled mkEnabledWithUsers enableList;
   mkEnabledIp = inputs.self.lib.mkEnabledIp config.my.ips.wg-server;
 in
 {
@@ -10,7 +10,8 @@ in
   enableProxy = true;
   enableContainers = true;
   apps.dictionaries.enable = true;
-  shell = enableList mkEnabled [
+  apps.dictionaries.users = "jawz";
+  shell = enableList mkEnabledWithUsers [
     "tools"
     "multimedia"
   ];
@@ -19,7 +20,7 @@ in
     "nvidia"
     "syncthing"
   ];
-  dev = enableList mkEnabled [
+  dev = enableList mkEnabledWithUsers [
     "nix"
     "python"
     "sh"
diff --git a/hosts/workstation/toggles.nix b/hosts/workstation/toggles.nix
index 18cfb40..4653086 100644
--- a/hosts/workstation/toggles.nix
+++ b/hosts/workstation/toggles.nix
@@ -1,28 +1,31 @@
 { inputs }:
 let
-  inherit (inputs.self.lib) mkEnabled enableList;
+  inherit (inputs.self.lib) mkEnabled mkEnabledWithUsers enableList;
 in
 {
   stylix.enable = true;
   emacs.enable = true;
   enableContainers = true;
   servers.drpp.enable = true;
-  apps = enableList mkEnabled [
-    "art"
-    "dictionaries"
-    "gaming"
-    "switch"
-    "internet"
-    "multimedia"
-    "office"
-    "misc"
-  ];
-  dev = enableList mkEnabled [
+  apps =
+    (enableList mkEnabledWithUsers [
+      "art"
+      "dictionaries"
+      "gaming"
+      "internet"
+      "multimedia"
+      "office"
+      "misc"
+    ])
+    // {
+      switch.enable = true;
+    };
+  dev = enableList mkEnabledWithUsers [
     "nix"
     "python"
     "sh"
   ];
-  shell = enableList mkEnabled [
+  shell = enableList mkEnabledWithUsers [
     "exercism"
     "multimedia"
     "tools"
diff --git a/parts/core.nix b/parts/core.nix
index a2e971b..6d62eb3 100644
--- a/parts/core.nix
+++ b/parts/core.nix
@@ -175,6 +175,13 @@ in
         inherit name;
         value.enable = true;
       };
+      mkEnabledWithUsers = name: {
+        inherit name;
+        value = {
+          enable = true;
+          users = "jawz";
+        };
+      };
       mkEnabledWithProxy = name: {
         inherit name;
         value = {