Fix out of date nix stuff, config edits

14 files changed, 84 insertions, 62 deletions

diff --git a/files/firefox/user-overrides.js b/files/firefox/user-overrides.js
index 5535de3..7d2abb8 100644
--- a/files/firefox/user-overrides.js
+++ b/files/firefox/user-overrides.js
@@ -49,6 +49,9 @@ user_pref("ui.key.menuAccessKeyFocuses", false);
 user_pref("mousebutton.4th.enabled", false);
 user_pref("mousebutton.5th.enabled", false);
 
+// Disable tab groups.
+user_pref("browser.tabs.groups.enabled", false);
+
 // Good smooth-scrolling
 user_pref("general.smoothScroll.mouseWheel.durationMaxMS", 250);
 user_pref("general.smoothScroll.mouseWheel.durationMinMS", 250);
diff --git a/files/kitty/kitty.conf b/files/kitty/kitty.conf
index 4728717..a32e47e 100644
--- a/files/kitty/kitty.conf
+++ b/files/kitty/kitty.conf
@@ -44,7 +44,7 @@ resize_debounce_time 0.025 0.5
 cursor_shape block
 #cursor_blink_interval -1 linear ease-out
 #cursor_stop_blinking_after 20.0
-cursor_trail 3
+cursor_trail 4
 cursor_trail_decay 0.075 0.425
 cursor_trail_start_threshold 3
 #cursor #${colo.foreground}
diff --git a/files/vim/patches/qname_edit.diff b/files/vim/patches/qname_edit.diff
index 4ca65ff..ab1ed09 100644
--- a/files/vim/patches/qname_edit.diff
+++ b/files/vim/patches/qname_edit.diff
@@ -1,7 +1,7 @@
 Post- dos2unix, Tabify, and Trim.
 --- a/qname.1.2.vim	2025-08-03 20:12:24.629096223 -0400
-+++ b/qname.1.2.vim	2025-08-13 22:10:15.352953531 -0400
-@@ -7,7 +7,25 @@
++++ b/qname.1.2.vim	2025-10-30 16:45:40.688588103 -0400
+@@ -7,7 +7,27 @@
  " License:		Vim License
  " =============================================================================
  
@@ -23,11 +23,13 @@ Post- dos2unix, Tabify, and Trim.
 +"	Add bind to "flatten" the list
 +"	Replace fmatch() with built-in matchfuzzy() (speedup)
 +"	Fix logic to not include buffers with modifiable off
++"  2025-10-30:
++"   Treat <S-BS> the same as <BS>
 +"
  " 1.2	2013-01-03
  " ADD: <Tab> and <S-Tab> moves selection like <Up> and <Down>
  " ADD: Use <silent> mapping to keep cmdline clear
-@@ -30,12 +48,6 @@
+@@ -30,12 +50,6 @@
  	finish
  endif
  
@@ -40,7 +42,16 @@ Post- dos2unix, Tabify, and Trim.
  if exists("g:qname_loaded") && g:qname_loaded
  	finish
  endif
-@@ -70,16 +82,19 @@
+@@ -53,7 +67,7 @@
+ 
+ 		" use case-sensitive equality operator, otherwise <BS> looks like
+ 		" <S-Tab> if 'ignorecase' is set
+-		if _key ==# "\<BS>"
++		if _key ==# "\<BS>" || _key ==# "\<S-BS>"
+ 			let s:inp = s:inp[:-2]
+ 		elseif _key ==# "\<C-U>"
+ 			let s:inp = ""
+@@ -70,16 +84,19 @@
  				call s:swb(str2nr(matchstr(s:s[_sel], '<\zs\d\+\ze>')))
  			endif
  			call QNameInit(0)
@@ -64,7 +75,7 @@ Post- dos2unix, Tabify, and Trim.
  		else
  			call s:build()
  		endif
-@@ -88,7 +103,6 @@
+@@ -88,7 +105,6 @@
  		cal QNameInit(0)
  	finally
  		" clean up screen after dismissing search window
@@ -72,7 +83,7 @@ Post- dos2unix, Tabify, and Trim.
  		call inputrestore()
  	endtry
  endfunc
