diff --git a/homeManagerModules/default.nix b/homeManagerModules/default.nix
index 75c1851..dba5fa8 100644
--- a/homeManagerModules/default.nix
+++ b/homeManagerModules/default.nix
@@ -3,5 +3,14 @@
   imports = [
     ./desktop
     ./programs
+    ./packages
   ];
+  config = {
+    home.username = "krop";
+    home.homeDirectory = "/home/krop";
+    home.stateVersion = "24.05";
+
+    # Let Home Manager install and manage itself.
+    programs.home-manager.enable = true;
+  };
 }
diff --git a/homeManagerModules/desktop/gnome.nix b/homeManagerModules/desktop/gnome.nix
index 4f589ea..7064b36 100644
--- a/homeManagerModules/desktop/gnome.nix
+++ b/homeManagerModules/desktop/gnome.nix
@@ -17,6 +17,14 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
+    home.pointerCursor = {
+      name = "Adwaita";
+      package = pkgs.adwaita-icon-theme;
+      gtk.enable = true;
+      x11.enable = true;
+      size = 24;
+    };
+
     home.packages = with pkgs; [
       gnomeExtensions.grand-theft-focus
       gnomeExtensions.vitals
diff --git a/homeManagerModules/packages/default.nix b/homeManagerModules/packages/default.nix
new file mode 100644
index 0000000..e2fff11
--- /dev/null
+++ b/homeManagerModules/packages/default.nix
@@ -0,0 +1,8 @@
+{ ... }:
+{
+  imports = [
+    ./octave.nix
+    ./development.nix
+    ./misc.nix
+  ];
+}
diff --git a/homeManagerModules/packages/development.nix b/homeManagerModules/packages/development.nix
new file mode 100644
index 0000000..c22c2d9
--- /dev/null
+++ b/homeManagerModules/packages/development.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.krop.hm.packages.development;
+in
+{
+  options.krop.hm.packages.development = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      example = false;
+      description = "Enable my development configuration";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      gh
+      d2
+      iperf
+    ];
+    programs.go = {
+      enable = true;
+      goPath = "Repositories/go";
+    };
+  };
+}
diff --git a/homeManagerModules/packages/misc.nix b/homeManagerModules/packages/misc.nix
new file mode 100644
index 0000000..cb3f1d3
--- /dev/null
+++ b/homeManagerModules/packages/misc.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.krop.hm.packages.misc;
+in
+{
+  options.krop.hm.packages.misc = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      example = false;
+      description = "Enable my misc applications";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      spotify
+      moonlight-qt
+      jetbrains-mono
+      mattermost-desktop
+      gparted
+      prismlauncher # REMOVE AND MOVE TO games module after refactoring
+      joplin-desktop
+      wireshark
+    ];
+  };
+}
diff --git a/homeManagerModules/packages/octave.nix b/homeManagerModules/packages/octave.nix
new file mode 100644
index 0000000..cc8f0e8
--- /dev/null
+++ b/homeManagerModules/packages/octave.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.krop.hm.packages.octave;
+in
+{
+  options.krop.hm.packages.octave = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+      example = false;
+      description = "Enable my octave configuration";
+    };
+  };
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      ghostscript
+      (octaveFull.withPackages (
+        ps: with ps; [
+          octavePackages.signal
+        ]
+      ))
+    ];
+  };
+}
diff --git a/homeManagerModules/programs/alacritty.nix b/homeManagerModules/programs/alacritty.nix
index 3e4df50..a0b371a 100644
--- a/homeManagerModules/programs/alacritty.nix
+++ b/homeManagerModules/programs/alacritty.nix
@@ -17,6 +17,7 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [ alacritty-theme ];
     programs.alacritty = {
       enable = true;
       settings = {
diff --git a/homeManagerModules/programs/codium.nix b/homeManagerModules/programs/codium.nix
index b8cbcef..156116e 100644
--- a/homeManagerModules/programs/codium.nix
+++ b/homeManagerModules/programs/codium.nix
@@ -17,6 +17,10 @@ in
     };
   };
   config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      gopls
+      nixd
+    ];
     programs.vscode = {
       enable = true;
       package = pkgs.vscodium;
diff --git a/users/krop/default.nix b/users/krop/default.nix
deleted file mode 100644
index ee34647..0000000
--- a/users/krop/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "krop";
-  home.homeDirectory = "/home/krop";
-  home.stateVersion = "24.05";
-
-  home.packages = with pkgs; [
-    spotify
-    moonlight-qt
-    alacritty
-    alacritty-theme
-    nixd
-    nil
-    jetbrains-mono
-    mattermost-desktop
-    gh
-    gparted
-    prismlauncher # REMOVE AND MOVE TO games module after refactoring
-    joplin-desktop
-    albert
-    ghostscript
-    (octaveFull.withPackages (
-      ps: with ps; [
-        octavePackages.signal
-      ]
-    ))
-    wireshark
-    iperf
-    d2
-    gopls
-  ];
-
-  home.pointerCursor = {
-    name = "Adwaita";
-    package = pkgs.adwaita-icon-theme;
-    gtk.enable = true;
-    x11.enable = true;
-    size = 24;
-  };
-
-  programs.go = {
-    enable = true;
-    goPath = "Repositories/go";
-  };
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
-}
diff --git a/users/krop/nyan_cat.jpg b/users/krop/nyan_cat.jpg
deleted file mode 100644
index 9f1e8d0..0000000
Binary files a/users/krop/nyan_cat.jpg and /dev/null differ