diff --git a/.envrc b/.envrc
deleted file mode 100644
index 211e56c..0000000
--- a/.envrc
+++ /dev/null
@@ -1,3 +0,0 @@
-SSH_AUTH_SOCK=/tmp/ssh-XXXXXXIm9FPa/agent.4751; export SSH_AUTH_SOCK;
-SSH_AGENT_PID=4752; export SSH_AGENT_PID;
-echo Agent pid 4752;
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..02e7cdd
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.lock
+.envrc
+
diff --git a/flake.nix b/flake.nix
index c05b877..1738210 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,6 +62,7 @@
           pkgs = pkgs;
           modules = [
             ./home-manager/autumn/home.nix
+            ./home-manager/autumn/sysconfs/wsl-hive.nix
           ];
         };
       };
diff --git a/home-manager/autumn/sysconfs/lesbos.nix b/home-manager/autumn/sysconfs/lesbos.nix
deleted file mode 100644
index 6b3f4bc..0000000
--- a/home-manager/autumn/sysconfs/lesbos.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{config, pkgs, ...}:
-{
-}
diff --git a/home-manager/autumn/sysconfs/yukigekko.nix b/home-manager/autumn/sysconfs/yukigekko.nix
deleted file mode 100644
index ffb1b61..0000000
--- a/home-manager/autumn/sysconfs/yukigekko.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{config, pkgs, ...}:
-{
-  imports = [
-    ../../packages/river/river.nix
-    ../../packages/waybar/waybar.nix
-  ];
-}
diff --git a/home-manager/packages/zsh/zsh.nix b/home-manager/packages/zsh/zsh.nix
deleted file mode 100644
index ad43516..0000000
--- a/home-manager/packages/zsh/zsh.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-
-  home.packages = with pkgs; [
-    oh-my-zsh
-  ];
-
-  programs.zsh = {
-    enable = true;
-    antidote = {
-      enable = true;
-      # plugins = [
-      #   "colored-man-pages"
-      #   "colorize"
-      #   "cp"
-      #   "history"
-      #   "ssh-agent"
-      #   "zoxide"
-      # ];
-      useFriendlyNames = true;
-    };
-    autosuggestion = {
-      enable = true;
-    };
-    shellAliases = {
-      ".." = "cd ..";
-      "..." = "cd ../..";
-      "...." = "cd ../../..";
-      "pls" = "pls -d typ -d perm -d user -d group -d size -d mtime -d git";
-      "z" = "zoxide";
-    };
-  };
-  
-}
-
diff --git a/home-manager/autumn/bundles/langs.nix b/home/autumn/bundles/langs.nix
similarity index 100%
rename from home-manager/autumn/bundles/langs.nix
rename to home/autumn/bundles/langs.nix
diff --git a/home-manager/autumn/home.nix b/home/autumn/home.nix
similarity index 68%
rename from home-manager/autumn/home.nix
rename to home/autumn/home.nix
index 2f2ab82..e67011e 100644
--- a/home-manager/autumn/home.nix
+++ b/home/autumn/home.nix
@@ -6,7 +6,6 @@
     homeDirectory = "/home/autumn";
     stateVersion = "25.11";
     packages = with pkgs; [
-      avizo
       eza
       fm
       felix
@@ -14,11 +13,6 @@
       htop
       nerd-fonts.hack
       neofetch
-      obsidian
-      swaybg
-      tiramisu
-      vscodium-fhs
-      vesktop
       uv
       wev
     ];
@@ -26,19 +20,14 @@
       EDITOR = "helix";
       TERM = "alacritty";
     };