-@@ -99,6 +113,7 @@
+@@ -99,6 +115,7 @@
  		let s:cmdh = &cmdheight
  		if a:start != -1
  			let s:inp = ""
@@ -80,7 +91,7 @@ Post- dos2unix, Tabify, and Trim.
  		endif
  		call s:baselist()
  		call s:build()
-@@ -112,16 +127,27 @@
+@@ -112,16 +129,27 @@
  function! s:build()
  	let s:s = []
  	let s:n = []
@@ -111,7 +122,7 @@ Post- dos2unix, Tabify, and Trim.
  		cal s:colPrinter.put(s:n)
  	else
  		cal s:colPrinter.put(s:s)
-@@ -137,37 +163,28 @@
+@@ -137,37 +165,28 @@
  endfunc
  
  function! s:fmatch(src,pat)
@@ -154,7 +165,7 @@ Post- dos2unix, Tabify, and Trim.
  function! s:colPrinter.put(its) dict
  	let _cols = []
  	let _trow = self.trow
-@@ -224,11 +241,7 @@
+@@ -224,11 +243,7 @@
  function! s:colPrinter.vert(mv) dict
  	let _t = self.sel + a:mv
  	let _len = self.len
@@ -167,7 +178,7 @@ Post- dos2unix, Tabify, and Trim.
  		let self.sel = _t
  	endif
  endfunc
-@@ -244,7 +257,7 @@
+@@ -244,7 +259,7 @@
  	let _t = _sel/_trow
  	let _cpos = self.cpos
  	let _lcol = self.lcol
diff --git a/files/vim/plugin/qname.1.2.vim b/files/vim/plugin/qname.1.2.vim
index 73b7dec..7ecd92f 100644
--- a/files/vim/plugin/qname.1.2.vim
+++ b/files/vim/plugin/qname.1.2.vim
@@ -25,6 +25,8 @@
 "	Add bind to "flatten" the list
 "	Replace fmatch() with built-in matchfuzzy() (speedup)
 "	Fix logic to not include buffers with modifiable off
+"  2025-10-30:
+"   Treat <S-BS> the same as <BS>
 "
 " 1.2	2013-01-03
 " ADD: <Tab> and <S-Tab> moves selection like <Up> and <Down>
@@ -65,7 +67,7 @@ function! QNameRun()
 
 		" use case-sensitive equality operator, otherwise <BS> looks like
 		" <S-Tab> if 'ignorecase' is set
-		if _key ==# "\<BS>"
+		if _key ==# "\<BS>" || _key ==# "\<S-BS>"
 			let s:inp = s:inp[:-2]
 		elseif _key ==# "\<C-U>"
 			let s:inp = ""
diff --git a/files/vim/vimrc b/files/vim/vimrc
index c40eeec..b3bb734 100644
--- a/files/vim/vimrc
+++ b/files/vim/vimrc
@@ -128,8 +128,8 @@ if isdirectory(expand("~/c"))
 endif
 
 set autocomplete
-"set complete=.^6,w^6,b^6,u^6,i^6,d^6
-set complete=.^6,w^6,b^6,u^6
+"set complete=.^4,w^3,b^2,u^2,i^2,d^2
+set complete=.^4,w^3,b^2,u^2
 set completeopt+=menu,popup
 
 " Plugins.
diff --git a/hosts/iroha/scripts/emaint-sync b/hosts/iroha/scripts/emaint-sync
new file mode 100755
index 0000000..c45fae4
--- /dev/null
+++ b/hosts/iroha/scripts/emaint-sync
@@ -0,0 +1,5 @@
+#! /usr/bin/env sh
+doas emaint sync -r guru && \
+  doas emaint sync -r steam-overlay && \
+  doas emaint sync -r nix-guix && \
+  doas emaint sync -r tatsh-overlay
diff --git a/hosts/iroha/stow.txt b/hosts/iroha/stow.txt
index de02c57..ffd60e2 100644
--- a/hosts/iroha/stow.txt
+++ b/hosts/iroha/stow.txt
@@ -38,6 +38,7 @@ UNLINK: .local/bin/use-flags
 UNLINK: .local/bin/wlsunset-toggle
 UNLINK: .local/bin/xbox-controller-battery
 UNLINK: .local/bin/xbox360-ffmpeg-enc
