Added tresitter module and other misc updates
This commit is contained in:
parent
21febe9eef
commit
c189da135d
|
@ -11,6 +11,7 @@
|
|||
./plugins/lualine.nix
|
||||
./plugins/rhubarb.nix
|
||||
./plugins/telescope.nix
|
||||
./plugins/treesitter.nix
|
||||
./plugins/vim-obsession.nix
|
||||
];
|
||||
|
||||
|
@ -24,7 +25,7 @@
|
|||
expandtab = true;
|
||||
number = true;
|
||||
relativenumber = true;
|
||||
autoindent = true;
|
||||
autoindent = false;
|
||||
termguicolors = true;
|
||||
tabstop = 4;
|
||||
shiftwidth = 4;
|
||||
|
@ -60,14 +61,23 @@
|
|||
];
|
||||
|
||||
plugins = {
|
||||
treesitter = {
|
||||
enable = true;
|
||||
settings.highlight.enable = true;
|
||||
};
|
||||
treesitter-context.enable = true;
|
||||
tmux-navigator.enable = true;
|
||||
fugitive.enable = true;
|
||||
comment.enable = true;
|
||||
fidget.enable = true;
|
||||
web-devicons.enable = true;
|
||||
|
||||
/*
|
||||
:TransparentEnable
|
||||
:TransparentDisable
|
||||
:TransparentToggle
|
||||
*/
|
||||
transparent = {
|
||||
enable = true;
|
||||
settings.exclude_groups = [
|
||||
"CursorLine"
|
||||
"CursorLineNr"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -26,10 +26,11 @@
|
|||
sources = [
|
||||
{ name = "nvim_lsp"; }
|
||||
{ name = "buffer"; }
|
||||
{ name = "path"; }
|
||||
{ name = "cmdline"; }
|
||||
{ name = "cmp-clippy"; }
|
||||
{ name = "luasnip"; }
|
||||
{ name = "path"; }
|
||||
{ name = "nvim_lsp"; }
|
||||
];
|
||||
};
|
||||
};
|
||||
|
|
|
@ -58,9 +58,6 @@
|
|||
# c++
|
||||
clangd.enable = true;
|
||||
|
||||
# elixir
|
||||
elixirls.enable = true;
|
||||
|
||||
terraformls.enable = true;
|
||||
tflint.enable = true;
|
||||
|
||||
|
@ -74,6 +71,9 @@
|
|||
installRustc = false;
|
||||
};
|
||||
|
||||
# golang
|
||||
gopls.enable = true;
|
||||
|
||||
# nix
|
||||
nixd = {
|
||||
enable = true;
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
plugins.lualine = {
|
||||
enable = true;
|
||||
settings.options = {
|
||||
component_separators = {
|
||||
componentSeparators = {
|
||||
right = "";
|
||||
left = "";
|
||||
};
|
||||
section_separators = {
|
||||
sectionSeparators = {
|
||||
right = "";
|
||||
left = "";
|
||||
};
|
||||
|
|
23
config/plugins/treesitter.nix
Normal file
23
config/plugins/treesitter.nix
Normal file
|
@ -0,0 +1,23 @@
|
|||
{ ... }:
|
||||
{
|
||||
# Use treesitter's indenting
|
||||
opts.autoindent = false;
|
||||
|
||||
plugins.treesitter-context.enable = true;
|
||||
plugins.treesitter = {
|
||||
enable = true;
|
||||
settings = {
|
||||
highlight.enable = true;
|
||||
incremental_selection = {
|
||||
enable = true;
|
||||
keymaps = {
|
||||
init_selection = "<CR>";
|
||||
node_decremental = "<CR>";
|
||||
node_incremental = "<TAB>";
|
||||
scope_incremental = "<S-TAB>";
|
||||
};
|
||||
};
|
||||
indent.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
62
flake.lock
62
flake.lock
|
@ -5,11 +5,11 @@
|
|||
"nixpkgs-lib": "nixpkgs-lib"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1743550720,
|
||||
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
|
||||
"lastModified": 1748821116,
|
||||
"narHash": "sha256-F82+gS044J1APL0n4hH50GYdPRv/5JWm34oCJYmVKdE=",
|
||||
"owner": "hercules-ci",
|
||||
"repo": "flake-parts",
|
||||
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
|
||||
"rev": "49f0870db23e8c1ca0b5259734a02cd9e1e371a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -71,27 +71,27 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1737371634,
|
||||
"narHash": "sha256-fTVAWzT1UMm1lT+YxHuVPtH+DATrhYfea3B0MxG/cGw=",
|
||||
"lastModified": 1748294338,
|
||||
"narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "ixx",
|
||||
"rev": "a1176e2a10ce745ff8f63e4af124ece8fe0b1648",
|
||||
"rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NuschtOS",
|
||||
"ref": "v0.0.7",
|
||||
"ref": "v0.0.8",
|
||||
"repo": "ixx",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1745391562,
|
||||
"narHash": "sha256-sPwcCYuiEopaafePqlG826tBhctuJsLx/mhKKM5Fmjo=",
|
||||
"lastModified": 1749143949,
|
||||
"narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "8a2f738d9d1f1d986b5a4cd2fd2061a7127237d7",
|
||||
"rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -103,11 +103,11 @@
|
|||
},
|
||||
"nixpkgs-lib": {
|
||||
"locked": {
|
||||
"lastModified": 1743296961,
|
||||
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
|
||||
"lastModified": 1748740939,
|
||||
"narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixpkgs.lib",
|
||||
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
|
||||
"rev": "656a64127e9d791a334452c6b6606d17539476e2",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -118,11 +118,11 @@
|
|||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1745377448,
|
||||
"narHash": "sha256-jhZDfXVKdD7TSEGgzFJQvEEZ2K65UMiqW5YJ2aIqxMA=",
|
||||
"lastModified": 1748406211,
|
||||
"narHash": "sha256-B3BsCRbc+x/d0WiG1f+qfSLUy+oiIfih54kalWBi+/M=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "507b63021ada5fee621b6ca371c4fca9ca46f52c",
|
||||
"rev": "3d1f29646e4b57ed468d60f9d286cde23a8d1707",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -136,14 +136,15 @@
|
|||
"inputs": {
|
||||
"flake-parts": "flake-parts_2",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nuschtosSearch": "nuschtosSearch"
|
||||
"nuschtosSearch": "nuschtosSearch",
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745593478,
|
||||
"narHash": "sha256-GV0YnG6ZLW+BDsEKS2rjTtKcfTcTbdlVaf0ESQDBsK8=",
|
||||
"lastModified": 1749200997,
|
||||
"narHash": "sha256-In+NjXI8kfJpamTmtytt+rnBzQ213Y9KW55IXvAAK/4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "nixvim",
|
||||
"rev": "b72ba2e4e2af53269a19b99bf684480f3ad4a78f",
|
||||
"rev": "00524c7935f05606fd1b09e8700e9abcc4af7be8",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -162,11 +163,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1745046075,
|
||||
"narHash": "sha256-8v4y6k16Ra/fiecb4DxhsoOGtzLKgKlS+9/XJ9z0T2I=",
|
||||
"lastModified": 1748298102,
|
||||
"narHash": "sha256-PP11GVwUt7F4ZZi5A5+99isuq39C59CKc5u5yVisU/U=",
|
||||
"owner": "NuschtOS",
|
||||
"repo": "search",
|
||||
"rev": "066afe8643274470f4a294442aadd988356a478f",
|
||||
"rev": "f8a1c221afb8b4c642ed11ac5ee6746b0fe1d32f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
@ -196,6 +197,21 @@
|
|||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
}
|
||||
},
|
||||
"root": "root",
|
||||
|
|
Loading…
Reference in a new issue