diff --git a/dotfiles b/dotfiles
index 0ef5669..9dc9eeb 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 0ef5669a6560b19dce05cfb1c10382aa59b313f0
+Subproject commit 9dc9eeb64946668460dcabb1916bdd5f655e2cbe
diff --git a/flake.lock b/flake.lock
index 0b4a156..39c5b06 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1714043624,
-        "narHash": "sha256-Xn2r0Jv95TswvPlvamCC46wwNo8ALjRCMBJbGykdhcM=",
+        "lastModified": 1715381426,
+        "narHash": "sha256-wPuqrAQGdv3ISs74nJfGb+Yprm23U/rFpcHFFNWgM94=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "86853e31dc1b62c6eeed11c667e8cdd0285d4411",
+        "rev": "ab5542e9dbd13d0100f8baae2bc2d68af901f4b4",
         "type": "github"
       },
       "original": {
@@ -23,11 +23,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1713864415,
-        "narHash": "sha256-/BPDMJEkrsFAFOsQWhwm31wezlgshPFlLBn34KEUdVA=",
+        "lastModified": 1716034089,
+        "narHash": "sha256-QBfab6V4TeQ6Y4NiXVrEATdQuhCNFNaXt/L1K/Zw+zc=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "797f8d8082c7cc3259cba7275c699d4991b09ecc",
+        "rev": "b55712de78725c8fcde422ee0a0fe682046e73c3",
         "type": "github"
       },
       "original": {
@@ -38,11 +38,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713995372,
-        "narHash": "sha256-fFE3M0vCoiSwCX02z8VF58jXFRj9enYUSTqjyHAjrds=",
+        "lastModified": 1715948915,
+        "narHash": "sha256-dxMrggEogQuJQr6f02VAFtsSNtjEPkgxczeiyW7WOQc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dd37924974b9202f8226ed5d74a252a9785aedf8",
+        "rev": "bacb8503d3a51d9e9b52e52a1ba45e2c380ad07d",
         "type": "github"
       },
       "original": {
diff --git a/hosts/home-workstations.nix b/hosts/home-workstations.nix
index 9fca5fa..62b1eb4 100644
--- a/hosts/home-workstations.nix
+++ b/hosts/home-workstations.nix
@@ -1,115 +1,125 @@
-{ pkgs, ...}:
+{ config, pkgs, ...}: 
+{ home.packages = with pkgs; [ 
+    calc 
+    clang-tools
+    conda 
+    dig 
+    ffmpeg 
+    firefox-wayland 
+    fuzzel 
+    fzf 
+    gcc 
+    gnome.nautilus 
+    gnumake 
+    gnupg 
+    gthumb 
+    htop 
+    kanshi 
+    kitty
+    libnotify # for mako
+    libreoffice
+    megatools
+    mpv
+    networkmanagerapplet
+    nodejs # copilot requirement
+    obsidian
+    openconnect
+    owncloud-client
+    pass
+    pavucontrol
+    pinentry-qt
+    polkit_gnome
+    pulseaudio
+    pynitrokey
+    rpi-imager
+    sshfs
+    swaybg
+    thunderbird
+    tmux
+    tree-sitter
+    unzip
+    waybar
+    wdisplays
+    wl-clipboard
+    xdg-utils
+    zathura
+    ];
 
-{
-    home.packages = with pkgs; [ 
-        calc
-        conda
-        dig
-        ffmpeg
-        firefox-wayland
-        fuzzel
-        fzf
-        gcc
-        gnome.nautilus
-        gnumake
-        gnupg
-        gthumb
-        htop
-        kanshi
-        kitty
-        libnotify # for mako
-        libreoffice
-        megatools
-        mpv
-        networkmanagerapplet
-        nodejs # copilot requirement
-        obsidian
-        openconnect
-        owncloud-client
-        pass
-        pavucontrol
-        pinentry-qt
-        polkit_gnome
-        pulseaudio
-        pynitrokey
-        rpi-imager
-        sshfs
-        swaybg
-        thunderbird
-        tmux
-        tree-sitter
-        unzip
-        waybar
-        wdisplays
-        wl-clipboard
-        xdg-utils
-        zathura
-        ];
-    home.file = {
-        ".config/" = {
-            source = ../dotfiles/.config;
-            recursive = true;
-        };
+
+home.file = {
+    ".config/nvim" = {
+       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.config/nvim";
     };
-    home.file = {
-        ".xkb/" = {
-            source = ../dotfiles/.xkb;
-            recursive = true;
-        };
+    ".config/kitty" = {
+       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.config/kitty";
     };
-    home.file = {
-        ".profile" = {
-            source = ../dotfiles/.profile;
-            recursive = true;
-        };
+    ".config/waybar" = {
+       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.config/waybar";
     };
-    home.file = {
-        ".tmux.conf" = {
-            source = ../dotfiles/.tmux.conf;
-            recursive = true;
-        };
+    ".config/git" = {
+       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.config/git";
     };
-    wayland.windowManager.sway = {
-        enable = true;
-        wrapperFeatures.gtk = true;
+    ".config/kanshi" = {
+       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.config/kanshi";
     };
-    programs = {
-        browserpass = {
-            enable = true;
-        };
-        direnv = {
-            enable = true;
-            nix-direnv.enable = true;
-        };
+    ".config/fish" = {
+       source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.config/fish";
     };
-    services.mako = {
+    ".xkb/" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.xkb";
+    };
+    ".profile" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.profile";
+    };
+    ".tmux.conf" = {
+        source = config.lib.file.mkOutOfStoreSymlink "${config.home.homeDirectory}/nixos-flake/dotfiles/.tmux.conf";
+    };
+    ".config/sway" = {
+        source = ../dotfiles/.config/sway;
+        recursive = true;
+    };
+};
+wayland.windowManager.sway = {
+    enable = true;
+    wrapperFeatures.gtk = true;
+};
+programs = {
+    browserpass = {
         enable = true;
     };
-    home.pointerCursor = {
-        name = "Adwaita";
-        package = pkgs.gnome.adwaita-icon-theme;
-        size = 24;
-        x11 = {
-            enable = true;
-            defaultCursor = "Adwaita";
-        };
-    };
-    gtk = {
+    direnv = {
         enable = true;
-        theme = {
-            package = pkgs.nordic;
-            name = "Nordic";
-        };
-    };
-    home.sessionVariables.GTK_THEME = "Nordic";
-    xdg = {
-        mime.enable = true;
-        mimeApps = {
-            enable = true;
-            defaultApplications = {
-                "text/plain" = "nvim.desktop";
-                "video/x-matroska" = "mpv.desktop";
-            };
+        nix-direnv.enable = true;
+    };
+};
+services.mako = {
+    enable = true;
+};
+home.pointerCursor = {
+    name = "Adwaita";
+    package = pkgs.gnome.adwaita-icon-theme;
+    size = 24;
+    x11 = {
+        enable = true;
+        defaultCursor = "Adwaita";
+    };
+};
+gtk = {
+    enable = true;
+    theme = {
+        package = pkgs.nordic;
+        name = "Nordic";
+    };
+};
+home.sessionVariables.GTK_THEME = "Nordic";
+xdg = {
+    mime.enable = true;
+    mimeApps = {
+        enable = true;
+        defaultApplications = {
+            "text/plain" = "nvim.desktop";
+            "video/x-matroska" = "mpv.desktop";
         };
     };
+};
 }