+UNLINK: .mailcap
 UNLINK: .muttrc
 UNLINK: .profile
 UNLINK: .vim/autoload
@@ -90,7 +91,7 @@ LINK: .local/bin/use-flags => ../../c/dotfiles/hosts/iroha/stow/.local/bin/use-f
 LINK: .local/bin/wlsunset-toggle => ../../c/dotfiles/hosts/iroha/stow/.local/bin/wlsunset-toggle (reverts previous action)
 LINK: .local/bin/xbox-controller-battery => ../../c/dotfiles/hosts/iroha/stow/.local/bin/xbox-controller-battery (reverts previous action)
 LINK: .local/bin/xbox360-ffmpeg-enc => ../../c/dotfiles/hosts/iroha/stow/.local/bin/xbox360-ffmpeg-enc (reverts previous action)
-LINK: .mailcap => c/dotfiles/hosts/iroha/stow/.mailcap
+LINK: .mailcap => c/dotfiles/hosts/iroha/stow/.mailcap (reverts previous action)
 LINK: .muttrc => c/dotfiles/hosts/iroha/stow/.muttrc (reverts previous action)
 LINK: .profile => c/dotfiles/hosts/iroha/stow/.profile (reverts previous action)
 LINK: .vim/autoload => ../c/dotfiles/hosts/iroha/stow/.vim/autoload (reverts previous action)
@@ -100,6 +101,7 @@ LINK: .vim/patches => ../c/dotfiles/hosts/iroha/stow/.vim/patches (reverts previ
 LINK: .vim/plugin => ../c/dotfiles/hosts/iroha/stow/.vim/plugin (reverts previous action)
 LINK: .vim/vimrc => ../c/dotfiles/hosts/iroha/stow/.vim/vimrc (reverts previous action)
 LINK: scripts/disable-rgb => ../c/dotfiles/hosts/iroha/stow/scripts/disable-rgb (reverts previous action)
+LINK: scripts/emaint-sync => ../c/dotfiles/hosts/iroha/stow/scripts/emaint-sync
 LINK: scripts/prepare-mounts => ../c/dotfiles/hosts/iroha/stow/scripts/prepare-mounts (reverts previous action)
 LINK: scripts/prepare-network-mounts => ../c/dotfiles/hosts/iroha/stow/scripts/prepare-network-mounts (reverts previous action)
 LINK: scripts/run-sway => ../c/dotfiles/hosts/iroha/stow/scripts/run-sway (reverts previous action)
diff --git a/hosts/moyo/kernel_config b/hosts/moyo/kernel_config
index 6abe5dd..e6ce0b3 100644
--- a/hosts/moyo/kernel_config
+++ b/hosts/moyo/kernel_config
@@ -1,18 +1,18 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 6.12.31-gentoo Kernel Configuration
+# Linux/x86 6.12.41-gentoo Kernel Configuration
 #
-CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.3.0 p8) 14.3.0"
+CONFIG_CC_VERSION_TEXT="gcc (Gentoo 14.3.1_p20250801 p4) 14.3.1 20250801"
 CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=140300
+CONFIG_GCC_VERSION=140301
 CONFIG_CLANG_VERSION=0
 CONFIG_AS_IS_GNU=y
-CONFIG_AS_VERSION=24400
+CONFIG_AS_VERSION=24500
 CONFIG_LD_IS_BFD=y
-CONFIG_LD_VERSION=24400
+CONFIG_LD_VERSION=24500
 CONFIG_LLD_VERSION=0
-CONFIG_RUSTC_VERSION=108700
-CONFIG_RUSTC_LLVM_VERSION=200107
+CONFIG_RUSTC_VERSION=108900
+CONFIG_RUSTC_LLVM_VERSION=200108
 CONFIG_CC_CAN_LINK=y
 CONFIG_CC_CAN_LINK_STATIC=y
 CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
@@ -21,6 +21,7 @@ CONFIG_TOOLS_SUPPORT_RELR=y
 CONFIG_CC_HAS_ASM_INLINE=y
 CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
 CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY=y
