From 12d58b96365ff75cf28b766972da8edec5745cee Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Thu, 10 Oct 2024 23:47:00 +0200
Subject: [PATCH] improvement: disable nvim in favor of helix for now

---
 flake.lock                                      | 17 -----------------
 modules/home/apps/cli-apps/fish/default.nix     |  2 +-
 modules/nixos/apps/cli-apps/helix/default.nix   | 11 +++++++++++
 modules/nixos/apps/cli-apps/nixvim/default.nix  |  2 +-
 modules/nixos/submodules/basics-wsl/default.nix |  2 ++
 modules/nixos/submodules/basics/default.nix     |  2 ++
 6 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/flake.lock b/flake.lock
index dc4372c..43db459 100644
--- a/flake.lock
+++ b/flake.lock
@@ -622,22 +622,6 @@
         "type": "github"
       }
     },
-    "kitty-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1724021581,
-        "narHash": "sha256-f+ghj8qiljbHyIPZb6b2IAxxQU9GvbYpTdEEjSN9g8E=",
-        "owner": "drduh",
-        "repo": "config",
-        "rev": "eedb4ecf4bb2b5fd71bb27768f76da0f2e2605c8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "drduh",
-        "repo": "config",
-        "type": "github"
-      }
-    },
     "nix-ld": {
       "inputs": {
         "nixpkgs": [
@@ -813,7 +797,6 @@
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
         "kickstartnvim": "kickstartnvim",
-        "kitty-theme": "kitty-theme",
         "nix-ld": "nix-ld",
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
diff --git a/modules/home/apps/cli-apps/fish/default.nix b/modules/home/apps/cli-apps/fish/default.nix
index c05e3f9..58d6570 100644
--- a/modules/home/apps/cli-apps/fish/default.nix
+++ b/modules/home/apps/cli-apps/fish/default.nix
@@ -35,7 +35,7 @@ in
           set -x GROFF_NO_SGR 1
         '';
         shellAliases = {
-          vim = "nvim";
+          vim = "hx";
           ls = "colorls --gs";
           l = "ls -l";
           la = "ls -la";
diff --git a/modules/nixos/apps/cli-apps/helix/default.nix b/modules/nixos/apps/cli-apps/helix/default.nix
index 6f31c40..276b889 100644
--- a/modules/nixos/apps/cli-apps/helix/default.nix
+++ b/modules/nixos/apps/cli-apps/helix/default.nix
@@ -132,6 +132,17 @@ in
                 marksman = {
                   command = "${pkgs.marksman}/bin/marksman";
                 };
+                vscode-json-language-server = {
+                  command = "${pkgs.vscode-langservers-extracted}/bin/vscode-json-language-server";
+                  args = [ "--stdio" ];
+                  config.provideFormatter = true;
+                  config.json.validate.enable = true;
+                };
+                vscode-css-language-server = {
+                  command = "${pkgs.vscode-langservers-extracted}/bin/vscode-css-language-server";
+                  args = [ "--stdio" ];
+                  config.provideFormatter = true;
+                };
               };
             };
           };
diff --git a/modules/nixos/apps/cli-apps/nixvim/default.nix b/modules/nixos/apps/cli-apps/nixvim/default.nix
index 3f5a976..e0addf3 100644
--- a/modules/nixos/apps/cli-apps/nixvim/default.nix
+++ b/modules/nixos/apps/cli-apps/nixvim/default.nix
@@ -11,7 +11,7 @@ let
 in
 {
   options.wyrdgard.apps.cli-apps.nixvim = {
-    enable = mkBoolOpt true "Whether to enable nixvim or not (Default true)";
+    enable = mkBoolOpt false "Whether to enable nixvim or not (Default true)";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/nixos/submodules/basics-wsl/default.nix b/modules/nixos/submodules/basics-wsl/default.nix
index b6368ad..1d9bc68 100644
--- a/modules/nixos/submodules/basics-wsl/default.nix
+++ b/modules/nixos/submodules/basics-wsl/default.nix
@@ -31,6 +31,8 @@ in
     wyrdgard = {
       nix = enabled;
 
+      apps.cli-apps.helix = enabled;
+
       tools = {
         git = enabled;
       };
diff --git a/modules/nixos/submodules/basics/default.nix b/modules/nixos/submodules/basics/default.nix
index 486e6be..58928c5 100644
--- a/modules/nixos/submodules/basics/default.nix
+++ b/modules/nixos/submodules/basics/default.nix
@@ -34,6 +34,8 @@ in
     wyrdgard = {
       nix = enabled;
 
+      apps.cli-apps.helix = enabled;
+
       tools = {
         git = enabled;
       };