WIP: treewide: fixes for nixos 26.05

home/programs/firefox.nix

@@ -1,6 +1,7 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 {
   programs.firefox = {
+    configPath = "${config.xdg.configHome}/mozilla/firefox";
     profiles.h7x4 = {
       bookmarks = {
         force = true;

home/programs/hyprland/hyprland.nix

@@ -2,6 +2,7 @@
   wayland.windowManager.hyprland = {
     systemd.enable = false;
     systemd.enableXdgAutostart = false;
+    configType = "lua";
 
     settings = {
       exec-once = [

home/programs/neovim/default.nix

@@ -10,6 +10,9 @@ lib.mkIf cfg.enable {
     vimAlias = true;
     vimdiffAlias = true;
 
+    withPython3 = true;
+    withRuby = false;
+
     plugins = with pkgs.vimPlugins; [
       direnv-vim
       fzf-vim
@@ -27,6 +30,7 @@ lib.mkIf cfg.enable {
       semshi
       {
         plugin = goyo-vim;
+        type = "viml";
 
         # TODO: The mapleader definition should be in extraConfig, but setting
         #       the mapleader before defining keymaps messes things up.
@@ -73,21 +77,19 @@ lib.mkIf cfg.enable {
       vim-better-whitespace
       {
         plugin = nvim-treesitter.withAllGrammars;
+        type = "lua";
         config = ''
-        packadd! nvim-treesitter
-        lua << EOF
-          require'nvim-treesitter.configs'.setup {
+          require('nvim-treesitter').setup {
             highlight = {
               enable = true,
             },
           }
-        EOF
         '';
       }
       {
         plugin = rainbow-delimiters-nvim;
+        type = "lua";
         config = ''
-        lua << EOF
           local rainbow_delimiters = require 'rainbow-delimiters'
           vim.g.rainbow_delimiters = {
             ["highlight"] = {
@@ -99,11 +101,11 @@ lib.mkIf cfg.enable {
               'RainbowDelimiterCyan',
             },
           }
-        EOF
         '';
       }
       {
         plugin = vim-monokai;
+        type = "viml";
         config = ''
           colorscheme monokai
 
@@ -140,7 +142,7 @@ lib.mkIf cfg.enable {
       vnoremap <A-k> :m '<-2<CR>gv=gv
     '';
 
-    extraLuaConfig = ''
+    initLua = ''
       local function paste_buf()
         local content = os.getenv("NVIM_CLIPBOARD")
 

home/programs/yazi.nix

@@ -1,6 +1,7 @@
 { ... }:
 {
   programs.yazi = {
+    shellWrapperName = "y";
     keymap = {
       manager.prepend_keymap = [
         {