feat(nix)!: helix -> neovim

Signed-off-by: misilelab <[email protected]>

.gitleaksignore

@@ -1,2 +1,2 @@
 projects/dsb/nix-configs/home-manager/secrets.nix:pypi-upload-token:2
-projects/dsb/nix-configs/home-manager/apps/development.nix:generic-api-key:82
+projects/dsb/nix-configs/home-manager/apps/development.nix:generic-api-key:59

projects/dsb/nix-configs/home-manager/apps/development.nix

@@ -1,98 +1,75 @@
-{pkgs, stablep, config, lib, ...}:
-let
-  indentForceToTwo = lstr: lib.lists.forEach lstr (x: {
-    name = x;
-    indent = {
-      tab-width = 2;
-      unit = "  ";
+{pkgs, stablep, config, ...}:
+{
+  home = {
+    sessionVariables = {
+      LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib";
     };
-  });
-in
-  {
-    home = {
-      sessionVariables = {
-        LD_LIBRARY_PATH = "${pkgs.stdenv.cc.cc.lib}/lib";
-      };
-      packages = with pkgs; [
-        # Development
-        edgedb d2 pre-commit darcs just
-        snyk radicle-node infisical pnpm_9 poop binsider
+    packages = with pkgs; [
+      neovim
 
-        # Language tools
-        ghc cabal-install
-        rustup cargo-update
-        python313Full uv mypy ruff
-        nasm
-        (stablep.deno)
-        hvm bend
-        clang-tools lldb pkg-config
-        niv nixpkgs-fmt nix-tree hub fh
-        packwiz ccemux
-        (stablep.unityhub) dotnet-sdk_8
-        lua (writeShellScriptBin "luajit" "${luajit}/bin/lua")
-        vala
-      ]
-      ++ (with llvmPackages_latest; [libcxxClang openmp libunwind]) # llvm
-      ++ (with nodePackages_latest; [nodejs typescript]) # nodejs
-      ++ (with python313Packages; [pip virtualenv mitmproxy]); # python thing
-      file = {
-        ".config/process-compose/theme.yaml".source = config.lib.file.mkOutOfStoreSymlink "${builtins.fetchGit {
-          url="https://github.com/catppuccin/process-compose";
-          rev="b0c48aa07244a8ed6a7d339a9b9265a3b561464d";
-        }}/themes/catppuccin-mocha.yaml";
-      };
+      # Development
+      edgedb d2 pre-commit darcs just
+      snyk radicle-node infisical pnpm_9 poop binsider
+
+      # Language tools
+      ghc cabal-install
+      rustup cargo-update
+      python313Full uv mypy ruff
+      nasm
+      (stablep.deno)
+      hvm bend
+      clang-tools lldb pkg-config
+      niv nixpkgs-fmt nix-tree hub fh
+      packwiz ccemux
+      (stablep.unityhub) dotnet-sdk_8
+      lua (writeShellScriptBin "luajit" "${luajit}/bin/lua") luarocks
+      vala
+
+      # lsp
+      shellcheck basedpyright nil vala-language-server bash-language-server
+      tailwindcss-language-server astro-language-server ruff-lsp lua-language-server
+      marksman
+    ]
+    ++ (with llvmPackages_latest; [libcxxClang openmp libunwind]) # llvm
+    ++ (with nodePackages_latest; [nodejs typescript typescript-language-server svelte-language-server]) # nodejs
+    ++ (with python313Packages; [pip virtualenv mitmproxy]); # python thing
+    file = {
+      ".config/process-compose/theme.yaml".source = config.lib.file.mkOutOfStoreSymlink "${builtins.fetchGit {
+        url="https://github.com/catppuccin/process-compose";
+        rev="b0c48aa07244a8ed6a7d339a9b9265a3b561464d";
+      }}/themes/catppuccin-mocha.yaml";
     };
-    catppuccin = {
-      lazygit.enable = true;
-      helix.enable = true;
+  };
+  catppuccin = {
+    lazygit.enable = true;
+  };
+  programs = {
+    java = {
+      enable=true;
+      package=pkgs.temurin-bin-21;
     };
-    programs = {
-      helix = {
-        enable = true;
-        extraPackages = with pkgs; [
-          shellcheck basedpyright nil vala-language-server bash-language-server
-          tailwindcss-language-server astro-language-server ruff-lsp lua-language-server
-          marksman
-        ] ++ (with nodePackages_latest; [typescript-language-server svelte-language-server]);
-        languages = {
-          language = [{
-            name = "python";
-            language-servers = ["basedpyright" "ruff"];
-            indent = {
-              tab-width = 2;
-              unit = "  ";
-            };
-          }] ++ (indentForceToTwo [
-            "toml"
-          ]);
-        };
-      };
-      java = {
-        enable=true;
-        package=pkgs.temurin-bin-21;
-      };
-      go.enable = true;
-      lazygit = {
-        enable = true;
-        settings.git.commit.signOff = true;
-      };
-      git = {
-        enable = true;
-        lfs.enable = true;
-        signing = {key = "138AC61AE9D8D2D55EAE4995CD896843C0CB9E63";signByDefault=true;};
-        userName = "misilelab";
-        userEmail = "[email protected]";
-        extraConfig = {
-          pull.rebase = false;
-          safe.directory = "*";
-          init.defaultBranch = "main";
-          core.editor = "hx";
-          delta.enable = true;
-        };
-      };
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
+    go.enable = true;
+    lazygit = {
+      enable = true;
+      settings.git.commit.signOff = true;
+    };
+    git = {
+      enable = true;
+      lfs.enable = true;
+      signing = {key = "138AC61AE9D8D2D55EAE4995CD896843C0CB9E63";signByDefault=true;};
+      userName = "misilelab";
+      userEmail = "[email protected]";
+      extraConfig = {
+        pull.rebase = false;
+        safe.directory = "*";
+        init.defaultBranch = "main";
+        core.editor = "nvim";
+        delta.enable = true;
       };
     };
-  }
+    direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+    };
+  };
+}

projects/dsb/nix-configs/home-manager/home.nix

@@ -10,7 +10,7 @@
     stateVersion = "24.05";
     sessionVariables = {
       QT_QPA_PLATFORM = "wayland";
-      EDITOR = "hx";
+      EDITOR = "nvim";
       XDG_SCREENSHOTS_DIR = "/home/misile/screenshots";
     };
   };