diff --git a/home-manager/cli/zsh.nix b/home-manager/cli/zsh.nix
index 3f14b12..39799c3 100644
--- a/home-manager/cli/zsh.nix
+++ b/home-manager/cli/zsh.nix
@@ -6,10 +6,10 @@
     defaultKeymap = "viins";
     enableCompletion = true;
     history = {
-      ignoreAllDups = true;
+      expireDuplicatesFirst = true;
       save = 10000;
       share = true;
-      path = "$HOME/.local/share/zsh/history";
+      path = ".local/share/zsh/history";
     };
     historySubstringSearch = {
       enable = true;
diff --git a/home-manager/desktop/sway/sway.nix b/home-manager/desktop/sway/sway.nix
index 63ef6e6..33f5edd 100644
--- a/home-manager/desktop/sway/sway.nix
+++ b/home-manager/desktop/sway/sway.nix
@@ -11,13 +11,26 @@
       down = "j";
       up = "k";
       right = "l";
-      bars= [];
       input = {
-        "1003:8258:MNT_Reform_Keyboard" = {
+        "*" = {
           xkb_layout = "us";
           xkb_variant = "altgr-intl";
+        }; 
+      };
+      output = {
+        "Iiyama North America PL2792UH 1166310803122" = { 
+          mode = "3840x2160@60Hz"; 
+          position = "0,0";
+          scale = "2";
+        };
+        "Iiyama North America PL2792UH 1176923201598" = {
+          mode = "3840x2160@60Hz"; 
+          position = "1920,0";
+          scale = "2";
+          transform = "90";
         };
       };
+      bars= [];
       keybindings = let
         mod = config.wayland.windowManager.sway.config.modifier;
         inherit (config.wayland.windowManager.sway.config)
diff --git a/home-manager/desktop/sway/swayidle.nix b/home-manager/desktop/sway/swayidle.nix
index b93cdab..34d7c8f 100644
--- a/home-manager/desktop/sway/swayidle.nix
+++ b/home-manager/desktop/sway/swayidle.nix
@@ -9,8 +9,8 @@
       }
       {
         timeout = 600;
-        command = ''${pkgs.sway}/bin/swaymsg  "output * power off'';
-        resumeCommand = ''${pkgs.sway}/bin/swaymsg  "output * power on"'';
+        command = "swaymsg 'output * dpms off'";
+        resumeCommand = "swaymsg 'output * dpms on'";
       }
     ];
     events = [
diff --git a/home-manager/hosts/morty.nix b/home-manager/hosts/morty.nix
deleted file mode 100644
index a7fbeb0..0000000
--- a/home-manager/hosts/morty.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-_: {
-  home.file.".xkb/symbols/gpdwinmax".text = ''
-default partial alphanumeric_keys
-xkb_symbols "us-intl-winmax" {
-    name[group1] = "GPD Win Max us-inlt";
-    include "us(altgr-intl)"
-    key <TAB> { [ Multi_key ] };
-    key <CAPS> { [ Tab ] };
-    # include "level3(ralt_switch)"
-};
-  '';
-
-   wayland.windowManager.sway.config.input = {
-    "1:1:AT_Translated_Set_2_keyboard" = {
-      xkb_layout = "gpdwinmax";
-    };
-    "1046:928:Goodix_Capacitive_TouchScreen" = {
-      map_to_output = "eDP-1";
-    };
-    "2362:597:HTIX5288:00_093A:0255_Touchpad" = {
-      "tap" = "enable";
-      "pointer_accel" = "0.3";
-    };
-  };
-   wayland.windowManager.sway.config.output = {
-    "eDP-1" = {
-      transform = "90";
-    };
-  };
-}
diff --git a/home-manager/hosts/mrmeeseeks.nix b/home-manager/hosts/mrmeeseeks.nix
deleted file mode 100644
index 3c04cd3..0000000
--- a/home-manager/hosts/mrmeeseeks.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-_: {
-  wayland.windowManager.sway.config.output = {
-    "Iiyama North America PL2792UH 1166310803122" = { 
-      mode = "3840x2160@60Hz"; 
-      position = "0,0";
-      scale = "2";
-    };
-    "Iiyama North America PL2792UH 1176923201598" = {
-      mode = "3840x2160@60Hz"; 
-      position = "1920,0";
-      scale = "2";
-      transform = "90";
-    };
-  };
-}
diff --git a/nixos/default.nix b/nixos/default.nix
index 27b8934..f12c6d1 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -60,7 +60,6 @@
     useUserPackages = true;
     extraSpecialArgs = {
       inherit hostConfig;
-      inherit hostname;
     };
     users.${username} = {
       home.stateVersion = stateVersion;
@@ -81,9 +80,7 @@
         if hostConfig.gaming then
           [ ../home-manager/lutris.nix ]
         else []
-      )  ++ lib.optional (
-        builtins.pathExists ../home-manager/hosts/${hostname}.nix
-        ) ../home-manager/hosts/${hostname}.nix;
+      );
     };
   };