diff --git a/flake.nix b/flake.nix
index 634607b..28e1008 100644
--- a/flake.nix
+++ b/flake.nix
@@ -43,6 +43,12 @@
           inherit system;
           modules = [
             ./system/kaladin/configuration.nix
+            home-manager.nixosModules.home-manager
+          {
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+            home-manager.users.chris = import ./user/home.nix;
+          }
           ];
         };
       };
diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index f7413dc..ad9e014 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -89,7 +89,7 @@
   # Enable touchpad support (enabled default in most desktopManager).
   services.xserver.libinput.enable = true;
 
-  programs.fish.enable = true;
+  #programs.fish.enable = true;
   programs.zsh.enable = true;
   # Define a user account. Don't forget to set a password with ‘passwd’.
   users.users.chris = {
@@ -136,6 +136,19 @@
     ydotool
     bottles
     qutebrowser
+    exa mpv yt-dlp rofi-emoji
+    nerdfonts latte-dock bat
+    libsForQt5.bismuth bc libnotify
+    rofi-wayland ripgrep
+    sysstat procs papirus-icon-theme
+    phinger-cursors plasma-hud kde-cli-tools
+    macchina meson ninja cmake gnumake
+    extra-cmake-modules gcc gzip 
+    htop btop firefox kate kdialog openlp
+    easyeffects libreoffice-fresh vlc
+    neochat haskellPackages.greenclip
+    pulsemixer any-nix-shell wtype
+    spotdl kdenlive ffmpeg
   ];
 
   # EMACS
diff --git a/user/home.nix b/user/home.nix
index 8cf4fe6..986668e 100644
--- a/user/home.nix
+++ b/user/home.nix
@@ -14,7 +14,6 @@
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "20.09";
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
@@ -110,39 +109,39 @@
   };
 
   home.file.".config/rofi" = {
-    source = ./rofi;
+    source = ../rofi;
     recursive = true;
   };
 
   programs.rbw.enable = true;
   home.file.".config/rbw" = {
-    source = ./rbw;
+    source = ../rbw;
     recursive = true;
   };
 
   home.file.".config/fish" = {
-    source = ./fish;
+    source = ../fish;
     recursive = true;
   };
 
   programs.qutebrowser.enable = true;
   home.file.".config/qutebrowser" = {
-    source = ./qutebrowser;
+    source = ../qutebrowser;
     recursive = true;
   };
 
   home.file.".config/mpv" = {
-    source = ./mpv;
+    source = ../mpv;
     recursive = true;
   };
 
   home.file.".config/macchina" = {
-    source = ./macchina;
+    source = ../macchina;
     recursive = true;
   };
 
   home.file."scripts" = {
-    source = ./scripts;
+    source = ../scripts;
     recursive = true;
   };