diff --git a/configurations/sway.nix b/configurations/sway.nix
index d9cd0fd2..7889e6a8 100644
--- a/configurations/sway.nix
+++ b/configurations/sway.nix
@@ -128,6 +128,8 @@ in
         workspace 3
         exec ${pkgs.kitty}/bin/kitty -e ${pkgs.tmuxinator}/bin/tmuxinator start mail
         workspace 4
+        exec ${pkgs.gomuks}/bin/gomuks
+        workspace 4
         exec ${pkgs.teams}/bin/teams
         workspace 2
 
diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix
index 135c81aa..0db24961 100644
--- a/machines/kharbranth/default.nix
+++ b/machines/kharbranth/default.nix
@@ -21,6 +21,7 @@
     docker.enable = true;
     eid.enable = true;
     git.email = "charlotte.vanpetegem@ugent.be";
+    gomuks.enable = true;
     nix.enableUnfree = true;
     zfs = {
       enable = true;
diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index a61379ff..c8971a5f 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -21,6 +21,7 @@
     docker.enable = true;
     eid.enable = true;
     git.email = "charlotte@vanpetegem.me";
+    gomuks.enable = true;
     nix.enableUnfree = true;
     zeroad.enable = true;
     zfs = {
diff --git a/modules/default.nix b/modules/default.nix
index b7c4210d..ce82c8a1 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -8,6 +8,7 @@
     ./eid.nix
     ./git.nix
     ./global-mailer.nix
+    ./gomuks.nix
     ./neovim.nix
     ./nix.nix
     ./nginx.nix
diff --git a/modules/gomuks.nix b/modules/gomuks.nix
new file mode 100644
index 00000000..7947f0b7
--- /dev/null
+++ b/modules/gomuks.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+let cfg = config.chvp;
+in
+{
+  options.chvp.gomuks.enable = lib.mkOption {
+    default = false;
+    example = true;
+  };
+
+  config = lib.mkIf config.chvp.gomuks.enable {
+    nixpkgs.overlays = [
+      (self: super: {
+        gomuks = pkgs.writeShellScriptBin "gomuks" ''
+          export GOMUKS_CACHE_HOME="${cfg.cachePrefix}${config.users.users.charlotte.home}/.cache/gomuks"
+          export GOMUKS_DATA_HOME="${cfg.cachePrefix}${config.users.users.charlotte.home}/.local/share/gomuks"
+          export GOMUKS_CONFIG_HOME="${cfg.cachePrefix}${config.users.users.charlotte.home}/.config/gomuks"
+          ${super.alacritty}/bin/alacritty -e ${super.gomuks}/bin/gomuks
+        '';
+      })
+    ];
+
+    home-manager.users.charlotte = { ... }: {
+      home.packages = [ pkgs.gomuks ];
+    };
+  };
+}