File tree 10 files changed +70
-12
lines changed
10 files changed +70
-12
lines changed Original file line number Diff line number Diff line change 59
59
go
60
60
gofumpt
61
61
gopls
62
+ helm-ls
62
63
kotlin-language-server
63
64
ktfmt
64
65
lua-language-server
Original file line number Diff line number Diff line change 5
5
} : let
6
6
any-nix-shell = lib . getExe pkgs . any-nix-shell ;
7
7
direnv = lib . getExe pkgs . direnv ;
8
+ helm-ls = lib . getExe pkgs . helm-ls ;
8
9
zoxide = lib . getExe pkgs . zoxide ;
9
10
in {
10
11
programs . fish . interactiveShellInit = ''
11
12
set --universal fish_greeting
13
+
12
14
source ${ pkgs . fzf } /share/fish/vendor_functions.d/fzf_key_bindings.fish
13
15
source ${ pkgs . fzf } /share/fish/vendor_conf.d/load-fzf-key-bindings.fish
14
- ${ zoxide } init --cmd cd fish | source
16
+
15
17
${ any-nix-shell } fish | source
16
18
${ direnv } hook fish | source
19
+ ${ helm-ls } completion fish | source
20
+ ${ zoxide } init --cmd cd fish | source
17
21
'' ;
18
22
}
Original file line number Diff line number Diff line change 29
29
gp = "git push" ;
30
30
gr = "git remote -v" ;
31
31
gl = "git l" ;
32
+ gll = "git ll" ;
32
33
33
34
inherit np nr ;
34
35
nix-try = np ;
Original file line number Diff line number Diff line change 13
13
signByDefault = enable ;
14
14
key = settings . default-key ;
15
15
} ;
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 {
17
32
ci = "commit" ;
18
33
co = "checkout" ;
19
34
l = lib . concatStringsSep " " [
20
35
"!git log"
21
- "--pretty=format:\" %C(yellow)%h %Cred%ad %Cblue%aL%Cgreen%d %Creset%s \" "
36
+ "--pretty=format:\" ${ fmtl } \" "
22
37
"--date=short"
23
38
"--decorate"
24
39
"--graph"
25
40
"\" $@\" "
26
41
] ;
42
+ ll = lib . concatStringsSep " " [
43
+ "!git log"
44
+ "--format=format:\" ${ fmtll } \" "
45
+ "--abbrev-commit"
46
+ "--decorate"
47
+ "--graph"
48
+ ] ;
27
49
} ;
28
50
extraConfig = {
29
51
pull . rebase = true ;
Original file line number Diff line number Diff line change 24
24
{
25
25
"hypr/hyprlock.conf" . source = ./hypr/hyprlock.conf ;
26
26
"nvim/init.lua" . source = ./nvim/init.lua ;
27
+ "nvim/lua/autocmds.lua" . source = ./nvim/lua/autocmds.lua ;
27
28
"nvim/lua/chadrc.lua" . source = ./nvim/lua/chadrc.lua ;
28
29
"nvim/lua/configs/conform.lua" . source = ./nvim/lua/configs/conform.lua ;
29
30
"nvim/lua/configs/lazy.lua" . source = ./nvim/lua/configs/lazy.lua ;
Original file line number Diff line number Diff line change @@ -31,6 +31,7 @@ dofile(vim.g.base46_cache .. "statusline")
31
31
32
32
require " options"
33
33
require " nvchad.autocmds"
34
+ require " autocmds"
34
35
35
36
vim .schedule (function ()
36
37
require " mappings"
Original file line number Diff line number Diff line change
1
+ vim .filetype .add {
2
+ pattern = {
3
+ [" templates/.*%.ya?ml" ] = " helm" ,
4
+ [" templates/.*%.tpl" ] = " gotmpl" ,
5
+ },
6
+ }
Original file line number Diff line number Diff line change @@ -32,6 +32,20 @@ lspconfig.gopls.setup {
32
32
},
33
33
}
34
34
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
+
35
49
-- YAML
36
50
lspconfig .yamlls .setup {
37
51
on_attach = nvlsp .on_attach ,
Original file line number Diff line number Diff line change @@ -69,6 +69,14 @@ return {
69
69
" yaml" ,
70
70
" zig" ,
71
71
},
72
+ auto_install = true ,
73
+
74
+ highlight = {
75
+ enable = true ,
76
+ },
77
+ indent = {
78
+ enable = true ,
79
+ },
72
80
},
73
81
},
74
82
}
You can’t perform that action at this time.
0 commit comments