chore: various updates
This commit is contained in:
parent
2214b5f0d6
commit
08c5fe7276
9 changed files with 34 additions and 40 deletions
42
flake.lock
42
flake.lock
|
@ -113,11 +113,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683276747,
|
"lastModified": 1683543852,
|
||||||
"narHash": "sha256-T3st1VBg3wmhHyBQb0z12sTSGsQgiu3mxkS61nLO8Xs=",
|
"narHash": "sha256-aS9qNcg9GwSYFLCWa3Lw+2nVPG11mmQ3B7Oka1hh04M=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "669669fcb403e3137dfe599bbcc26e60502c3543",
|
"rev": "3f3fa731ad0f99741d4dc98e8e1287b45e30b452",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -151,11 +151,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683440419,
|
"lastModified": 1683560204,
|
||||||
"narHash": "sha256-hhKqikDwHzrl8pdB482Jy9Ld+I+CpiYwIncEItxZVGA=",
|
"narHash": "sha256-YidI1lVXVtz4fYCsQkapUx/76WKs682rZybztLOt9S0=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "7b9e09d4a10d03f703ffa2e25806f0c81b4a7a23",
|
"rev": "54049e3d602b4525dabca5d61865adf529377774",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -198,11 +198,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable_2": {
|
"nixpkgs-stable_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683401577,
|
"lastModified": 1683504292,
|
||||||
"narHash": "sha256-sOtJKZZ9HWqcGg2hRj6O4HX9pOFfTzgYgSi+MN1HEWo=",
|
"narHash": "sha256-jlZbBIKGa6IMGkcJkQ08pbKnouTAPfeq1fD5I7l/rBw=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "d724b57823f2ab2c879a840a426a607bbab2b730",
|
"rev": "ba0086c178d4ed60a7899f739caea553eca2e046",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -214,11 +214,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683392273,
|
"lastModified": 1683475240,
|
||||||
"narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=",
|
"narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60",
|
"rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -246,11 +246,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_4": {
|
"nixpkgs_4": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683392273,
|
"lastModified": 1683475240,
|
||||||
"narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=",
|
"narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60",
|
"rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -262,11 +262,11 @@
|
||||||
},
|
},
|
||||||
"nur": {
|
"nur": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683440798,
|
"lastModified": 1683578896,
|
||||||
"narHash": "sha256-NUjIpu4SdZ0KVYRfbfON4shVsCrxel0i/tMF0L613n0=",
|
"narHash": "sha256-7X3kWQYP4+mwvHD/ObSZnyHi5ZUj6ZBdHSfHmTmV3lY=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nur",
|
"repo": "nur",
|
||||||
"rev": "5124ebc82d8eb1c54eac3f6d16c34b0e0213456e",
|
"rev": "0f94a162c73f870b142c15f7a5892df6f65db470",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -317,11 +317,11 @@
|
||||||
"nixpkgs-stable": "nixpkgs-stable_2"
|
"nixpkgs-stable": "nixpkgs-stable_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1683428115,
|
"lastModified": 1683545104,
|
||||||
"narHash": "sha256-sxkM4upCCdsaWVpDWxYgQXooobex8QHbFkGj40Uf9uQ=",
|
"narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "fd2d857ce2450a3ba5700d1e95eb110070e0dbc3",
|
"rev": "36b062a2c85a0efb37de1300c79c54602a094fab",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
@ -183,6 +183,7 @@
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
in
|
in
|
||||||
pkgs.mkShell {
|
pkgs.mkShell {
|
||||||
|
name = "nixpkgs";
|
||||||
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
inherit (self.checks.${system}.pre-commit-check) shellHook;
|
||||||
packages = [
|
packages = [
|
||||||
pkgs.just
|
pkgs.just
|
||||||
|
|
|
@ -48,14 +48,10 @@ map <leader>rn <Action>(RenameElement)
|
||||||
map <C-N> :NERDTreeToggle<CR>
|
map <C-N> :NERDTreeToggle<CR>
|
||||||
|
|
||||||
" easier split navigation
|
" easier split navigation
|
||||||
nnoremap <C-J> <C-W><C-J>
|
|
||||||
nnoremap <C-K> <C-W><C-K>
|
|
||||||
nnoremap <C-L> <C-W><C-L>
|
|
||||||
nnoremap <C-H> <C-W><C-H>
|
nnoremap <C-H> <C-W><C-H>
|
||||||
nnoremap <C-J> <C-W><C-J>
|
nnoremap <C-J> <C-W><C-J>
|
||||||
nnoremap <C-K> <C-W><C-K>
|
nnoremap <C-K> <C-W><C-K>
|
||||||
nnoremap <C-L> <C-W><C-L>
|
nnoremap <C-L> <C-W><C-L>
|
||||||
nnoremap <C-H> <C-W><C-H>
|
|
||||||
|
|
||||||
sethandler <C-D> a:vim
|
sethandler <C-D> a:vim
|
||||||
sethandler <C-U> a:vim
|
sethandler <C-U> a:vim
|
||||||
|
@ -70,7 +66,7 @@ map <A-x> <Action>(CloseContent)
|
||||||
map <leader>zz <Action>(ToggleZenMode)
|
map <leader>zz <Action>(ToggleZenMode)
|
||||||
|
|
||||||
" File navigation
|
" File navigation
|
||||||
map <leader>ff <Action>(GotoFile)
|
map <leader>fd <Action>(GotoFile)
|
||||||
map <leader>fg <Action>(FindInPath)
|
map <leader>fg <Action>(FindInPath)
|
||||||
map <leader>fl <Action>(RecentLocations)
|
map <leader>fl <Action>(RecentLocations)
|
||||||
|
|
||||||
|
@ -81,4 +77,4 @@ map [c <Action>VcsShowPrevChangeMarker
|
||||||
map [c <Action>VcsShowNextChangeMarker
|
map [c <Action>VcsShowNextChangeMarker
|
||||||
|
|
||||||
" show hoverdoc
|
" show hoverdoc
|
||||||
map H <Action>(ShowErrorDescription)
|
map H <Action>(ShowErrorDescription)
|
||||||
|
|
|
@ -13,7 +13,9 @@
|
||||||
kubectl
|
kubectl
|
||||||
kubectx
|
kubectx
|
||||||
kubepug
|
kubepug
|
||||||
kubernetes-helm
|
(wrapHelm kubernetes-helm {
|
||||||
|
plugins = [kubernetes-helmPlugins.helm-diff];
|
||||||
|
})
|
||||||
minikube
|
minikube
|
||||||
popeye
|
popeye
|
||||||
pv-migrate
|
pv-migrate
|
||||||
|
|
|
@ -64,16 +64,15 @@
|
||||||
rustfmt
|
rustfmt
|
||||||
|
|
||||||
# etc
|
# etc
|
||||||
|
alejandra
|
||||||
deno
|
deno
|
||||||
ltex-ls
|
ltex-ls
|
||||||
|
nil
|
||||||
nodePackages.prettier
|
nodePackages.prettier
|
||||||
rnix-lsp
|
|
||||||
proselint
|
proselint
|
||||||
shellcheck
|
shellcheck
|
||||||
shfmt
|
shfmt
|
||||||
tree-sitter
|
tree-sitter
|
||||||
alejandra
|
|
||||||
deadnix
|
|
||||||
pkgs.nur.repos.nekowinston.jq-lsp
|
pkgs.nur.repos.nekowinston.jq-lsp
|
||||||
pkgs.nur.repos.nekowinston.helm-ls
|
pkgs.nur.repos.nekowinston.helm-ls
|
||||||
pkgs.nur.repos.bandithedoge.nodePackages.emmet-ls
|
pkgs.nur.repos.bandithedoge.nodePackages.emmet-ls
|
||||||
|
|
|
@ -210,7 +210,7 @@ local servers = {
|
||||||
"dockerls",
|
"dockerls",
|
||||||
"helm_ls",
|
"helm_ls",
|
||||||
"jqls",
|
"jqls",
|
||||||
"rnix",
|
"nil",
|
||||||
"taplo",
|
"taplo",
|
||||||
"teal_ls",
|
"teal_ls",
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,10 +23,6 @@ null.setup({
|
||||||
null.builtins.formatting.taplo,
|
null.builtins.formatting.taplo,
|
||||||
null.builtins.diagnostics.alex,
|
null.builtins.diagnostics.alex,
|
||||||
null.builtins.diagnostics.proselint,
|
null.builtins.diagnostics.proselint,
|
||||||
null.builtins.diagnostics.deadnix.with({
|
|
||||||
-- ignore dead lambda arguments
|
|
||||||
extra_args = { "-l", "-L" },
|
|
||||||
}),
|
|
||||||
null.builtins.hover.dictionary,
|
null.builtins.hover.dictionary,
|
||||||
null.builtins.hover.printenv,
|
null.builtins.hover.printenv,
|
||||||
},
|
},
|
||||||
|
|
|
@ -70,7 +70,7 @@ return {
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
lualine_b = {
|
lualine_b = {
|
||||||
{ "branch", icon = "" },
|
{ "branch", icon = "" },
|
||||||
"diff",
|
"diff",
|
||||||
"diagnostics",
|
"diagnostics",
|
||||||
},
|
},
|
||||||
|
|
File diff suppressed because one or more lines are too long
Loading…
Reference in a new issue