diff --git a/hosts/morty/includes/home-manager.nix b/home-manager/hosts/morty.nix
similarity index 52%
rename from hosts/morty/includes/home-manager.nix
rename to home-manager/hosts/morty.nix
index 5d156fd..c1b26f1 100644
--- a/hosts/morty/includes/home-manager.nix
+++ b/home-manager/hosts/morty.nix
@@ -1,22 +1,19 @@
 {pkgs, ... }:
-let
-  kbd_file = pkgs.writeText  "gpdwinmax.kbd"
-  ''
-    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)"
-    };
-  '';
-in
 {
-  wayland.windowManager.sway.checkConfig = false;
+  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 = "${kbd_file}";
+      xkb_layout = "gpdwinmax";
     };
     "1046:928:Goodix_Capacitive_TouchScreen" = {
       map_to_output = "eDP-1";
diff --git a/hosts/mrmeeseeks/includes/home-manager.nix b/home-manager/hosts/mrmeeseeks.nix
similarity index 78%
rename from hosts/mrmeeseeks/includes/home-manager.nix
rename to home-manager/hosts/mrmeeseeks.nix
index 71e8639..5c4cffc 100644
--- a/hosts/mrmeeseeks/includes/home-manager.nix
+++ b/home-manager/hosts/mrmeeseeks.nix
@@ -1,16 +1,15 @@
 _: {
-  wayland.windowManager.sway.checkConfig = false;
   wayland.windowManager.sway.config.output = {
     "Iiyama North America PL2792UH 1166310803122" = { 
       mode = "3840x2160@60Hz"; 
-      position = "1235,0";
-      scale = "1.75";
+      position = "1080,0";
+      scale = "2";
       bg = "~/medias/images/wallpapers/desktop.jpg center #000000";
     };
     "Iiyama North America PL2792UH 1176923201598" = {
       mode = "3840x2160@60Hz"; 
       position = "0,0";
-      scale = "1.75";
+      scale = "2";
       transform = "270";
       bg = "~/medias/images/wallpapers/desktop.jpg center #000000";
     };
diff --git a/hosts/morty/files/lockscreen.png b/hosts/morty/files/lockscreen.png
deleted file mode 100644
index 9fc386f..0000000
Binary files a/hosts/morty/files/lockscreen.png and /dev/null differ
diff --git a/hosts/morty/home-config.nix b/hosts/morty/home-config.nix
index 1701470..000cb12 100644
--- a/hosts/morty/home-config.nix
+++ b/hosts/morty/home-config.nix
@@ -24,7 +24,6 @@
     gaming.lutris.enable = true;
     desktop.sway = {
       enable = true;
-      wallpapers.lockscreen = "${./files/lockscreen.png}";
       kanshi = true;
       waybar = {
         laptop = true;
diff --git a/hosts/morty/nixos-config.nix b/hosts/morty/nixos-config.nix
index ce1b727..8926b11 100644
--- a/hosts/morty/nixos-config.nix
+++ b/hosts/morty/nixos-config.nix
@@ -1,5 +1,4 @@
 { ... }: {
-  config.modules.desktop.sway.enable = true;
   config.modules.gaming.steam.enable = true;
   config.modules.hardware.laptop.enable = true;
 }
diff --git a/hosts/mrmeeseeks/files/lockscreen.png b/hosts/mrmeeseeks/files/lockscreen.png
deleted file mode 100644
index 5bf3a3f..0000000
Binary files a/hosts/mrmeeseeks/files/lockscreen.png and /dev/null differ
diff --git a/hosts/mrmeeseeks/files/wallpaper.jpg b/hosts/mrmeeseeks/files/wallpaper.jpg
deleted file mode 100644
index f46bedb..0000000
Binary files a/hosts/mrmeeseeks/files/wallpaper.jpg and /dev/null differ
diff --git a/hosts/mrmeeseeks/home-config.nix b/hosts/mrmeeseeks/home-config.nix
index c253bdb..29c8e6f 100644
--- a/hosts/mrmeeseeks/home-config.nix
+++ b/hosts/mrmeeseeks/home-config.nix
@@ -1,16 +1,11 @@
 { ... }: {
   config.modules = {
     application = {
-      gnupg.enable = true;
       zathura.enable = true;
       foot.enable = true;
     };
     cli = {
-      direnv.enable = true;
-      ghq.enable = true;
-      git.enable = true;
       neovim.enable = true;
-      utils.enable = true;
       vifm.enable = true;
       zsh.enable = true;
     };
@@ -25,8 +20,6 @@
     desktop.sway = {
       enable = true;
       kanshi = false;
-      wallpapers.lockscreen = "${./files/lockscreen.png}";
-      wallpapers.desktop = "${./files/wallpaper.jpg} center #000000";
       waybar = {
         laptop = false;
         gpuThermal = {
diff --git a/hosts/mrmeeseeks/nixos-config.nix b/hosts/mrmeeseeks/nixos-config.nix
index 6cb7886..2052e1a 100644
--- a/hosts/mrmeeseeks/nixos-config.nix
+++ b/hosts/mrmeeseeks/nixos-config.nix
@@ -1,5 +1,4 @@
 { ... }: {
-  config.modules.desktop.sway.enable = true;
   config.modules.gaming.steam = {
     enable = true;
     gamemode = true;
diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix
index aad3a3d..f7d40e0 100644
--- a/modules/home-manager/desktop/sway/default.nix
+++ b/modules/home-manager/desktop/sway/default.nix
@@ -21,8 +21,8 @@ in
       };
       desktop = mkOption {
         type = types.str;
-        default = "#000000 solid_color";
-        description = "options for desktop wallpaper";
+        default = "";
+        description = "path for desktop wallpaper";
       };
     };