diff --git a/flake.nix b/flake.nix
index 0ebb5b9..375cc82 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,7 @@
 
 	      ./configuration.nix 
 	      ./plasma.nix
+          ./software/default-graphical.nix
           ./network-shares.nix
 
           ./backup-target.nix
@@ -49,6 +50,7 @@
           ./configuration.nix
 
           ./plasma.nix
+          ./software/default-graphical.nix
           ./users/shatteredmint.nix
           ./network-shares.nix
         ];
diff --git a/software/default-graphical.nix b/software/default-graphical.nix
new file mode 100644
index 0000000..9fb6bff
--- /dev/null
+++ b/software/default-graphical.nix
@@ -0,0 +1,21 @@
+
+{ config, lib, pkgs, home-manager, ... }:
+{
+  imports = [home-manager.nixosModules.home-manager];
+  home-manager.users.shatteredmint = {
+    home.packages = with pkgs; [
+      thunderbird
+      firefox
+      lazygit
+      veracrypt
+      keepassxc
+      kdePackages.yakuake
+      cargo
+      zig
+      clang
+      nil
+      wl-clipboard
+      makemkv
+    ];
+  };
+}
diff --git a/users/shatteredmint.nix b/users/shatteredmint.nix
index 38f529e..3a5b924 100644
--- a/users/shatteredmint.nix
+++ b/users/shatteredmint.nix
@@ -63,20 +63,6 @@
       ];
     };
 
-    home.packages = with pkgs; [
-      thunderbird
-      firefox
-      lazygit
-      veracrypt
-      keepassxc
-      kdePackages.yakuake
-      cargo
-      zig
-      clang
-      nil
-      wl-clipboard
-      makemkv
-    ];
 
     home.sessionPath = [
       "$HOME/scripts"