diff --git a/hosts/kim/default.nix b/hosts/kim/default.nix
index d0871ee..2197139 100644
--- a/hosts/kim/default.nix
+++ b/hosts/kim/default.nix
@@ -60,6 +60,7 @@ inputs.nixpkgs.lib.nixosSystem {
       discord.enable = true;
       element.enable = true;
       firefox.enable = true;
+      kcalc.enable = true;
       kitty.enable = true;
       # netbird.enable = true; See netbird.nix (I can't access the sops stuff from here?)
       openrgb.enable = true;
@@ -80,25 +81,6 @@ inputs.nixpkgs.lib.nixosSystem {
       tailscale.enable = true;
 
       # TODO: Move this out
-      home-manager.users.annika = {
-        programs = {
-          direnv = {
-            enable = true;
-            enableBashIntegration = true;
-            nix-direnv.enable = true;
-          };
-          bash = {
-            enable = true;
-            shellAliases = {
-              s = "kitten ssh";
-              la = "ls -a";
-              ll = "ls -l";
-              lal = "ls -la";
-              cls = "clear && ls";
-            };
-          };
-        };
-      };
 
       nix.gc = {
         automatic = true;
diff --git a/modules/common/applications/default.nix b/modules/common/applications/default.nix
index d5b0b06..0b5efb6 100644
--- a/modules/common/applications/default.nix
+++ b/modules/common/applications/default.nix
@@ -4,6 +4,7 @@
     ./discord.nix
     ./element.nix
     ./firefox.nix
+    ./kcalc.nix
     ./kitty.nix
     ./netbird.nix
     ./openrgb.nix
diff --git a/modules/common/applications/kcalc.nix b/modules/common/applications/kcalc.nix
new file mode 100644
index 0000000..7fd7a2c
--- /dev/null
+++ b/modules/common/applications/kcalc.nix
@@ -0,0 +1,16 @@
+{ config, pkgs, lib, ... }:
+{
+  options = {
+    kcalc = {
+      enable = lib.mkEnableOption {
+        description = "Enable KCalc";
+        default = false;
+      };
+    };
+  };
+  config = lib.mkIf (config.gui.enable && config.kcalc.enable) {
+    environment.systemPackages = [
+      pkgs.kdePackages.kcalc
+    ];
+  };
+}
\ No newline at end of file
diff --git a/modules/nixos/users/annika.nix b/modules/nixos/users/annika.nix
index 0aa9d97..43dc566 100644
--- a/modules/nixos/users/annika.nix
+++ b/modules/nixos/users/annika.nix
@@ -10,4 +10,23 @@
     openssh.authorizedKeys.keys = [ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG9NhsAOBwWBdBeenfaPoRtqQrAIgg7E5m4sKYQU9cFx annika@kim" ];
     hashedPasswordFile = config.sops.secrets.annika_password.path;
   };
+  home-manager.users.annika = {
+    programs = {
+      direnv = {
+        enable = true;
+        enableBashIntegration = true;
+        nix-direnv.enable = true;
+      };
+      bash = {
+        enable = true;
+        shellAliases = {
+          s = "kitten ssh";
+          la = "ls -a";
+          ll = "ls -l";
+          lal = "ls -la";
+          cls = "clear && ls";
+        };
+      };
+    };
+  };
 }