-    file = {
-      "config.ini" = {
-        enable = true;
-        source = ../packages/avizo/config.ini;
-        target = ".config/avizo/config.ini";
-      };
-    };
   };
   programs = {
     home-manager.enable = true;
     htop.enable = true;
-    bash.initExtra= ''fish'';
-    pls = {enable = true;enableFishIntegration = true;};
+    pls = {
+      enable = true;
+      enableFishIntegration = true;
+    };
   };
   nixpkgs.config = {
     alowUnfree = true;
@@ -51,14 +40,10 @@
     ../packages/alacritty/alacritty.nix
     ../packages/crawl/crawl.nix
     ../packages/direnv/direnv.nix
-    ../packages/fish/fish.nix
-    ../packages/fuzzel/fuzzel.nix
     ../packages/git/git.nix
     ../packages/helix/helix.nix
     ../packages/starship/starship.nix
     ../packages/thunderbird/thunderbird.nix
-    ../packages/twmn/twmn.nix
-    ../packages/zellij/zellij.nix
     ../packages/zoxide/zoxide.nix
     # ../packages/zsh/zsh.nix
     # package bundles
diff --git a/home/autumn/sysconfs/lesbos.nix b/home/autumn/sysconfs/lesbos.nix
new file mode 100644
index 0000000..3cccf98
--- /dev/null
+++ b/home/autumn/sysconfs/lesbos.nix
@@ -0,0 +1,11 @@
+{config, pkgs, ...}:
+{
+  home.packags = with pkgs; [
+    obsidian
+    vscodium-fhs
+    vesktop
+  ];
+  imports = [
+    ../../packages/fish/fish.nix
+  ];
+}
diff --git a/home/autumn/sysconfs/wsl-hive.nix b/home/autumn/sysconfs/wsl-hive.nix
new file mode 100644
index 0000000..16f4646
--- /dev/null
+++ b/home/autumn/sysconfs/wsl-hive.nix
@@ -0,0 +1,9 @@
+{config, pkgs, ...}:
+
+{
+  programs.bash.initExtra= ''zsh'';
+  imports = [
+    ../../packages/zsh/zsh.nix
+    ../../packages/zellij/zellij.nix
+  ];
+}
diff --git a/home/autumn/sysconfs/yukigekko.nix b/home/autumn/sysconfs/yukigekko.nix
new file mode 100644
index 0000000..b45dd40
--- /dev/null
+++ b/home/autumn/sysconfs/yukigekko.nix
@@ -0,0 +1,23 @@
+{config, pkgs, ...}:
+{
+  home.packags = with pkgs; [
+    obsidian
+    vscodium-fhs
+    vesktop
+  ];
+  programs.bash.initExtra= ''fish'';
+  home.file = {
+    "config.ini" = {
+      enable = true;
+      source = ../packages/avizo/config.ini;
+      target = ".config/avizo/config.ini";
+    };
+  };
+  imports = [
+    ../../packages/fish/fish.nix
+    ../../packages/river/river.nix
+    ../../packages/waybar/waybar.nix
+    ../../packages/twmn/twmn.nix
+    ../../packages/fuzzel/fuzzel.nix
+  ];
+}
diff --git a/home-manager/autumn/yukigekko-home.nix b/home/autumn/yukigekko-home.nix
similarity index 100%
rename from home-manager/autumn/yukigekko-home.nix
rename to home/autumn/yukigekko-home.nix
diff --git a/home-manager/flake.lock b/home/flake.lock
similarity index 100%
rename from home-manager/flake.lock
rename to home/flake.lock
diff --git a/home-manager/packages/alacritty/alacritty.nix b/home/packages/alacritty/alacritty.nix
similarity index 100%
rename from home-manager/packages/alacritty/alacritty.nix
rename to home/packages/alacritty/alacritty.nix
diff --git a/home-manager/packages/autojump/autojump.nix b/home/packages/autojump/autojump.nix
similarity index 100%
rename from home-manager/packages/autojump/autojump.nix
rename to home/packages/autojump/autojump.nix
diff --git a/home-manager/packages/avizo/config.ini b/home/packages/avizo/config.ini
similarity index 100%
rename from home-manager/packages/avizo/config.ini
rename to home/packages/avizo/config.ini
diff --git a/home-manager/packages/crawl/crawl.nix b/home/packages/crawl/crawl.nix
similarity index 100%
rename from home-manager/packages/crawl/crawl.nix
rename to home/packages/crawl/crawl.nix
diff --git a/home-manager/packages/direnv/direnv.nix b/home/packages/direnv/direnv.nix
similarity index 100%
rename from home-manager/packages/direnv/direnv.nix
rename to home/packages/direnv/direnv.nix
diff --git a/home-manager/packages/fish/fish.nix b/home/packages/fish/fish.nix
similarity index 100%
rename from home-manager/packages/fish/fish.nix
rename to home/packages/fish/fish.nix
diff --git a/home-manager/packages/fuzzel/fuzzel.nix b/home/packages/fuzzel/fuzzel.nix
similarity index 100%
rename from home-manager/packages/fuzzel/fuzzel.nix
rename to home/packages/fuzzel/fuzzel.nix
diff --git a/home-manager/packages/git/git.nix b/home/packages/git/git.nix
similarity index 100%
rename from home-manager/packages/git/git.nix
rename to home/packages/git/git.nix
diff --git a/home-manager/packages/helix/dracula_trans.toml b/home/packages/helix/dracula_trans.toml
similarity index 100%
rename from home-manager/packages/helix/dracula_trans.toml
rename to home/packages/helix/dracula_trans.toml
diff --git a/home-manager/packages/helix/everforest_dark_trans.toml b/home/packages/helix/everforest_dark_trans.toml
similarity index 100%
rename from home-manager/packages/helix/everforest_dark_trans.toml
rename to home/packages/helix/everforest_dark_trans.toml
diff --git a/home-manager/packages/helix/helix.nix b/home/packages/helix/helix.nix
similarity index 100%
rename from home-manager/packages/helix/helix.nix
rename to home/packages/helix/helix.nix
diff --git a/home-manager/packages/river/river.nix b/home/packages/river/river.nix
similarity index 100%
rename from home-manager/packages/river/river.nix
rename to home/packages/river/river.nix
diff --git a/home-manager/packages/starship/starship.nix b/home/packages/starship/starship.nix
similarity index 100%
rename from home-manager/packages/starship/starship.nix
rename to home/packages/starship/starship.nix
diff --git a/home-manager/packages/starship/starship.toml b/home/packages/starship/starship.toml
similarity index 100%
rename from home-manager/packages/starship/starship.toml
rename to home/packages/starship/starship.toml
diff --git a/home-manager/packages/template.nix b/home/packages/template.nix
similarity index 100%
rename from home-manager/packages/template.nix
rename to home/packages/template.nix
diff --git a/home-manager/packages/thunderbird/thunderbird.nix b/home/packages/thunderbird/thunderbird.nix
similarity index 100%
rename from home-manager/packages/thunderbird/thunderbird.nix
rename to home/packages/thunderbird/thunderbird.nix
diff --git a/home-manager/packages/twmn/twmn.nix b/home/packages/twmn/twmn.nix
similarity index 100%
rename from home-manager/packages/twmn/twmn.nix
rename to home/packages/twmn/twmn.nix
diff --git a/home-manager/packages/uv/uv.nix b/home/packages/uv/uv.nix
similarity index 100%
rename from home-manager/packages/uv/uv.nix
rename to home/packages/uv/uv.nix
diff --git a/home-manager/packages/waybar/waybar.css b/home/packages/waybar/waybar.css
similarity index 100%
rename from home-manager/packages/waybar/waybar.css
rename to home/packages/waybar/waybar.css
diff --git a/home-manager/packages/waybar/waybar.nix b/home/packages/waybar/waybar.nix
similarity index 100%
rename from home-manager/packages/waybar/waybar.nix
rename to home/packages/waybar/waybar.nix
diff --git a/home-manager/packages/zellij/zellij.nix b/home/packages/zellij/zellij.nix
similarity index 93%
rename from home-manager/packages/zellij/zellij.nix
rename to home/packages/zellij/zellij.nix
index 81c40d0..4a529b0 100644
--- a/home-manager/packages/zellij/zellij.nix
+++ b/home/packages/zellij/zellij.nix
@@ -3,7 +3,7 @@
 {
   programs.zellij = {
     enable = true;
-    # enableFishIntegration = true;
+    enableZshIntegration = true;
     # exitShellOnExit = true;
     settings = {
       themes = {
diff --git a/home-manager/packages/zoxide/zoxide.nix b/home/packages/zoxide/zoxide.nix
similarity index 100%
rename from home-manager/packages/zoxide/zoxide.nix
rename to home/packages/zoxide/zoxide.nix
diff --git a/home/packages/zsh/zsh.nix b/home/packages/zsh/zsh.nix
new file mode 100644
index 0000000..bb07a51
--- /dev/null
+++ b/home/packages/zsh/zsh.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, ... }:
+
+{
+
+  home.packages = with pkgs; [
+    oh-my-zsh
+  ];
+
+  programs ={
+    zsh = {
+      enable = true;
+      antidote = {
+        enable = true;
+        plugins = [
+          "zsh-users/zsh-autosuggestions"
+          "zsh-users/zsh-syntax-highlighting"
+        #   "colored-man-pages"
+        #   "colorize"
+        #   "cp"
+        #   "history"
+        #   "ssh-agent"
+        #   "zoxide"
+        ];
+        useFriendlyNames = true;
+      };
+      autosuggestion = {
+        enable = true;
+      };
+      shellAliases = {
+        ".." = "cd ..";
+        "..." = "cd ../..";
+        "...." = "cd ../../..";
+        "pls" = "pls -d typ -d perm -d user -d group -d size -d mtime -d git";
+        "z" = "zoxide";
+      };
+      oh-my-zsh = {
+        enable = true;
+        plugins = [
+          "git"
+          "sudo"
+          "colored-man-pages"
+          "colorize"
+          "cp"
+          "zoxide"
+          "ssh-agent"
+          "command-not-found"
+        ];
+      };
+    };
+  };
+}
+
diff --git a/system/yukigekko/configuration.nix b/system/yukigekko/configuration.nix
index 404b41a..0686a42 100644
--- a/system/yukigekko/configuration.nix
+++ b/system/yukigekko/configuration.nix
@@ -96,20 +96,6 @@
   };
   
   nix.settings.experimental-features = ["nix-command" "flakes"];
-  # nix.settings.download-buffer-size = 5242880000;
-
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
-
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
 
   system.stateVersion = "25.05";