diff --git a/flake.lock b/flake.lock
index 36b203f..d9dac24 100644
--- a/flake.lock
+++ b/flake.lock
@@ -70,15 +70,16 @@
     "base16-helix": {
       "flake": false,
       "locked": {
-        "lastModified": 1736852337,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
-        "owner": "tinted-theming",
+        "lastModified": 1748362709,
+        "narHash": "sha256-jscXRZsI5o4BsiZuHN7sK9Ks3NHsmdoiWE5hy8sS6E0=",
+        "owner": "MoritzBoehme",
         "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
+        "rev": "b2867cbb1d3ede1629955e57f63c8ad2314a91b7",
         "type": "github"
       },
       "original": {
-        "owner": "tinted-theming",
+        "owner": "MoritzBoehme",
+        "ref": "fix-primary-cursor-color",
         "repo": "base16-helix",
         "type": "github"
       }
@@ -984,6 +985,7 @@
       "inputs": {
         "arkenfox-userjs": "arkenfox-userjs",
         "asus-touchpad-numpad-driver": "asus-touchpad-numpad-driver",
+        "base16-helix": "base16-helix",
         "clan-core": "clan-core",
         "filetags": "filetags",
         "flake-compat": "flake-compat",
@@ -1068,7 +1070,9 @@
       "inputs": {
         "base16": "base16",
         "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
+        "base16-helix": [
+          "base16-helix"
+        ],
         "base16-vim": "base16-vim",
         "firefox-gnome-theme": "firefox-gnome-theme",
         "flake-compat": [
diff --git a/flake.nix b/flake.nix
index 0c4436f..94bd7e7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,6 +121,8 @@
     niri.url = "github:sodiboo/niri-flake";
     systems.url = "github:nix-systems/default";
     stylix.url = "github:nix-community/stylix";
+    base16-helix.url = "github:MoritzBoehme/base16-helix/fix-primary-cursor-color";
+    base16-helix.flake = false;
 
     # Programs
     timers.url = "git+https://gitea.moritzboeh.me/moritz/timers.git";
@@ -169,6 +171,7 @@
     nur.inputs.flake-parts.follows = "flake-parts";
     nur.inputs.nixpkgs.follows = "nixpkgs";
     nur.inputs.treefmt-nix.follows = "treefmt-nix";
+    stylix.inputs.base16-helix.follows = "base16-helix";
     stylix.inputs.flake-compat.follows = "flake-compat";
     stylix.inputs.flake-parts.follows = "flake-parts";
     stylix.inputs.git-hooks.follows = "git-hooks";
diff --git a/modules/moritz/profiles/desktop.nix b/modules/moritz/profiles/desktop.nix
index 43652b3..f03815f 100644
--- a/modules/moritz/profiles/desktop.nix
+++ b/modules/moritz/profiles/desktop.nix
@@ -22,7 +22,7 @@ in {
         niri.enable = mkDefault true;
         niri.package = mkDefault inputs.niri.packages.${pkgs.system}.niri-unstable;
         kitty.enable = mkDefault true;
-        nvim.enable = mkDefault true;
+        # nvim.enable = mkDefault true; # NOTE: trying out helix
         python.versions."311".enable = mkDefault true;
         spotify-player = {
           enable = mkDefault true;
@@ -83,7 +83,20 @@ in {
 
     programs.nix-ld.enable = true;
 
+    my.shell.variables.EDITOR = lib.mkForce "hx";
     home-manager.users.moritz = {
+      programs.helix = {
+        enable = true;
+        settings.editor = {
+          line-number = "relative";
+          cursor-shape = {
+            insert = "bar";
+            select = "underline";
+          };
+          lsp.display-messages = true;
+          end-of-line-diagnostics = "hint";
+        };
+      };
       programs.ghostty.settings.window-decoration = false;
       programs.rio.settings = {
         confirm-before-quit = false;