Skip to content

Commit 51a072d

Browse files
authoredMar 2, 2025··
NeoVim Helm LS + update (#146)
* Update. * Add git ll (detailed log) alias. * Install Helm LS. * Update. * Fix autocmds.
1 parent ca7eaef commit 51a072d

File tree

10 files changed

+70
-12
lines changed

10 files changed

+70
-12
lines changed
 

‎flake.lock

+9-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎home-manager/home/packages.nix

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ in {
5959
go
6060
gofumpt
6161
gopls
62+
helm-ls
6263
kotlin-language-server
6364
ktfmt
6465
lua-language-server

‎home-manager/programs/fish/interactive_shell_init.nix

+5-1
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,18 @@
55
}: let
66
any-nix-shell = lib.getExe pkgs.any-nix-shell;
77
direnv = lib.getExe pkgs.direnv;
8+
helm-ls = lib.getExe pkgs.helm-ls;
89
zoxide = lib.getExe pkgs.zoxide;
910
in {
1011
programs.fish.interactiveShellInit = ''
1112
set --universal fish_greeting
13+
1214
source ${pkgs.fzf}/share/fish/vendor_functions.d/fzf_key_bindings.fish
1315
source ${pkgs.fzf}/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
14-
${zoxide} init --cmd cd fish | source
16+
1517
${any-nix-shell} fish | source
1618
${direnv} hook fish | source
19+
${helm-ls} completion fish | source
20+
${zoxide} init --cmd cd fish | source
1721
'';
1822
}

‎home-manager/programs/fish/shell_abbrs.nix

+1
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
gp = "git push";
3030
gr = "git remote -v";
3131
gl = "git l";
32+
gll = "git ll";
3233

3334
inherit np nr;
3435
nix-try = np;

‎home-manager/programs/git.nix

+24-2
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,39 @@
1313
signByDefault = enable;
1414
key = settings.default-key;
1515
};
16-
aliases = {
16+
aliases = let
17+
fmtl = lib.concatStringsSep " " [
18+
"%C(yellow)%h%C(reset)"
19+
"%C(bold cyan)%ad%C(reset)"
20+
"%C(blue)%aL%C(reset)"
21+
"%s%C(auto)%d%C(reset)"
22+
];
23+
fmtll = lib.concatStringsSep " " [
24+
"%C(yellow)%h%C(reset)"
25+
"%C(bold cyan)%aD%C(reset)"
26+
"%C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n"
27+
" " # pad to abbrev-commit length
28+
"%C(white)%s%C(reset)"
29+
"%C(dim white)- %an [%aL]%C(reset)"
30+
];
31+
in {
1732
ci = "commit";
1833
co = "checkout";
1934
l = lib.concatStringsSep " " [
2035
"!git log"
21-
"--pretty=format:\"%C(yellow)%h %Cred%ad %Cblue%aL%Cgreen%d %Creset%s\""
36+
"--pretty=format:\"${fmtl}\""
2237
"--date=short"
2338
"--decorate"
2439
"--graph"
2540
"\"$@\""
2641
];
42+
ll = lib.concatStringsSep " " [
43+
"!git log"
44+
"--format=format:\"${fmtll}\""
45+
"--abbrev-commit"
46+
"--decorate"
47+
"--graph"
48+
];
2749
};
2850
extraConfig = {
2951
pull.rebase = true;

‎home-manager/xdg/config_file.nix

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ in {
2424
{
2525
"hypr/hyprlock.conf".source = ./hypr/hyprlock.conf;
2626
"nvim/init.lua".source = ./nvim/init.lua;
27+
"nvim/lua/autocmds.lua".source = ./nvim/lua/autocmds.lua;
2728
"nvim/lua/chadrc.lua".source = ./nvim/lua/chadrc.lua;
2829
"nvim/lua/configs/conform.lua".source = ./nvim/lua/configs/conform.lua;
2930
"nvim/lua/configs/lazy.lua".source = ./nvim/lua/configs/lazy.lua;

‎home-manager/xdg/nvim/init.lua

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ dofile(vim.g.base46_cache .. "statusline")
3131

3232
require "options"
3333
require "nvchad.autocmds"
34+
require "autocmds"
3435

3536
vim.schedule(function()
3637
require "mappings"
+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
vim.filetype.add {
2+
pattern = {
3+
["templates/.*%.ya?ml"] = "helm",
4+
["templates/.*%.tpl"] = "gotmpl",
5+
},
6+
}

‎home-manager/xdg/nvim/lua/configs/lspconfig.lua

+14
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,20 @@ lspconfig.gopls.setup {
3232
},
3333
}
3434

35+
-- Helm
36+
lspconfig.helm_ls.setup {
37+
on_attach = nvlsp.on_attach,
38+
on_init = nvlsp.on_init,
39+
capabilities = nvlsp.capabilities,
40+
settings = {
41+
["helm-ls"] = {
42+
yamlls = {
43+
path = "yaml-language-server",
44+
},
45+
},
46+
},
47+
}
48+
3549
-- YAML
3650
lspconfig.yamlls.setup {
3751
on_attach = nvlsp.on_attach,

‎home-manager/xdg/nvim/lua/plugins/init.lua

+8
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,14 @@ return {
6969
"yaml",
7070
"zig",
7171
},
72+
auto_install = true,
73+
74+
highlight = {
75+
enable = true,
76+
},
77+
indent = {
78+
enable = true,
79+
},
7280
},
7381
},
7482
}

0 commit comments

Comments
 (0)
Please sign in to comment.