jmarkin/nvim-nix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

up

Browse source
This commit is contained in:
jmarkin 2025-10-29 22:45:27 +03:00
parent 30da584e2a
commit 689d24168b
6 changed files with 118 additions and 214 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
flake.lock
View file

@ -23,11 +23,11 @@
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1761172885,
"narHash": "sha256-oV313qlvIissxZdbjKwymnkmhLOnCUn8ckNxF33gWMM=",
"lastModified": 1761760182,
"narHash": "sha256-p82RYOJ5yN1A1yR4KqhA9qfJbMOJcssEwepVLZTGNRM=",
"owner": "Saghen",
"repo": "blink.pairs",
"rev": "66e22e00b2f6ed6217abfceb53f6675f75fafe12",
"rev": "574ce24d44526a76e0b76e921a92c6737a6b3954",
"type": "github"
},
"original": {
@ -106,38 +106,6 @@
"type": "github"
}
},
"flake-compat_2": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib"
@ -240,29 +208,6 @@
"type": "github"
}
},
"git-hooks_2": {
"inputs": {
"flake-compat": "flake-compat_3",
"gitignore": "gitignore_2",
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": {
"inputs": {
"nixpkgs": [
@ -285,53 +230,6 @@
"type": "github"
}
},
"gitignore_2": {
"inputs": {
"nixpkgs": [
"neovim-nightly-overlay",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"hercules-ci-effects": {
"inputs": {
"flake-parts": [
"neovim-nightly-overlay",
"flake-parts"
],
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1761230615,
"narHash": "sha256-pLE7U5gOtlA/2wbKCsVRYf5DqMQ5TWBCrCfZGytDDeo=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "7db2b867219a26781437d840ce457b75b7645154",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"hlargs-nvim": {
"flake": false,
"locked": {
@ -437,24 +335,20 @@
},
"neovim-nightly-overlay": {
"inputs": {
"flake-compat": "flake-compat_2",
"flake-parts": [
"flake-parts"
],
"git-hooks": "git-hooks_2",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src",
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix"
]
},
"locked": {
"lastModified": 1761437965,
"narHash": "sha256-X4SNeOXdFkE7Gt+waO5ck3TqfqWskqJHxt1WIu3nnUQ=",
"lastModified": 1761696321,
"narHash": "sha256-UpAmPtmsO9g7+uECR+NsjuKCYPa5SFj2akkjLc51k8I=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "21595d9f79b5da0eef177dcfdd84ca981ac253a9",
"rev": "37853aa4419e22dc2b7544e4238dd880af673bc8",
"type": "github"
},
"original": {
@ -466,11 +360,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1761434579,
"narHash": "sha256-S+YmbP/bPETjKk6B/tlh+jwIH7K7iPoXyHLLwTqVOhk=",
"lastModified": 1761695393,
"narHash": "sha256-BMoy/in1jne82gM2LEiBG6hhiyllyvmSNBf4Vhrho7s=",
"owner": "neovim",
"repo": "neovim",
"rev": "a121ede1bfee2704c26159124f8f61f96c6aa136",
"rev": "c2781d3db3efa3a86d9f383a0886567ff38e4d63",
"type": "github"
},
"original": {
@ -662,27 +556,6 @@
"type": "github"
}
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": {
"lastModified": 1761311587,
"narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"whatthejump-nvim": {
"flake": false,
"locked": {

5
nix/lang/go.nix
View file

@ -6,16 +6,15 @@
golangci-lint
gopls
gotools
delve
mockgen
# gofumpt
# golines
# gomodifytags
# iferr
# impl
# ginkgo
# mockgen
# govulncheck
];
plugins = [ ];

2
nix/lang/rust.nix
View file

@ -8,6 +8,8 @@
graphviz
lldb
ra-multiplex
cargo-nextest
];

3
nix/neovim-overlay.nix
View file

@ -288,12 +288,13 @@ with final.pkgs.lib; let
END
'';
}
# vim plugins
{ plugin = vim-test; optional = false; type = "vim"; }
]
);
extraPackages = langs.packages ++ [
pkgs.jaq
# lsp features
pkgs.fswatch
pkgs.fixjson

148
nix/treesitter.nix
View file

@ -1,79 +1,81 @@
{ inputs, pkgs, mkNvimPlugin, ... }:
let
kulala = pkgs.callPackage ./kulala.nix { inherit inputs pkgs; };
# nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withAllGrammars;
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
# plugins
kulala.grammar
# languages
p.rust
p.c
p.cpp
p.cuda
p.python
p.typescript
p.javascript
p.fish
p.lua
p.html
p.htmldjango
p.css
p.bash
p.vue
p.scss
p.sql
p.markdown
p.json
p.json5
p.jsonc
p.graphql
p.commonlisp
p.latex
p.glsl
p.nix
p.go
p.gotmpl
p.helm
p.gomod
p.gosum
# conf files
p.ssh_config
p.jsdoc
p.yaml
p.toml
p.proto
p.http
p.hurl
p.make
p.cmake
p.dockerfile
p.ini
p.vim
p.vimdoc
p.passwd
p.requirements
p.hcl
p.xml
p.nginx
p.tmux
p.udev
# tools
p.markdown_inline
p.jq
p.regex
p.query
p.comment
p.rst
# git
p.gitcommit
p.git_rebase
p.gitignore
p.git_config
p.gitattributes
]);
nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withPlugins(_:
[kulala.grammar] ++ pkgs.vimPlugins.nvim-treesitter.allGrammars
);
# nvim-treesitter = pkgs.vimPlugins.nvim-treesitter.withPlugins (p: [
# # plugins
# kulala.grammar
#
# # languages
# p.rust
# p.c
# p.cpp
# p.cuda
# p.python
# p.typescript
# p.javascript
# p.fish
# p.lua
# p.html
# p.htmldjango
# p.css
# p.bash
# p.vue
# p.scss
# p.sql
# p.markdown
# p.json
# p.json5
# p.jsonc
# p.graphql
# p.commonlisp
# p.latex
# p.glsl
# p.nix
# p.go
# p.gotmpl
# p.helm
# p.gomod
# p.gosum
# # conf files
# p.ssh_config
# p.jsdoc
# p.yaml
# p.toml
# p.proto
# p.http
# p.hurl
# p.make
# p.cmake
# p.dockerfile
# p.ini
# p.vim
# p.vimdoc
# p.passwd
# p.requirements
# p.hcl
# p.xml
# p.nginx
# p.tmux
# p.udev
# # tools
# p.markdown_inline
# p.jq
# p.regex
# p.query
# p.comment
# p.rst
#
# # git
# p.gitcommit
# p.git_rebase
# p.gitignore
# p.git_config
# p.gitattributes
#
# ]);
nvim-yati = (mkNvimPlugin inputs.nvim-yati "nvim-yati").overrideAttrs
{
dependencies = [ nvim-treesitter ];

27
nvim/plugin/tests.vim Normal file
View file

@ -0,0 +1,27 @@
if exists('g:did_load_tests_plugin')
finish
endif
let g:did_load_tests_plugin = v:true
let g:test#prompt_for_unsaved_changes = 1
nmap <silent> <leader>lt :TestNearest<CR>
nmap <silent> <leader>lT :TestFile<CR>
nmap <silent> <leader>la :TestSuite<CR>
nmap <silent> <leader>ll :TestLast<CR>
nmap <silent> <leader>lg :TestVisit<CR>
let test#strategy = "neovim"
let test#python#runner = 'pytest'
" Runners available are 'pytest', 'nose', 'nose2', 'djangotest', 'djangonose', 'mamba', and Python's built-in unittest as 'pyunit'
let test#go#runner = 'gotest'
" Runners available are 'gotest', 'ginkgo', 'richgo', 'delve'