diff --git a/flake.nix b/flake.nix
index 3b465f1..795309b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -33,7 +33,6 @@
             ./sys/laptop
             ./modules/dnscrypt
             hosts.nixosModule
-            # ./modules/gaming
           ];
         };
       };
@@ -41,12 +40,23 @@
         ivand = home-manager.lib.homeManagerConfiguration {
           modules = [
             ./home/ivand
+            ./modules/programs
+            ./modules/packages
           ];
           pkgs = import nixpkgs {
             inherit system;
             overlays = [ my-overlay ];
           };
         };
+        vid = home-manager.lib.homeManagerConfiguration {
+          modules = [
+            ./home/vid
+            ./modules/programs
+          ];
+          pkgs = import nixpkgs {
+            inherit system;
+          };
+        };
       };
     };
 }
diff --git a/home/ivand/default.nix b/home/ivand/default.nix
index 2ea4aeb..ed5d0cc 100644
--- a/home/ivand/default.nix
+++ b/home/ivand/default.nix
@@ -1,7 +1,5 @@
 { pkgs, lib, ... }: {
 
-  imports = [ ./programs ./packages ];
-
   programs.home-manager = { enable = true; };
 
   home = {
@@ -40,6 +38,11 @@
     };
   };
 
+  programs = {
+    nv.enable = true;
+    shell.enable = true;
+  };
+
   xdg.configFile = {
     "user-dirs.dirs" = {
       text = ''
diff --git a/home/ivand/programs/zsh.nix b/home/ivand/programs/zsh.nix
deleted file mode 100644
index 0db3bee..0000000
--- a/home/ivand/programs/zsh.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ pkgs, lib, ... }: {
-  programs.zsh = {
-    enable = true;
-    syntaxHighlighting.enable = true;
-    enableAutosuggestions = true;
-    loginExtra = ''
-      [ "$(tty)" = "/dev/tty1" ] && exec sway --unsupported-gpu
-    '';
-    sessionVariables = {
-      PASSWORD_STORE_DIR = "$HOME/.password-store";
-    };
-    shellAliases = {
-      cal = "cal $(date +%Y)";
-      ssh = "TERM=xterm-256color ssh";
-      GG = "git add . && git commit -m 'GG' && git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
-      gad = "git add . && git diff --cached";
-      gac = "ga && gc";
-      gach = "gac -C HEAD";
-      ga = "git add .";
-      gc = "git commit";
-      dev = "nix develop --command $SHELL";
-      la = "ls -alh";
-      torrent = "transmission-remote";
-    };
-    history = {
-      expireDuplicatesFirst = true;
-    };
-    plugins = [
-      {
-        name = "zsh-powerlevel10k";
-        src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
-        file = "powerlevel10k.zsh-theme";
-      }
-      {
-        name = "zsh-nix-shell";
-        file = "nix-shell.plugin.zsh";
-        src = "${pkgs.zsh-nix-shell}/share/zsh-nix-shell";
-      }
-    ];
-    initExtra = ''
-      source "$HOME/.p10k.zsh"
-    '';
-  };
-}
diff --git a/home/vid/default.nix b/home/vid/default.nix
new file mode 100644
index 0000000..53a4c2f
--- /dev/null
+++ b/home/vid/default.nix
@@ -0,0 +1,15 @@
+{ pkgs, lib, ... }: {
+  home = {
+    username = "vid";
+    homeDirectory = "/home/vid";
+    stateVersion = "23.11";
+    sessionPath = [
+      "$HOME/.local/bin"
+    ];
+  };
+  programs = {
+    nv.enable = true;
+    shell.enable = true;
+  };
+}
+
diff --git a/home/ivand/packages/default.nix b/modules/packages/default.nix
similarity index 100%
rename from home/ivand/packages/default.nix
rename to modules/packages/default.nix
diff --git a/home/ivand/programs/default.nix b/modules/programs/default.nix
similarity index 97%
rename from home/ivand/programs/default.nix
rename to modules/programs/default.nix
index 6eb1f71..b73500f 100644
--- a/home/ivand/programs/default.nix
+++ b/modules/programs/default.nix
@@ -2,7 +2,6 @@
   imports = [ ./neovim ./neomutt ./sway ./tmux.nix ./zsh.nix ./lf ];
 
   programs = {
-    nv.enable = true;
     thunderbird = {
       enable = true;
       profiles = { ivan = { isDefault = true; }; };
diff --git a/home/ivand/programs/lf/default.nix b/modules/programs/lf/default.nix
similarity index 100%
rename from home/ivand/programs/lf/default.nix
rename to modules/programs/lf/default.nix
diff --git a/home/ivand/programs/lf/lfrc b/modules/programs/lf/lfrc
similarity index 100%
rename from home/ivand/programs/lf/lfrc
rename to modules/programs/lf/lfrc
diff --git a/home/ivand/programs/neomutt/default.nix b/modules/programs/neomutt/default.nix
similarity index 100%
rename from home/ivand/programs/neomutt/default.nix
rename to modules/programs/neomutt/default.nix
diff --git a/home/ivand/programs/neovim/bash.nix b/modules/programs/neovim/bash.nix
similarity index 100%
rename from home/ivand/programs/neovim/bash.nix
rename to modules/programs/neovim/bash.nix
diff --git a/home/ivand/programs/neovim/default.nix b/modules/programs/neovim/default.nix
similarity index 100%
rename from home/ivand/programs/neovim/default.nix
rename to modules/programs/neovim/default.nix
diff --git a/home/ivand/programs/neovim/firenvim.nix b/modules/programs/neovim/firenvim.nix
similarity index 100%
rename from home/ivand/programs/neovim/firenvim.nix
rename to modules/programs/neovim/firenvim.nix
diff --git a/home/ivand/programs/neovim/hs.nix b/modules/programs/neovim/hs.nix
similarity index 100%
rename from home/ivand/programs/neovim/hs.nix
rename to modules/programs/neovim/hs.nix
diff --git a/home/ivand/programs/neovim/js.nix b/modules/programs/neovim/js.nix
similarity index 100%
rename from home/ivand/programs/neovim/js.nix
rename to modules/programs/neovim/js.nix
diff --git a/home/ivand/programs/neovim/lua.nix b/modules/programs/neovim/lua.nix
similarity index 100%
rename from home/ivand/programs/neovim/lua.nix
rename to modules/programs/neovim/lua.nix
diff --git a/home/ivand/programs/neovim/nix.nix b/modules/programs/neovim/nix.nix
similarity index 100%
rename from home/ivand/programs/neovim/nix.nix
rename to modules/programs/neovim/nix.nix
diff --git a/home/ivand/programs/neovim/nvim/default.lua b/modules/programs/neovim/nvim/default.lua
similarity index 100%
rename from home/ivand/programs/neovim/nvim/default.lua
rename to modules/programs/neovim/nvim/default.lua
diff --git a/home/ivand/programs/neovim/nvim/util.lua b/modules/programs/neovim/nvim/util.lua
similarity index 100%
rename from home/ivand/programs/neovim/nvim/util.lua
rename to modules/programs/neovim/nvim/util.lua
diff --git a/home/ivand/programs/neovim/py.nix b/modules/programs/neovim/py.nix
similarity index 100%
rename from home/ivand/programs/neovim/py.nix
rename to modules/programs/neovim/py.nix
diff --git a/home/ivand/programs/neovim/util.nix b/modules/programs/neovim/util.nix
similarity index 100%
rename from home/ivand/programs/neovim/util.nix
rename to modules/programs/neovim/util.nix
diff --git a/home/ivand/programs/sway/config b/modules/programs/sway/config
similarity index 100%
rename from home/ivand/programs/sway/config
rename to modules/programs/sway/config
diff --git a/home/ivand/programs/sway/default.nix b/modules/programs/sway/default.nix
similarity index 100%
rename from home/ivand/programs/sway/default.nix
rename to modules/programs/sway/default.nix
diff --git a/home/ivand/programs/tmux.nix b/modules/programs/tmux.nix
similarity index 100%
rename from home/ivand/programs/tmux.nix
rename to modules/programs/tmux.nix
diff --git a/modules/programs/zsh.nix b/modules/programs/zsh.nix
new file mode 100644
index 0000000..acd0dad
--- /dev/null
+++ b/modules/programs/zsh.nix
@@ -0,0 +1,54 @@
+{ pkgs, lib, config, ... }:
+let
+  cfg = config.programs.nv;
+in
+{
+
+  options.programs.shell = {
+    enable = lib.mkEnableOption "shell";
+  };
+  config = lib.mkIf cfg.enable {
+    programs.zsh = {
+      enable = true;
+      syntaxHighlighting.enable = true;
+      enableAutosuggestions = true;
+      loginExtra = ''
+        [ "$(tty)" = "/dev/tty1" ] && exec sway --unsupported-gpu
+      '';
+      sessionVariables = {
+        PASSWORD_STORE_DIR = "$HOME/.password-store";
+      };
+      shellAliases = {
+        cal = "cal $(date +%Y)";
+        ssh = "TERM=xterm-256color ssh";
+        GG = "git add . && git commit -m 'GG' && git push --set-upstream origin $(git rev-parse --abbrev-ref HEAD)";
+        gad = "git add . && git diff --cached";
+        gac = "ga && gc";
+        gach = "gac -C HEAD";
+        ga = "git add .";
+        gc = "git commit";
+        dev = "nix develop --command $SHELL";
+        la = "ls -alh";
+        torrent = "transmission-remote";
+      };
+      history = {
+        expireDuplicatesFirst = true;
+      };
+      plugins = [
+        {
+          name = "zsh-powerlevel10k";
+          src = "${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k";
+          file = "powerlevel10k.zsh-theme";
+        }
+        {
+          name = "zsh-nix-shell";
+          file = "nix-shell.plugin.zsh";
+          src = "${pkgs.zsh-nix-shell}/share/zsh-nix-shell";
+        }
+      ];
+      initExtra = ''
+        source "$HOME/.p10k.zsh"
+      '';
+    };
+  };
+}