diff --git a/hosts/tartarus/configuration.nix b/hosts/tartarus/configuration.nix
index e393625..25574d3 100644
--- a/hosts/tartarus/configuration.nix
+++ b/hosts/tartarus/configuration.nix
@@ -46,17 +46,6 @@ in {
   # Enable networking
   networking.networkmanager.enable = true;
 
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.desktopManager.plasma6.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -79,19 +68,9 @@ in {
     description = "osbm";
     extraGroups = ["networkmanager" "wheel" "docker"];
     packages = with pkgs; [
-      kdePackages.kate
-      vscode
-      discord # discord sucks
-      alacritty
-      obsidian
-      mpv
-      libreoffice
-      blender
-      gimp
-      kitty
-      obs-studio
-      audacity
-      qbittorrent
+    ];
+    openssh.authorizedKeys.keys = [
+     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k"
     ];
   };
 
diff --git a/hosts/ymir/configuration.nix b/hosts/ymir/configuration.nix
index 760d0eb..2ce668d 100644
--- a/hosts/ymir/configuration.nix
+++ b/hosts/ymir/configuration.nix
@@ -77,17 +77,6 @@ in {
     package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 
-  # Enable the X11 windowing system.
-  # You can disable this if you're only using the Wayland session.
-  services.xserver.enable = true;
-
-  # Enable the KDE Plasma Desktop Environment.
-  services.displayManager.sddm.enable = true;
-  services.desktopManager.plasma6.enable = true;
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
   # Enable sound with pipewire.
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
@@ -135,20 +124,6 @@ in {
       description = "osbm";
       extraGroups = ["networkmanager" "wheel" "docker"];
       packages = with pkgs; [
-        kdePackages.kate
-        vscode
-        discord # discord sucks
-        alacritty
-        obsidian
-        mpv
-        libreoffice
-        blender
-        gimp
-        kitty
-        obs-studio
-        audacity
-        qbittorrent
-        prismlauncher
       ];
     };
     bayram = {
@@ -157,10 +132,6 @@ in {
       initialPassword = "changeme";
       extraGroups = ["networkmanager"];
       packages = with pkgs; [
-        vlc
-        ungoogled-chromium
-        prismlauncher
-        qbittorrent
       ];
     };
   };
diff --git a/modules/common-packages.nix b/modules/common-packages.nix
index aa867fc..feda342 100644
--- a/modules/common-packages.nix
+++ b/modules/common-packages.nix
@@ -20,7 +20,7 @@
     tlrc
     wakeonlan
     # neovim
-    ani-cli
+
     btop
     pciutils
     nodePackages.npm
@@ -48,16 +48,6 @@
     comma
   ];
 
-  programs.steam = {
-    enable = true;
-    # Open ports in the firewall for Steam Remote Play
-    remotePlay.openFirewall = true;
-    # Open ports in the firewall for Source Dedicated Server
-    dedicatedServer.openFirewall = true;
-    # Open ports in the firewall for Steam Local Network Game Transfers
-    localNetworkGameTransfers.openFirewall = true;
-  };
-
   programs.gnupg.agent = {
     enable = true;
     enableSSHSupport = true;
diff --git a/modules/graphical-interface.nix b/modules/graphical-interface.nix
new file mode 100644
index 0000000..f2c319f
--- /dev/null
+++ b/modules/graphical-interface.nix
@@ -0,0 +1,58 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}: {
+  options = {
+    enableKDE = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable KDE Plasma Desktop Environment with my favorite packages";
+    };
+  };
+
+  config = lib.mkMerge [
+    (lib.mkIf config.enableKDE {
+
+  # Enable the X11 windowing system.
+  # You can disable this if you're only using the Wayland session.
+  services.xserver.enable = true;
+
+  # Enable the KDE Plasma Desktop Environment.
+  services.displayManager.sddm.enable = true;
+  services.desktopManager.plasma6.enable = true;
+
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+
+  environment.systemPackages = with pkgs; [
+      vscode
+      discord # discord sucks
+      alacritty
+      obsidian
+      mpv
+      libreoffice
+      blender
+      gimp
+      kitty
+      obs-studio
+      audacity
+      qbittorrent
+      ani-cli
+      prismlauncher
+      qbittorrent
+  ];
+
+  programs.steam = {
+    enable = true;
+    # Open ports in the firewall for Steam Remote Play
+    remotePlay.openFirewall = true;
+    # Open ports in the firewall for Source Dedicated Server
+    dedicatedServer.openFirewall = true;
+    # Open ports in the firewall for Steam Local Network Game Transfers
+    localNetworkGameTransfers.openFirewall = true;
+  };
+    })
+  ];
+}
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
index 3e1005f..9fa9ee5 100644
--- a/secrets/secrets.nix
+++ b/secrets/secrets.nix
@@ -2,12 +2,15 @@ let
   ymir = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHxc1ycxtzO2u4bHas71pi5CpR8Zzcj6GXjx1lLWMOHq";
   tartarus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMxbIyQnQFA1RFQKH4eHHWcT7Z0tCumerCsRMjlHgSPd";
 
+  osbm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPfnV+qqUCJf92npNW4Jy0hIiepCJFBDJHXBHnUlNX0k";
+
   machines = [
     ymir
     tartarus
   ];
+
 in {
-  "network-manager.age".publicKeys = machines;
-  "ssh-key-private.age".publicKeys = machines;
-  "ssh-key-public.age".publicKeys = machines;
+  "network-manager.age".publicKeys = machines ++ [osbm];
+  "ssh-key-private.age".publicKeys = machines ++ [osbm];
+  "ssh-key-public.age".publicKeys = machines ++ [osbm];
 }