diff --git a/flake.nix b/flake.nix
index 03b72d0..c92b588 100644
--- a/flake.nix
+++ b/flake.nix
@@ -188,7 +188,7 @@
           shellHook = "exec $NIX_BUILD_SHELL";
         };
 
-        formatter = pkgs.nixfmt-rfc-style;
+        formatter = pkgs.nixfmt;
       }
     );
 
diff --git a/hosts/kili/configuration.nix b/hosts/kili/configuration.nix
index 268e965..d7acb40 100644
--- a/hosts/kili/configuration.nix
+++ b/hosts/kili/configuration.nix
@@ -110,7 +110,14 @@
   ];
 
   hardware.graphics.enable = true;
-  hardware.graphics.extraPackages = [ pkgs.libva-vdpau-driver ];
+  hardware.graphics.extraPackages = with pkgs; [
+    libva-vdpau-driver
+    intel-media-driver
+  ];
+  environment.sessionVariables = {
+    LIBVA_DRIVER_NAME = "iHD";
+  };
+
   hardware.nvidia = {
     modesetting.enable = true;
     powerManagement.enable = true;
diff --git a/programs/default.nix b/programs/default.nix
index 51b6de8..9e4ba40 100644
--- a/programs/default.nix
+++ b/programs/default.nix
@@ -39,6 +39,7 @@
     requirements = [ "cli" ];
     home-config = _: {
       home.packages = with pkgs; [
+        rustup
         sops
       ];
     };
diff --git a/programs/nvim/plugins.nix b/programs/nvim/plugins.nix
index 1e10af7..51ae2e0 100644
--- a/programs/nvim/plugins.nix
+++ b/programs/nvim/plugins.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, config, ... }:
 let
   render-markdown = pkgs.vimUtils.buildVimPlugin {
     name = "render-markdown";
@@ -24,97 +24,98 @@ in
     plugins = {
       treesitter-textobjects = {
         enable = false;
-        lspInterop.enable = true;
+        settings = {
+          lsp_interop.enable = true;
+          select = {
+            enable = true;
 
-        select = {
-          enable = true;
+            keymaps = {
+              "ai" = {
+                query = "@impl.outer";
+              };
+              "ii" = {
+                query = "@impl.inner";
+              };
+              "af" = {
+                query = "@function.outer";
+              };
+              "if" = {
+                query = "@function.inner";
+              };
 
-          keymaps = {
-            "ai" = {
-              query = "@impl.outer";
-            };
-            "ii" = {
-              query = "@impl.inner";
-            };
-            "af" = {
-              query = "@function.outer";
-            };
-            "if" = {
-              query = "@function.inner";
-            };
-
-            "ac" = {
-              query = "@conditional.outer";
-            };
-            "ic" = {
-              query = "@conditional.inner";
-            };
-            "al" = {
-              query = "@loop.outer";
-            };
-            "il" = {
-              query = "@loop.inner";
+              "ac" = {
+                query = "@conditional.outer";
+              };
+              "ic" = {
+                query = "@conditional.inner";
+              };
+              "al" = {
+                query = "@loop.outer";
+              };
+              "il" = {
+                query = "@loop.inner";
+              };
             };
           };
-        };
 
-        move = {
-          enable = true;
-          setJumps = true;
-          gotoNextStart = {
-            "]f" = {
-              query = "@function.outer";
+          move = {
+            enable = true;
+            set_jumps = true;
+            goto_next_start = {
+              "]f" = {
+                query = "@function.outer";
+              };
+              "]c" = {
+                query = "@conditional.outer";
+              };
+              "]l" = {
+                query = "@loop.outer";
+              };
+              "]i" = {
+                query = "@impl.outer";
+              };
             };
-            "]c" = {
-              query = "@conditional.outer";
+            goto_next_end = {
+              "]F" = {
+                query = "@function.outer";
+              };
+              "]C" = {
+                query = "@conditional.outer";
+              };
+              "]L" = {
+                query = "@loop.outer";
+              };
+              "]I" = {
+                query = "@impl.outer";
+              };
             };
-            "]l" = {
-              query = "@loop.outer";
+            goto_previous_start = {
+              "[f" = {
+                query = "@function.outer";
+              };
+              "[c" = {
+                query = "@conditional.outer";
+              };
+              "[l" = {
+                query = "@loop.outer";
+              };
+              "[i" = {
+                query = "@impl.outer";
+              };
             };
-            "]i" = {
-              query = "@impl.outer";
-            };
-          };
-          gotoNextEnd = {
-            "]F" = {
-              query = "@function.outer";
-            };
-            "]C" = {
-              query = "@conditional.outer";
-            };
-            "]L" = {
-              query = "@loop.outer";
-            };
-            "]I" = {
-              query = "@impl.outer";
-            };
-          };
-          gotoPreviousStart = {
-            "[f" = {
-              query = "@function.outer";
-            };
-            "[c" = {
-              query = "@conditional.outer";
-            };
-            "[l" = {
-              query = "@loop.outer";
-            };
-            "[i" = {
-              query = "@impl.outer";
-            };
-          };
-          gotoPreviousEnd = {
-            "[F" = {
-              query = "@function.outer";
-            };
-            "[C" = {
-              query = "@conditional.outer";
-            };
-            "[L" = {
-              query = "@loop.outer";
-            };
-            "[I" = {
-              query = "@impl.outer";
+            goto_previous_end = {
+              "[F" = {
+                query = "@function.outer";
+              };
+              "[C" = {
+                query = "@conditional.outer";
+              };
+              "[L" = {
+                query = "@loop.outer";
+              };
+              "[I" = {
+                query = "@impl.outer";
+              };
             };
           };
         };
@@ -377,11 +378,14 @@ in
 
       lspsaga = {
         enable = true;
-        lightbulb.enable = false;
-        codeAction.keys = {
-          quit = "<Esc>";
+        settings = {
+          lightbulb.enable = false;
+          code_action.keys = {
+            quit = "<Esc>";
+          };
+          symbol_in_winbar.enable = false;
+          implement.enable = true;
         };
-        symbolInWinbar.enable = false;
       };
 
       typst-vim = {
@@ -479,7 +483,7 @@ in
           nil_ls = {
             enable = true;
             settings = {
-              formatting.command = [ "${(pkgs.lib.getExe pkgs.nixfmt-rfc-style)}" ];
+              formatting.command = [ "${(pkgs.lib.getExe pkgs.nixfmt)}" ];
             };
             extraOptions = {
               nix = {
@@ -562,22 +566,25 @@ in
 
       wilder = {
         enable = true;
-        modes = [
-          "/"
-          ":"
-          "?"
-        ];
-        enableCmdlineEnter = true;
-        beforeCursor = true;
-        useCmdlinechanged = true;
 
-        nextKey = "<Tab>";
-        prevKey = "<S-Tab>";
-        acceptKey = "<Down>";
-        rejectKey = "<Up>";
+        settings = {
+          modes = [
+            "/"
+            ":"
+            "?"
+          ];
+          enable_cmdline_enter = true;
+          before_cursor = true;
+          use_cmdlinechanged = true;
 
-        pipeline = [
-          ''
+          next_key = "<Tab>";
+          prev_key = "<S-Tab>";
+          accept_key = "<Down>";
+          reject_key = "<Up>";
+        };
+
+        options = {
+          pipeline = config.lib.nixvim.mkRaw ''
             wilder.branch(
               wilder.cmdline_pipeline({
                 language = 'python',
@@ -606,55 +613,56 @@ in
                 filters = {'cpsm_filter'},
               })
             )
-          ''
-        ];
-        renderer = ''
-          (function()
-            local highlighters = {
-              wilder.pcre2_highlighter(),
-              -- wilder.lua_fzy_highlighter(),
-            }
+          '';
 
-            local popupmenu_renderer = wilder.popupmenu_renderer(
-              wilder.popupmenu_border_theme({
-                border = 'rounded',
-                empty_message = wilder.popupmenu_empty_message_with_spinner(),
-                highlighter = highlighters,
+          renderer = config.lib.nixvim.mkRaw ''
+            (function()
+              local highlighters = {
+                wilder.pcre2_highlighter(),
+                -- wilder.lua_fzy_highlighter(),
+              }
+
+              local popupmenu_renderer = wilder.popupmenu_renderer(
+                wilder.popupmenu_border_theme({
+                  border = 'rounded',
+                  empty_message = wilder.popupmenu_empty_message_with_spinner(),
+                  highlighter = highlighters,
+                  highlights = {
+                    accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}),
+                  },
+                  left = {
+                    ' ',
+                    wilder.popupmenu_devicons(),
+                    wilder.popupmenu_buffer_flags({
+                      flags = ' a + ',
+                      icons = {['+'] = '', a = '', h = ''},
+                    }),
+                  },
+                  right = {
+                    ' ',
+                    wilder.popupmenu_scrollbar(),
+                  },
+                })
+              )
+
+              local wildmenu_renderer = wilder.wildmenu_renderer({
                 highlights = {
                   accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}),
                 },
-                left = {
-                  ' ',
-                  wilder.popupmenu_devicons(),
-                  wilder.popupmenu_buffer_flags({
-                    flags = ' a + ',
-                    icons = {['+'] = '', a = '', h = ''},
-                  }),
-                },
-                right = {
-                  ' ',
-                  wilder.popupmenu_scrollbar(),
-                },
+                highlighter = highlighters,
+                separator = ' · ',
+                left = {' ', wilder.wildmenu_spinner(), ' '},
+                right = {' ', wilder.wildmenu_index()},
               })
-            )
 
-            local wildmenu_renderer = wilder.wildmenu_renderer({
-              highlights = {
-                accent = wilder.make_hl('WilderAccent', 'Pmenu', {{a = 1}, {a = 1}, {foreground = '#f4468f'}}),
-              },
-              highlighter = highlighters,
-              separator = ' · ',
-              left = {' ', wilder.wildmenu_spinner(), ' '},
-              right = {' ', wilder.wildmenu_index()},
-            })
-
-            return wilder.renderer_mux({
-              [':'] = popupmenu_renderer,
-              ['/'] = wildmenu_renderer,
-              substitute = wildmenu_renderer,
-            })
-          end)()
-        '';
+              return wilder.renderer_mux({
+                [':'] = popupmenu_renderer,
+                ['/'] = wildmenu_renderer,
+                substitute = wildmenu_renderer,
+              })
+            end)()
+          '';
+        };
       };
 
       floaterm = {