+CONFIG_RUSTC_HAS_UNNECESSARY_TRANSMUTES=y
 CONFIG_PAHOLE_VERSION=0
 CONFIG_IRQ_WORK=y
 CONFIG_BUILDTIME_TABLE_SORT=y
@@ -416,7 +417,7 @@ CONFIG_BOOT_VESA_SUPPORT=y
 CONFIG_NR_CPUS_RANGE_BEGIN=2
 CONFIG_NR_CPUS_RANGE_END=512
 CONFIG_NR_CPUS_DEFAULT=64
-CONFIG_NR_CPUS=320
+CONFIG_NR_CPUS=64
 CONFIG_SCHED_CLUSTER=y
 CONFIG_SCHED_SMT=y
 CONFIG_SCHED_MC=y
@@ -440,9 +441,8 @@ CONFIG_PERF_EVENTS_AMD_UNCORE=y
 # CONFIG_PERF_EVENTS_AMD_BRS is not set
 # end of Performance monitoring
 
-CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
-CONFIG_X86_VSYSCALL_EMULATION=y
+# CONFIG_X86_16BIT is not set
+# CONFIG_X86_VSYSCALL_EMULATION is not set
 CONFIG_X86_IOPL_IOPERM=y
 CONFIG_MICROCODE=y
 # CONFIG_MICROCODE_LATE_LOADING is not set
diff --git a/nix_archive/flake.lock b/nix_archive/flake.lock
index bdc8f63..8c1b326 100644
--- a/nix_archive/flake.lock
+++ b/nix_archive/flake.lock
@@ -15,11 +15,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1757553294,
-        "narHash": "sha256-GOdswZ7kgdrXFF3qPlCBgPaPfYYGjsJ4sOt1SblHnUA=",
+        "lastModified": 1761860722,
+        "narHash": "sha256-XeRANEYWMSN+wBvLbT0Zgtp2A84Q7Y0oSQESjWf4mtA=",
         "ref": "refs/heads/master",
-        "rev": "77837d7b63240c069b3351a919a7d2af670f46cd",
-        "revCount": 149,
+        "rev": "d4ea79a8622b6bf03555f186aeb1f5fa9283721f",
+        "revCount": 153,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -90,11 +90,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761584077,
-        "narHash": "sha256-dISPEZahlfs5K6d58zR4akRRyogfE9P4WSyPPNT7HiE=",
+        "lastModified": 1761845621,
+        "narHash": "sha256-d+R4MHsGmdebvSMsYUFWONsZSlUbOo8Zq/wjMdMiIac=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e82585308aef3d4cc2c36c7b6946051c8cdf24ef",
+        "rev": "97e3022a8d2c09313fa49847f6da4d76abcfc72d",
         "type": "github"
       },
       "original": {
@@ -110,11 +110,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1755211482,
-        "narHash": "sha256-ifly37Yij9iKGHVo0m1OaY6gKNogn8tFMPZqopOhgoQ=",
+        "lastModified": 1761860690,
+        "narHash": "sha256-SyUqzmPZwvyF1CVSbIlTTNKlF52MBh4q1PIou50L0Wo=",
         "ref": "refs/heads/master",
-        "rev": "ca800f761080289735561154f02eddb21198a876",
-        "revCount": 72,
+        "rev": "aa64ea4be134979a72312e9e645237ac4f376981",
+        "revCount": 74,
         "type": "git",
         "url": "https://git.akon.city/mauri"
       },
