diff --git a/nixos/modules/apps/default.nix b/nixos/modules/apps/default.nix
index 5bc6029..964709b 100644
--- a/nixos/modules/apps/default.nix
+++ b/nixos/modules/apps/default.nix
@@ -6,4 +6,22 @@
         ./thunderbird
         # ./virtualbox
     ];
+
+    home-manager.users.tdpeuter = { pkgs, ... }: {
+      home.packages = with pkgs; [
+        brave
+        caprine-bin
+        discord
+        jellyfin-media-player
+        libreoffice-fresh-unwrapped
+        mattermost-desktop
+        nextcloud-client
+        obsidian
+        pinentry_qt
+        qalculate-gtk
+        spotify
+        zathura
+        zoom-us
+      ];
+    };
 }
diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
index 4c67e7b..3b4c745 100644
--- a/nixos/modules/default.nix
+++ b/nixos/modules/default.nix
@@ -35,26 +35,7 @@
       stateVersion = "22.11";
 
       packages = with pkgs; [
-        brave
-        caprine-bin
-        direnv
-        discord
-        duf
-        git-crypt
         gnupg
-        jellyfin-media-player
-        libreoffice-fresh-unwrapped
-        lynx
-        mattermost-desktop
-        nextcloud-client
-        obsidian
-        pinentry_qt
-        qalculate-gtk
-        spotify
-        w3m
-        zathura
-        zenith
-        zoom-us
         
         # Fonts
         corefonts      # Calibri for Uni
@@ -63,28 +44,7 @@
 
     programs = {
       home-manager.enable = true;
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-
-      git = {
-        enable = true;
-        userName = "tdpeuter";
-        userEmail = "tibo.depeuter@gmail.com";
-        extraConfig = {
-          core.editor = "vim";
-        };
-        includes = [
-          {
-            path = "~/.gitconfig-ugent";
-            condition = "gitdir:~/Nextcloud/Documenten/UGent";
-          }
-        ];
-      };
-
       gpg.enable = true;
-
     };
 
     services = {
diff --git a/nixos/modules/utils/default.nix b/nixos/modules/utils/default.nix
index 5a3ee62..6c9ab51 100644
--- a/nixos/modules/utils/default.nix
+++ b/nixos/modules/utils/default.nix
@@ -4,4 +4,37 @@
         ./vim
         ./zellij
     ];
+
+    home-manager.users.tdpeuter = { pkgs, ... }: {
+      home.packages = with pkgs; [
+        direnv
+        duf
+        git-crypt
+        lynx
+        w3m
+        zenith
+      ];
+
+      programs = {
+        direnv = {
+          enable = true;
+          nix-direnv.enable = true;
+        };
+
+        git = {
+          enable = true;
+          userName = "tdpeuter";
+          userEmail = "tibo.depeuter@gmail.com";
+          extraConfig = {
+            core.editor = "vim";
+          };
+          includes = [
+            {
+              path = "~/.gitconfig-ugent";
+              condition = "gitdir:~/Nextcloud/Documenten/UGent";
+            }
+          ];
+        };
+      };
+    };
 }