9 files changed, 15 insertions, 98 deletions
diff --git a/hermes/home-manager/leo/gui/default.nix b/hermes/home-manager/leo/gui/default.nix
deleted file mode 100644
index f3f51bf..0000000
--- a/hermes/home-manager/leo/gui/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{...}: {
-  imports = [
-    ./sway.nix
-  ];
-
-  sway.enable = false;
-}
diff --git a/hermes/home-manager/leo/gui/sway.nix b/hermes/home-manager/leo/gui/sway.nix
deleted file mode 100644
index 7e74312..0000000
--- a/hermes/home-manager/leo/gui/sway.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{lib, config, ...}: {
-  options.sway.enable = lib.mkEnableOption "sway wm config";
-
-  config = lib.mkIf config.sway.enable {
-    wayland.windowManager.sway = {
-      enable = true;
-
-      systemd.enable = true;
-
-      checkConfig = true;
-      config = {
-        modifier = "Mod4";
-
-        terminal = "alacritty";
-        menu = "wmenu-run";
-
-        input = {
-          "*" = {
-            xkb_layout = "it";
-
-            natural_scroll = "enabled";
-          };
-        };
-
-        keybindings = let
-          modifier = config.wayland.windowManager.sway.config.modifier;
-
-          terminal = config.wayland.windowManager.sway.config.terminal;
-          menu = config.wayland.windowManager.sway.config.menu;
-        in lib.mkOptionDefault {
-          "${modifier}+Shift+c" = "kill";
-          "${modifier}+Shift+q" = "exec swaymsg exit";
-          "${modifier}+Shift+Return" = "exec ${terminal}";
-          "${modifier}+p" = "exec ${menu}";
-
-          "XF86MonBrightnessDown" = "exec light -U 10";
-          "XF86MonBrightnessUp" = "exec light -A 10";
-        };
-      };
-    };
-  };
-}
diff --git a/hermes/home-manager/leo/home.nix b/hermes/home-manager/leo/home.nix
index 5886239..332cb6e 100644
--- a/hermes/home-manager/leo/home.nix
+++ b/hermes/home-manager/leo/home.nix
@@ -1,6 +1,5 @@
 {...}: {
   imports = [
-    ./gui
     ./programs
   ];
 
diff --git a/hermes/home-manager/leo/programs/default.nix b/hermes/home-manager/leo/programs/default.nix
index 4f0116a..79293c2 100644
--- a/hermes/home-manager/leo/programs/default.nix
+++ b/hermes/home-manager/leo/programs/default.nix
@@ -1,13 +1,11 @@
 {...}: {
   imports = [
     ./zsh.nix
-    ./zed.nix
     ./alacritty.nix
-    ./waybar.nix
+    ./zed.nix
   ];
 
   zsh.enable = true;
-  zed.enable = true;
   alacritty.enable = true;
-  waybar.enable = true;
+  zed.enable = true;
 }
diff --git a/hermes/home-manager/leo/programs/waybar.nix b/hermes/home-manager/leo/programs/waybar.nix
deleted file mode 100644
index cb8d420..0000000
--- a/hermes/home-manager/leo/programs/waybar.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{lib, config, ...}: {
-  options.waybar.enable = lib.mkEnableOption "waybar config";
-
-  config = lib.mkIf config.waybar.enable {
-  };
-}
diff --git a/hermes/nixos/gui/default.nix b/hermes/nixos/gui/default.nix
index c677aaa..a274cce 100644
--- a/hermes/nixos/gui/default.nix
+++ b/hermes/nixos/gui/default.nix
@@ -1,8 +1,7 @@
 {pkgs, ...}: {
   imports = [
-    ./plasma.nix
     ./xfce.nix
-    ./sway.nix
+    ./plasma.nix
   ];
 
   # Drivers
@@ -46,7 +45,6 @@
   # Custom
   #
   # NOTE: kde and xfce cannot be enabled due to conflicting pinetry package
-  plasma.enable = false;
   xfce.enable = true;
-  sway.enable = false;
+  plasma.enable = false;
 }
diff --git a/hermes/nixos/gui/sway.nix b/hermes/nixos/gui/sway.nix
deleted file mode 100644
index 459065b..0000000
--- a/hermes/nixos/gui/sway.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{lib, config, pkgs, ...}: {
-  options.sway.enable = lib.mkEnableOption "sway wm";
-
-  config = lib.mkIf config.sway.enable {
-    programs.sway = {
-      enable = true;
-      xwayland.enable = true;
-
-      wrapperFeatures = {
-        base = true;
-        gtk = true;
-      };
-
-      extraPackages = with pkgs; [
-        swaybg swayidle swaylock
-        light grim wl-clipboard wmenu
-      ];
-    };
-  };
-}
diff --git a/hermes/nixos/programs/default.nix b/hermes/nixos/programs/default.nix
index 0c01d8b..883293c 100644
--- a/hermes/nixos/programs/default.nix
+++ b/hermes/nixos/programs/default.nix
@@ -9,14 +9,16 @@
   # Packages
   environment.systemPackages = with pkgs; [
     librewolf thunderbird
-    keepassxc kdePackages.kleopatra veracrypt
+    keepassxc veracrypt kdePackages.kleopatra
+    electrum feather
     vlc ffmpeg yt-dlp
+
+    openssh rsync wireguard-tools dig
     alacritty zed-editor tmux vim
     nil nixd
-    openssh rsync wireguard-tools dig
+
     ascii file fastfetch btop
     exfat ntfs3g
-    electrum feather
     wine64 distrobox
 
     # Home manager
diff --git a/hermes/nixos/programs/games.nix b/hermes/nixos/programs/games.nix
index e004960..f697872 100644
--- a/hermes/nixos/programs/games.nix
+++ b/hermes/nixos/programs/games.nix
@@ -4,22 +4,17 @@
   config = lib.mkIf config.games.enable {
     hardware.steam-hardware.enable = true;
 
+    #Steam
+    programs = {
+      gamemode.enable = true;
+      steam.enable = true;
+    };
+
     # Packages
     environment.systemPackages = with pkgs; [
       prismlauncher heroic
 
       gpu-screen-recorder gpu-screen-recorder-gtk
     ];
-
-    #Steam
-    programs = {
-      gamescope.enable = true;
-      gamemode.enable = true;
-
-      steam = {
-        enable = true;
-        gamescopeSession.enable = false; # SteamOS interface
-      };
-    };
   };
 }