fix: neovim

flake.lock

@@ -130,11 +130,11 @@
         "zig": "zig"
       },
       "locked": {
-        "lastModified": 1735597925,
+        "lastModified": 1735765328,
-        "narHash": "sha256-znyKiXlrkPL+2xQwAR6G4/DKCgsutyIPo+d1dGeh2W4=",
+        "narHash": "sha256-f4LI34cXP8nOTi4Va6GPUFaJYf0qGbabk+OeUddsfuk=",
         "owner": "ghostty-org",
         "repo": "ghostty",
-        "rev": "478fe3917c2882a1c321f9d1eec808b71698974d",
+        "rev": "94599102e9fb8247af08cbbbcb7ee25e3d31e1bd",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735381016,
+        "lastModified": 1735774425,
-        "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
+        "narHash": "sha256-C73gLFnEh8ZI0uDijUgCDWCd21T6I6tsaWgIBHcfAXg=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
+        "rev": "5f6aa268e419d053c3d5025da740e390b12ac936",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1735446832,
+        "lastModified": 1735782927,
-        "narHash": "sha256-hem1Sr6bPEV4DFazWwbWcDlnfeCOGTHF5bE1/00lcCQ=",
+        "narHash": "sha256-78/J6ACmSgHwKUzDPCT9XZdh7rS2gtesUphxXh4y8I0=",
         "owner": "horriblename",
         "repo": "hyprgrass",
-        "rev": "8a66a38e25e0b777ff217af7c9044e6eec4fac10",
+        "rev": "bdfa960b97ac98ad9d05c908ee20e053e2942928",
         "type": "github"
       },
       "original": {
@@ -279,11 +279,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1735585949,
+        "lastModified": 1735818837,
-        "narHash": "sha256-vCGG4tGMvzCzz+ZIsiNtpoFW9+f+itYLTAVW41qk/Hk=",
+        "narHash": "sha256-J/wC5GJG6VHQJTHtZlTu2jTwN2kXouWoLOSyWO+w9q0=",
         "ref": "refs/heads/main",
-        "rev": "1989b0049f7fb714a2417dfb14d6b4f3d2a079d3",
+        "rev": "42fd366046d67c52449001b6a6e9b64427aee712",
-        "revCount": 5607,
+        "revCount": 5615,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -336,11 +336,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728345020,
+        "lastModified": 1735734474,
-        "narHash": "sha256-xGbkc7U/Roe0/Cv3iKlzijIaFBNguasI31ynL2IlEoM=",
+        "narHash": "sha256-9OV4lOqrEJVLdOrpNN/9msNwAhI6FQTu4N7fufilG08=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "a7c183800e74f337753de186522b9017a07a8cee",
+        "rev": "271df559dd30e4bc5ec6af02d017ac0aaabd63a7",
         "type": "github"
       },
       "original": {
@@ -739,11 +739,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1735573972,
+        "lastModified": 1735742732,
-        "narHash": "sha256-XnjBHfLSoXfIKs/el6ok4ESzjxfVVAe326sfBuu0Dwg=",
+        "narHash": "sha256-966g6oVcBwsHUNWpk9jDfifqOWdV+iMHXTSZEQrhhRk=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "00e8adc3decc370a7e14caaeae3676361549fceb",
+        "rev": "40fea8521ecc4b6b17532462002a084c43632016",
         "type": "github"
       },
       "original": {

home/config/nvim/init.lua

@@ -1,2 +0,0 @@
--- bootstrap lazy.nvim, LazyVim and your plugins
-require("config.lazy")

home/config/nvim/lua/plugins/coc.lua

@@ -1,4 +0,0 @@
-return {
-  { "neoclide/coc.nvim", branch = "release" },
-  { "yaegassy/coc-volar", dependencies = "neoclide/coc.nvim", build = "yarn install --frozen-lockfile" },
-}

home/config/nvim/lua/plugins/image.lua

@@ -3,7 +3,7 @@ return {
     "3rd/image.nvim",
     opts = {
       backend = "kitty",
-      processor = "magick_rock",
+      processor = "magick_cli",
       integrations = {
         markdown = {
           enabled = true,

home/user/config.nix

@@ -3,10 +3,10 @@ let configDir = ../config;
 in
 {
   home.file = {
-    ".config/nvim" = {
+    # ".config/nvim" = {
-      source = "${configDir}/nvim";
+    #   source = "${configDir}/nvim";
-      recursive = true;
+    #   recursive = true;
-    };
+    # };
     ".config/wallpapers".source = "${configDir}/wallpapers";
     ".config/kitty".source = "${configDir}/kitty";
     ".config/neofetch".source = "${configDir}/neofetch";

home/user/default.nix

@@ -11,6 +11,7 @@
     ./virtualization.nix
     ./hyprland.nix
     ./swaync.nix
+    ./neovim.nix
     inputs.hyprland.homeManagerModules.default
   ];
 

home/user/neovim.nix

@@ -0,0 +1,78 @@
+{ pkgs, ... }:
+
+let
+  treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
+    p.bash
+    p.comment
+    p.css
+    p.dockerfile
+    p.fish
+    p.gitattributes
+    p.gitignore
+    p.go
+    p.gomod
+    p.gowork
+    p.hcl
+    p.javascript
+    p.jq
+    p.json5
+    p.json
+    p.lua
+    p.make
+    p.markdown
+    p.nix
+    p.python
+    p.rust
+    p.toml
+    p.typescript
+    p.vue
+    p.yaml
+  ]));
+
+  treesitter-parsers = pkgs.symlinkJoin {
+    name = "treesitter-parsers";
+    paths = treesitterWithGrammars.dependencies;
+  };
+  configDir = ../config;
+in
+{
+  home.packages = with pkgs; [
+    ripgrep
+    fd
+    lua-language-server
+    black
+    nodejs_22
+    gh
+  ];
+
+  programs.neovim = {
+    enable = true;
+    vimAlias = true;
+    coc.enable = false;
+    withNodeJs = true;
+
+    plugins = [
+      treesitterWithGrammars
+    ];
+    extraPackages = [ pkgs.imagemagick ];
+    extraLuaPackages = ps: with ps; [ magick ];
+  };
+
+  home.file."./.config/nvim" = {
+    source = "${configDir}/nvim";
+    recursive = true;
+  };
+
+  home.file."./.config/nvim/init.lua".text = ''
+    require("config.lazy")
+    vim.opt.runtimepath:append("${treesitter-parsers}")
+  '';
+
+  # Treesitter is configured as a locally developed module in lazy.nvim
+  # we hardcode a symlink here so that we can refer to it in our lazy config
+  home.file."./.local/share/nvim/nix/extras/" = {
+    recursive = true;
+    source = treesitterWithGrammars;
+  };
+
+}

home/user/programs.nix

@@ -4,14 +4,6 @@ let
 in
 {
   programs = {
-    neovim = {
-      enable = true;
-      withNodeJs = true;
-      withPython3 = true;
-      extraLuaPackages = ps: [ ps.magick ];
-      extraPackages = [ pkgs.imagemagick ];
-    };
-
     vscode = {
       enable = true;
       package = pkgs.vscode;

system/modules/packages.nix

@@ -1,5 +1,4 @@
 { pkgs, inputs, system, ... }:
-
 {
   environment.systemPackages = (with pkgs; [
     # gtk theme
@@ -59,7 +58,7 @@
     lua51Packages.lua
     lua51Packages.luarocks
     luajitPackages.magick
-    vimPlugins.neomake
+    imagemagick
 
     # Shell 
     fishPlugins.done

system/modules/rust-toolchain.toml

@@ -1,19 +0,0 @@
-[toolchain]
-channel = "nightly"
-components = [
-  "rust-src",
-  "rust-analyzer",
-  "rustc-codegen-cranelift",
-  "miri",
-  "llvm-tools",
-  "rust-docs-json",
-]
-targets = [
-  "wasm32-unknown-unknown",
-  "wasm32-wasi",
-  "x86_64-pc-windows-gnu",
-  "x86_64-unknown-linux-gnu",
-  "aarch64-unknown-linux-gnu",
-  "x86_64-unknown-linux-musl",
-]
-profile = "default"

system/modules/rust.nix

@@ -1,30 +0,0 @@
-{ inputs, pkgs, ... }:
-
-{
-  # Apply the overlay to the package set
-  # nixpkgs.overlays = [
-  #   inputs.rust-overlay.overlays.default
-  # ];
-
-  environment.systemPackages = with pkgs; [
-    # (rust-bin.fromRustupToolchainFile ./rust-toolchain.toml)
-    taplo #toml formatter & lsp
-    cargo-watch
-    cargo-deny
-    cargo-audit
-    cargo-update
-    cargo-edit
-    cargo-outdated
-    cargo-license
-    cargo-tarpaulin
-    cargo-cross
-    cargo-zigbuild
-    cargo-nextest
-    cargo-spellcheck
-    cargo-modules
-    cargo-bloat
-    cargo-unused-features
-    bacon
-    evcxr #rust repl
-  ];
-}