diff --git a/flake.nix b/flake.nix
index 5d6ddd01..a9118dad 100644
--- a/flake.nix
+++ b/flake.nix
@@ -58,7 +58,7 @@
       frankfurt-linode-01 = libx.mkHost { hostname = "frankfurt-linode-01"; type = "small";};
       framework-server    = libx.mkHost { hostname = "framework-server"; };
       nuc-server          = libx.mkHost { hostname = "nuc-server"; };
-      nixos-desktop       = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "green"; };
+      nixos-desktop       = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "plasma6"; };
       nixos-framework     = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; };
       backups-rpi4        = libx.mkHost { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       piaware-rpi4        = libx.mkHost { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
@@ -72,7 +72,7 @@
       "albert@frankfurt-linode-01" = libx.mkHome { hostname = "frankfurt-linode-01";  type = "small"; };
       "albert@framework-server"    = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"          = libx.mkHome { hostname = "nuc-server";  };
-      "albert@nixos-desktop"       = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "green"; };
+      "albert@nixos-desktop"       = libx.mkHome { hostname = "nixos-desktop";   desktop = "plasma6"; };
       "albert@nixos-framework"     = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; };
       "albert@backups-rpi4"        = libx.mkHome { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"        = libx.mkHome { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 5a2d0957..46380ed9 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -132,7 +132,52 @@
       # Parser generator tool
       treesitter.enable = true;
       # Status column with click hanlers 
-      statuscol.enable = true;
+      statuscol = {
+        enable = true;
+        settings = {
+          bt_ignore = null;
+          clickhandlers = {
+            FoldClose = "require('statuscol.builtin').foldclose_click";
+            FoldOpen = "require('statuscol.builtin').foldopen_click";
+            FoldOther = "require('statuscol.builtin').foldother_click";
+            Lnum = "require('statuscol.builtin').lnum_click";
+          };
+          clickmod = "c";
+          ft_ignore = null;
+          relculright = true;
+          segments = [
+            {
+              click = "v:lua.ScFa";
+              text = [
+                "%C"
+              ];
+            }
+            {
+              click = "v:lua.ScSa";
+              text = [
+                "%s"
+              ];
+            }
+            {
+              click = "v:lua.ScLa";
+              condition = [
+                true
+                {
+                  __raw = "require('statuscol.builtin').not_empty";
+                }
+              ];
+              text = [
+                {
+                  __raw = "require('statuscol.builtin').lnumfunc";
+                }
+                " "
+              ];
+            }
+          ];
+          setopt = true;
+          thousands = ".";
+        };
+      };
       
       # List of linters for nixvim
       lint = {
diff --git a/nixos/hosts/nixos-desktop/default.nix b/nixos/hosts/nixos-desktop/default.nix
index 2fb6a554..c7bee3bc 100644
--- a/nixos/hosts/nixos-desktop/default.nix
+++ b/nixos/hosts/nixos-desktop/default.nix
@@ -56,7 +56,7 @@
       open = false;
       nvidiaSettings = true;
       modesetting.enable = true;
-      package = config.boot.kernelPackages.nvidiaPackages.production;  # (installs 535)
+      package = config.boot.kernelPackages.nvidiaPackages.production;  # (installs 550)
     };
   };