@@ -144,11 +144,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1760958188,
-        "narHash": "sha256-2m1S4jl+GEDtlt2QqeHil8Ny456dcGSKJAM7q3j/BFU=",
+        "lastModified": 1761827175,
+        "narHash": "sha256-XdPVSYyIBK4/ruoqujaQmmSGg3J2/EenexV9IEXhr6o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "d6645c340ef7d821602fd2cd199e8d1eed10afbc",
+        "rev": "43ffe9ac82567512abb83187cb673de1091bdfa8",
         "type": "github"
       },
       "original": {
@@ -164,11 +164,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1757427959,
-        "narHash": "sha256-p0i07rLfAMzJWYfsjFOXEtIWeS1EGVxJaCi9gfyCwRE=",
+        "lastModified": 1761563673,
+        "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "785f1b67b6c53de088f640f2a7da50ca4b2d7161",
+        "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",
         "type": "github"
       },
       "original": {
@@ -195,11 +195,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1757068644,
-        "narHash": "sha256-NOrUtIhTkIIumj1E/Rsv1J37Yi3xGStISEo8tZm3KW4=",
+        "lastModified": 1761373498,
+        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8eb28adfa3dc4de28e792e3bf49fcf9007ca8ac9",
+        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
         "type": "github"
       },
       "original": {
@@ -211,11 +211,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1761373498,
-        "narHash": "sha256-Q/uhWNvd7V7k1H1ZPMy/vkx3F8C13ZcdrKjO7Jv7v0c=",
+        "lastModified": 1761672384,
+        "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6a08e6bb4e46ff7fcbb53d409b253f6bad8a28ce",
+        "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",
         "type": "github"
       },
       "original": {
@@ -233,11 +233,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761601325,
-        "narHash": "sha256-0UtnyehKLys0HWhctZEjKN7zDe+ML0HCDdqdfHk221o=",
+        "lastModified": 1761857284,
+        "narHash": "sha256-oIt6cQrUB4VA3lgDgwptzP5P7iq0DalaqQMctYQB31k=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "378c5c7b0b2471b59b71e42b229ea5e68050235d",
+        "rev": "abbcf2d95f63db25ae8c6cfd331bbab3b97d962a",
         "type": "github"
       },
       "original": {
diff --git a/nix_archive/hosts/palm/programs.nix b/nix_archive/hosts/palm/programs.nix
index 493653b..cd996a4 100644
--- a/nix_archive/hosts/palm/programs.nix
+++ b/nix_archive/hosts/palm/programs.nix
@@ -7,9 +7,9 @@
     (asNeeded "imv" ["imv"])
     (asNeeded "mpv" ["mpv"])
     (asNeeded "steam-run" ["steam-run"])
-    #camu
-    #camu-devshell
-    #mauri
+    camu
+    camu-devshell
+    mauri
   ];
   local.scripts.imports = [
     "battery"
diff --git a/nix_archive/hosts/sofue/programs.nix b/nix_archive/hosts/sofue/programs.nix
index d964fbf..314f96c 100644
--- a/nix_archive/hosts/sofue/programs.nix
+++ b/nix_archive/hosts/sofue/programs.nix
@@ -19,9 +19,9 @@
     (asNeeded "imv" ["imv"])
     (asNeeded "mpv" ["mpv"])
     (asNeeded "vlc" ["vlc"])
-    #camu
-    #camu-devshell
-    #mauri
+    camu
+    camu-devshell
+    mauri
   ];
   local.scripts.imports = [
     "discord-wayland"
diff --git a/nix_archive/nix/programs/firefox.nix b/nix_archive/nix/programs/firefox.nix
index c485e49..61f19cc 100644
--- a/nix_archive/nix/programs/firefox.nix
+++ b/nix_archive/nix/programs/firefox.nix
@@ -3,7 +3,7 @@ let
   colo = config.local.scheme;
 in {
   environment.systemPackages = with pkgs; [
-    firefox-wayland
+    firefox
   ];
   environment.sessionVariables = {
     BROWSER = "firefox";
diff --git a/nix_archive/nix/system.nix b/nix_archive/nix/system.nix
index 92b95df..7aaebe6 100644
--- a/nix_archive/nix/system.nix
+++ b/nix_archive/nix/system.nix
@@ -78,7 +78,7 @@
     enable = true;
     extraPackages = with pkgs; [
       libvdpau-va-gl
-      vaapiVdpau
+      libva-vdpau-driver
     ];
   };
 
diff --git a/nix_archive/nix/user.nix b/nix_archive/nix/user.nix
index 3c78a18..360f53d 100644
--- a/nix_archive/nix/user.nix
+++ b/nix_archive/nix/user.nix
@@ -19,9 +19,8 @@ in {
     fontDir.enable = true;
     packages = with pkgs; [
       local-fonts
-      vistafonts
+      vista-fonts
       noto-fonts
-      noto-fonts-extra
       noto-fonts-cjk-sans
       noto-fonts-cjk-serif
       noto-fonts-emoji-blob-bin