chore: various updates

flake.lock

@@ -113,11 +113,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683276747,
+        "lastModified": 1683543852,
-        "narHash": "sha256-T3st1VBg3wmhHyBQb0z12sTSGsQgiu3mxkS61nLO8Xs=",
+        "narHash": "sha256-aS9qNcg9GwSYFLCWa3Lw+2nVPG11mmQ3B7Oka1hh04M=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "669669fcb403e3137dfe599bbcc26e60502c3543",
+        "rev": "3f3fa731ad0f99741d4dc98e8e1287b45e30b452",
         "type": "github"
       },
       "original": {
@@ -151,11 +151,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683440419,
+        "lastModified": 1683560204,
-        "narHash": "sha256-hhKqikDwHzrl8pdB482Jy9Ld+I+CpiYwIncEItxZVGA=",
+        "narHash": "sha256-YidI1lVXVtz4fYCsQkapUx/76WKs682rZybztLOt9S0=",
         "owner": "Mic92",
         "repo": "nix-index-database",
-        "rev": "7b9e09d4a10d03f703ffa2e25806f0c81b4a7a23",
+        "rev": "54049e3d602b4525dabca5d61865adf529377774",
         "type": "github"
       },
       "original": {
@@ -198,11 +198,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1683401577,
+        "lastModified": 1683504292,
-        "narHash": "sha256-sOtJKZZ9HWqcGg2hRj6O4HX9pOFfTzgYgSi+MN1HEWo=",
+        "narHash": "sha256-jlZbBIKGa6IMGkcJkQ08pbKnouTAPfeq1fD5I7l/rBw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d724b57823f2ab2c879a840a426a607bbab2b730",
+        "rev": "ba0086c178d4ed60a7899f739caea553eca2e046",
         "type": "github"
       },
       "original": {
@@ -214,11 +214,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1683392273,
+        "lastModified": 1683475240,
-        "narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=",
+        "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60",
+        "rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf",
         "type": "github"
       },
       "original": {
@@ -246,11 +246,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1683392273,
+        "lastModified": 1683475240,
-        "narHash": "sha256-pZTuxvcuDeBG+vvE1zczNyEUzlPbzXVh8Ed45Fzo+tQ=",
+        "narHash": "sha256-sy6MYoCaIZsOenYplbzVXI4Ce9Bp/vIOpuFa97+a6wc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "16b3b0c53b1ee8936739f8c588544e7fcec3fc60",
+        "rev": "e040aab15638aaf8d0786894851a2b1ca09a7baf",
         "type": "github"
       },
       "original": {
@@ -262,11 +262,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1683440798,
+        "lastModified": 1683578896,
-        "narHash": "sha256-NUjIpu4SdZ0KVYRfbfON4shVsCrxel0i/tMF0L613n0=",
+        "narHash": "sha256-7X3kWQYP4+mwvHD/ObSZnyHi5ZUj6ZBdHSfHmTmV3lY=",
         "owner": "nix-community",
         "repo": "nur",
-        "rev": "5124ebc82d8eb1c54eac3f6d16c34b0e0213456e",
+        "rev": "0f94a162c73f870b142c15f7a5892df6f65db470",
         "type": "github"
       },
       "original": {
@@ -317,11 +317,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1683428115,
+        "lastModified": 1683545104,
-        "narHash": "sha256-sxkM4upCCdsaWVpDWxYgQXooobex8QHbFkGj40Uf9uQ=",
+        "narHash": "sha256-48wC0zzHAej/wLFWIgV+uj63AvQ2UUk85g7wmXJzTqk=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "fd2d857ce2450a3ba5700d1e95eb110070e0dbc3",
+        "rev": "36b062a2c85a0efb37de1300c79c54602a094fab",
         "type": "github"
       },
       "original": {

flake.nix

@@ -183,6 +183,7 @@
         pkgs = nixpkgs.legacyPackages.${system};
       in
         pkgs.mkShell {
+          name = "nixpkgs";
           inherit (self.checks.${system}.pre-commit-check) shellHook;
           packages = [
             pkgs.just

home/apps/ideavim/ideavimrc

@@ -48,14 +48,10 @@ map <leader>rn <Action>(RenameElement)
 map <C-N> :NERDTreeToggle<CR>
 
 " 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-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>
 
 sethandler <C-D> a:vim
 sethandler <C-U> a:vim
@@ -70,7 +66,7 @@ map <A-x> <Action>(CloseContent)
 map <leader>zz <Action>(ToggleZenMode)
 
 " File navigation
-map <leader>ff <Action>(GotoFile)
+map <leader>fd <Action>(GotoFile)
 map <leader>fg <Action>(FindInPath)
 map <leader>fl <Action>(RecentLocations)
 

home/apps/kubernetes.nix

@@ -13,7 +13,9 @@
     kubectl
     kubectx
     kubepug
-    kubernetes-helm
+    (wrapHelm kubernetes-helm {
+      plugins = [kubernetes-helmPlugins.helm-diff];
+    })
     minikube
     popeye
     pv-migrate

home/apps/neovim.nix

@@ -64,16 +64,15 @@
       rustfmt
 
       # etc
+      alejandra
       deno
       ltex-ls
+      nil
       nodePackages.prettier
-      rnix-lsp
       proselint
       shellcheck
       shfmt
       tree-sitter
-      alejandra
-      deadnix
       pkgs.nur.repos.nekowinston.jq-lsp
       pkgs.nur.repos.nekowinston.helm-ls
       pkgs.nur.repos.bandithedoge.nodePackages.emmet-ls

home/apps/neovim/lua/lsp/init.lua

@@ -210,7 +210,7 @@ local servers = {
   "dockerls",
   "helm_ls",
   "jqls",
-  "rnix",
+  "nil",
   "taplo",
   "teal_ls",
 }

home/apps/neovim/lua/lsp/null-ls.lua

@@ -23,10 +23,6 @@ null.setup({
     null.builtins.formatting.taplo,
     null.builtins.diagnostics.alex,
     null.builtins.diagnostics.proselint,
-    null.builtins.diagnostics.deadnix.with({
-      -- ignore dead lambda arguments
-      extra_args = { "-l", "-L" },
-    }),
     null.builtins.hover.dictionary,
     null.builtins.hover.printenv,
   },

home/apps/neovim/lua/plugins/lualine.lua

@@ -70,7 +70,7 @@ return {
             },
           },
           lualine_b = {
-            { "branch", icon = "" },
+            { "branch", icon = "" },
             "diff",
             "diagnostics",
           },