Misc updatesHEADmaster

26 files changed, 221 insertions, 120 deletions

diff --git a/files/firefox/user-overrides.js b/files/firefox/user-overrides.js
index 81e98ff..d291cdf 100644
--- a/files/firefox/user-overrides.js
+++ b/files/firefox/user-overrides.js
@@ -60,6 +60,9 @@ user_pref("mousebutton.5th.enabled", false);
 // Disable tab groups.
 user_pref("browser.tabs.groups.enabled", false);
 
+// Disable split view.
+user_pref("browser.tabs.splitView.enabled", false);
+
 // Good smooth-scrolling.
 user_pref("general.smoothScroll.mouseWheel.durationMaxMS", 250);
 user_pref("general.smoothScroll.mouseWheel.durationMinMS", 250);
@@ -126,3 +129,9 @@ user_pref("browser.tabs.hoverPreview.showThumbnails", false);
 
 // Disable AI sidebar..
 user_pref("sidebar.revamp", false);
+
+// Disable nova.
+user_pref("browser.nova.enabled", false);
+user_pref("browser.aboutaddons.novaThemesPickerEnabled", false);
+user_pref("browser.newtabpage.activity-stream.nova.enabled", false);
+user_pref("pdfjs.enableNova", false);
diff --git a/files/gaming/MangoHud.conf b/files/gaming/MangoHud.conf
index d054aa4..0eef374 100644
--- a/files/gaming/MangoHud.conf
+++ b/files/gaming/MangoHud.conf
@@ -1,4 +1,5 @@
 #legacy_layout=0
+#vsync=2
 cpu_temp
 cpu_mhz
 ram
diff --git a/files/shell/bashrc b/files/shell/bashrc
index a5a4000..8b893b0 100644
--- a/files/shell/bashrc
+++ b/files/shell/bashrc
@@ -27,7 +27,7 @@ alias top='htop'
 alias pgrep='pgrep -f'
 alias python='python -q'
 alias bc='bc -l'
-alias make='make -j6'
+alias make='make -j12'
 alias diff='diff -u'
 alias mail='mutt'
 alias iroha='ssh andrew@iroha'
diff --git a/files/shell/profile b/files/shell/profile
index f4cd2f2..be4e612 100644
--- a/files/shell/profile
+++ b/files/shell/profile
@@ -1,13 +1,15 @@
 export PATH="$PATH:$HOME/.local/bin"
+
+SSH_AGENT_PID=""
+SSH_AUTH_SOCK="${XDG_RUNTIME_DIR}/gnupg/S.gpg-agent.ssh"
 export GPG_TTY=$(tty)
-unset SSH_AGENT_PID
-if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
-  export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
-fi
-export PYTHON_HISTORY=/tmp/python_history
+gpg-connect-agent updatestartuptty /bye >/dev/null
+
 # Why aren't these set? elogind?
 # https://wiki.gentoo.org/wiki/Configuring_a_system_without_elogind
 export XDG_CACHE_HOME="/mnt/ssd/cache"
 #export XDG_CONFIG_HOME="${HOME}/.config"
 #export XDG_DATA_HOME="${HOME}/.local/share"
 #export XDG_STATE_HOME="${HOME}/.local/state"
+
+export PYTHON_HISTORY=/tmp/python_history
diff --git a/files/sway/config b/files/sway/config
index 102f69b..c2949fd 100644
--- a/files/sway/config
+++ b/files/sway/config
@@ -110,7 +110,6 @@ client.urgent           $urgent   $urgent  $fg   $urgent    $urgent
 client.placeholder      $bg       $bg      $fg   $bg        $bg
 client.background       $bg
 
-#seat * hide_cursor when-typing enable
 exec_always swaymsg 'seat * hide_cursor 4000'
 
 exec dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK MAIN_MONITOR
diff --git a/files/sway/monitors b/files/sway/monitors
index 94f0ddf..602129b 100644
--- a/files/sway/monitors
+++ b/files/sway/monitors
@@ -1,3 +1,3 @@
-set $monitor1 DP-1
-set $monitor2 HDMI-A-1
+set $monitor1 HDMI-A-1
+set $monitor2 DP-1
 set $monitor3 HDMI-A-2
diff --git a/files/sway/vrr_fullscreen.sh b/files/sway/vrr_fullscreen.sh
new file mode 100755
index 0000000..0db4e10
--- /dev/null
+++ b/files/sway/vrr_fullscreen.sh
@@ -0,0 +1,29 @@
+#! /usr/bin/env bash
+
+# https://github.com/swaywm/sway/issues/5076#issuecomment-1753499364
+
+output_vrr_whitelist=("$(awk -F ' ' 'NR==1{print $3}' $HOME/.config/sway/monitors)")
+
+swaymsg -t subscribe -m '[ "window" ]' | while read window_json; do
+  app_id=$(echo ${window_json} | jq -r '.container.app_id')
+  if [[ $app_id == "com.moonlight_stream.Moonlight" || $app_id == "Waydroid" ]]; then
+    continue
+  fi
+  window_event=$(echo ${window_json} | jq -r '.change')
+  if [[ $window_event = "focus" || $window_event = "fullscreen_mode" ]]; then
+    output_json=$(swaymsg -t get_outputs | jq -r '.[] | select(.focused == true)')
+    output_name=$(echo ${output_json} | jq -r '.name')
+    if [[ ${output_vrr_whitelist[*]} =~ ${output_name} ]]; then
+      output_vrr_status=$(echo ${output_json} | jq -r '.adaptive_sync_status')
+      window_fullscreen_status=$(echo ${window_json} | jq -r '.container.fullscreen_mode')
+      if [[ $output_vrr_status = "disabled" && $window_fullscreen_status = "1" ]]; then
+        swaymsg output "${output_name}" adaptive_sync 1
+        swaymsg 'seat * hide_cursor 0'
+      fi
+      if [[ $output_vrr_status = "enabled" && $window_fullscreen_status = "0" ]]; then
+        swaymsg output "${output_name}" adaptive_sync 0
+        swaymsg 'seat * hide_cursor 4000'
+      fi
+    fi
+  fi
+done
diff --git a/files/sway/window_rules b/files/sway/window_rules
index 22d5138..5a1e40c 100644
--- a/files/sway/window_rules
+++ b/files/sway/window_rules
@@ -10,9 +10,8 @@ for_window [app_id=mpv] floating enable
 for_window [app_id=Waydroid] floating enable
 for_window [title=Parsec] inhibit_idle fullscreen
 for_window [class=streaming_client] inhibit_idle fullscreen
-#for_window [class=steam_app_.*] inhibit_idle fullscreen, allow_tearing yes
 for_window [class=steam_app_.*] inhibit_idle fullscreen
-for_window [app_id=monsterhunterworld.exe] inhibit_idle fullscreen
+for_window [app_id=monsterhunterworld.exe] inhibit_idle fullscreen, allow_tearing yes
 for_window [app_id=gamescope] inhibit_idle fullscreen, allow_tearing yes, floating enable
 for_window [class=.gamescope-wrapped] inhibit_idle fullscreen, allow_tearing yes
 for_window [app_id=osu!] inhibit_idle fullscreen, allow_tearing yes
diff --git a/files/vim/plugin/qname.1.2.vim b/files/vim/plugin/qname.1.2.vim
index 4e81318..ea31154 100644
--- a/files/vim/plugin/qname.1.2.vim
+++ b/files/vim/plugin/qname.1.2.vim
@@ -29,7 +29,7 @@
 "   Treat <S-BS> the same as <BS>
 "  2025-11-04:
 "   Open selected buffer in the current window, even if the same buffer is
-"   already open in another window.
+"   already open in another window
 "
 " 1.2	2013-01-03
 " ADD: <Tab> and <S-Tab> moves selection like <Up> and <Down>
diff --git a/files/vim/vimrc b/files/vim/vimrc
index 90d3646..61280c9 100644
--- a/files/vim/vimrc
+++ b/files/vim/vimrc
@@ -1,13 +1,16 @@
 " @TODO:
 "  - CullSubprojects from sessions command.
-"  - vim82 compat.
+"  - :checktime on open same file instead of nothing?
+"  - https://codeberg.org/dnkl/foot/wiki#vim
+"  - Are sessions bloat?
+"  - Actually make Hello.
 
 " Basic settings.
 set nocompatible
 set number
 " showmode too often puts the cursor on the bottom line, this can make
 " kitty's cursor_trail way too jumpy.
-set noshowmode
+"set noshowmode
 "set signcolumn=yes
 set updatetime=250
 set scrolloff=5
@@ -24,7 +27,7 @@ set shortmess-=S
 set splitright
 set splitbelow
 " Stop buffers from jumping when opening buffer selection.
-set splitkeep=screen
+"set splitkeep=screen
 
 colo lil_pablo
 
@@ -51,12 +54,16 @@ set expandtab
 set autoindent
 
 " C syntax preference.
-let g:c_syntax_for_h=1
-let g:c_no_curly_error=1
-let g:c_function_pointers=1
+let g:c_syntax_for_h = 1
+let g:c_no_curly_error = 1
+let g:c_function_pointers = 1
 set cinoptions=:0,=4,l1,g2,h2,(4,u4,+4,m1,j1,J1
 set cindent
 
+" C# syntax tuning (for performance).
+let g:cs_raw_string_quote_count = 7
+let g:cs_raw_string_interpolation_brace_count = 6
+
 " Set different format for mail and text files.
 set nowrap nolinebreak nolist formatoptions=l textwidth=0
 au FileType mail,text setlocal wrap formatoptions=l textwidth=0
@@ -67,7 +74,7 @@ set wildmenu
 
 " Set titlebar.
 set title
-au BufEnter * let &titlestring=expand("%:t")
+au BufEnter * let &titlestring = expand("%:t")
 
 " https://github.com/csdvrx/CuteVim/blob/main/.vimrc
 " Allow distinguishing <C-i> from <Tab> in bindings.
@@ -84,7 +91,7 @@ au BufEnter * let &titlestring=expand("%:t")
 set clipboard=unnamedplus
 
 " Session options.
-set ssop=curdir,skiprtp,blank,buffers,folds,winsize,terminal
+"set ssop=curdir,skiprtp,blank,buffers,folds,winsize,terminal
 set vop-=curdir
 
 " Move ~/.viminfo.
@@ -108,14 +115,14 @@ if isdirectory(expand("~/c"))
   if !isdirectory(swap_dir)
     call mkdir(swap_dir, "p", 0755)
   endif
-  let &directory=swap_dir
+  let &directory = swap_dir
 
   if has("persistent_undo")
     let undo_dir = expand("~/c/sessions/undo//")
     if !isdirectory(undo_dir)
       call mkdir(undo_dir, "p", 0755)
     endif
-    let &undodir=undo_dir
+    let &undodir = undo_dir
     set undofile
   endif
 
@@ -127,28 +134,28 @@ if isdirectory(expand("~/c"))
       call mkdir(backup_dir, "p", 0755)
     endif
   endif
-  let &backupdir=backup_dir
+  let &backupdir = backup_dir
   set backup
 endif
 
-set autocomplete
-set complete=.^4,w^2,b^2
-set completeopt+=menu,menuone,popup,noinsert,noselect
+"set autocomplete
+"set complete=.^4,w^2,b^2
+"set completeopt+=menu,menuone,popup,noinsert,noselect
 
 " Plugins.
 let g:fugitive_no_maps = 1
 set diffopt+=vertical
 packadd vim-fugitive
 packadd vim-gitbranch
-packadd vim-asciidoc-folding
+"packadd vim-asciidoc-folding
 packadd Colorizer
 "if !empty($NIX_SHELL)
 "  packadd lsp
 "  call LspAddServer([#{
-"  \  name: 'clangd',
-"  \  filetype: ['c', 'cpp'],
-"  \  path: 'clangd',
-"  \  args: ['--background-index']
+"  \  name: "clangd",
+"  \  filetype: ["c", "cpp"],
+"  \  path: "clangd",
+"  \  args: ["--background-index"]
 "  \}])
 "endif
 
@@ -162,7 +169,7 @@ function! Statusline() abort
   let focused = g:statusline_winid == win_getid(winnr())
   let status = focused ? "%#StatusLine#" : "%#StatusLineNC#"
   let status .= "%{StatuslineGit()}"
-  let status .= " %{expand('%:~:.')}" " Explicitly expand to relative file, %f was flaky.
+  let status .= " %{expand(\"%:~:.\")}" " Explicitly expand to relative file, %f was flaky.
   let status .= "  vim@%{hostname()}"
   let status .= "%="
   let status .= " %y"
@@ -198,6 +205,9 @@ nnoremap <silent> <C-l> :wincmd l<CR>
 " Make ctrl + "." and "," map to previous buffer.
 nmap <C-,> <C-^>
 nmap <C-.> <C-^>
+" Delete buffer but don't close split.
+" https://stackoverflow.com/a/19619038
+nmap <C-S-,> :b#<bar>bd#<CR>
 " Personally intuitive pop-up menu binds.
 inoremap <expr> <CR> pumvisible() ? "<C-y><CR>" : "<CR>"
 inoremap <expr> <Up> pumvisible() ? "<C-p>" : "<Up>"
@@ -220,7 +230,9 @@ function OpenBasedOnRelativeArgument(A, CMD)
   if arg != ""
     let arg = (arg[0] == "/" ? arg : resolve(fnamemodify(expand("%:h")."/".arg, ":p")))
   endif
-  if a:CMD == "EDIT"
+  if arg == resolve(expand("%"))
+    " On an attempt to open the same file as the current buffer, do nothing.
+  elseif a:CMD == "EDIT"
     exe "edit" arg
   elseif a:CMD == "VERTICAL_SPLIT"
     exe "vsplit" arg
@@ -276,14 +288,14 @@ command Hex :%!xxd
 command Unhex :%!xxd -r
 
 " https://stackoverflow.com/a/27721306
-command -nargs=+ Ggr exe "silent Ggrep!" <q-args> | botright cwindow | redraw!
+command -nargs=+ Ggr let s:grep_dir=expand("%:p:h") | exe "silent Ggrep!" <q-args> | botright cwindow | exe "lcd " . s:grep_dir | redraw!
 " I had this mapped to <C-i> for the longest time. Sadly with OG vim
 " (not neovim) the fix for mapping <Tab> and <C-i> seperately doesn't work.
 " Changing this bind as the only concession to be compatible with vim
 " seems well worth it.
 nnoremap <C-o> :Ggr 
 
-command GrepWhitespace :Ggr '[[:blank:]]$'
+command GrepWhitespace :Ggr "[[:blank:]]$"
 
 " https://vi.stackexchange.com/a/456
 function! TrimWhitespace()
diff --git a/files/vim/vimrc_root b/files/vim/vimrc_root
new file mode 100644
index 0000000..3d5918c
--- /dev/null
+++ b/files/vim/vimrc_root
@@ -0,0 +1,4 @@
+set notermguicolors
+" https://vi.stackexchange.com/a/45012
+autocmd! ColorScheme default set t_Co=16
+colo default
diff --git a/files/waydroid/waydroid.cfg b/files/waydroid/waydroid.cfg
index ef6ddc6..f25869e 100644
--- a/files/waydroid/waydroid.cfg
+++ b/files/waydroid/waydroid.cfg
@@ -1,21 +1,28 @@
 [waydroid]
 arch = x86_64
 vendor_type = MAINLINE
-system_datetime = 1754733814
-vendor_datetime = 1754691693
+system_datetime = 0
+vendor_datetime = 0
 suspend_action = freeze
 mount_overlays = True
-auto_adb = True
+auto_adb = False
 images_path = /var/lib/waydroid/images
 binder = binder
 vndbinder = vndbinder
 hwbinder = hwbinder
-system_ota = https://ota.waydro.id/system/lineage/waydroid_x86_64/GAPPS.json
-vendor_ota = https://ota.waydro.id/vendor/waydroid_x86_64/MAINLINE.json
+system_ota = None
+vendor_ota = None
 binder_protocol = aidl3
 service_manager_protocol = aidl3
 
 [properties]
+ro.product.cpu.abilist = x86_64,x86,arm64-v8a,armeabi-v7a,armeabi
+ro.product.cpu.abilist32 = x86,armeabi-v7a,armeabi
+ro.product.cpu.abilist64 = x86_64,arm64-v8a
+ro.dalvik.vm.native.bridge = libhoudini.so
+ro.enable.native.bridge.exec = 1
+ro.dalvik.vm.isa.arm = x86
+ro.dalvik.vm.isa.arm64 = x86_64
 ro.product.brand = google
 ro.product.manufacturer = Google
 ro.product.device = komodo
@@ -35,8 +42,8 @@ ro.vendor.build.id = BP2A.250705.008
 ro.vendor.build.tags = release-keys
 ro.vendor.build.type = user
 ro.odm.build.tags = release-keys
-ro.boot.verifiedbootstate = green
-ro.boot.flash.locked = 1
+settings.secure.android_id =
+settings.secure.gsf_id =
 ro.kernel.qemu = 0
 ro.secure = 1
 ro.adb.secure = 1
@@ -44,17 +51,6 @@ ro.debuggable = 0
 ro.build.selinux = 1
 ro.secureboot.enable = 1
 ro.boot.selinux = enforcing
-persist.sys.usb.config = none
-persist.service.adb.enable = 0
-settings.secure.android_id = 5adea3426167354a
-settings.secure.gsf_id = 127237629
-persist.graphics.vulkan.disable = false
-persist.vulkan.enabled = 1
-ro.product.cpu.abilist = x86_64,x86,arm64-v8a,armeabi-v7a,armeabi
-ro.product.cpu.abilist32 = x86,armeabi-v7a,armeabi
-ro.product.cpu.abilist64 = x86_64,arm64-v8a
-ro.dalvik.vm.native.bridge = libhoudini.so
-ro.enable.native.bridge.exec = 1
-ro.dalvik.vm.isa.arm = x86
-ro.dalvik.vm.isa.arm64 = x86_64
+ro.boot.verifiedbootstate = green
+ro.boot.flash.locked = 1
 
diff --git a/hosts/iroha/scripts/disable-rgb b/hosts/iroha/scripts/disable-rgb
index bc05f79..427b874 100755
--- a/hosts/iroha/scripts/disable-rgb
+++ b/hosts/iroha/scripts/disable-rgb
@@ -1,3 +1,4 @@
 #! /usr/bin/env sh
 #su -c 'modprobe i2c-dev && openrgb -d 0 -m off && openrgb -d 1 -m off && openrgb -d 2 -m off && openrgb -d 3 -m off'
-su -c 'modprobe i2c-dev && openrgb -d 0 -m off && openrgb -d 1 -m off'
+#su -c 'modprobe i2c-dev && openrgb -d 0 -m off && openrgb -d 1 -m off'
+su -c 'modprobe i2c-dev && openrgb -p /home/andrew/.config/OpenRGB/iroha.orp'
diff --git a/hosts/iroha/stow.txt b/hosts/iroha/stow.txt
index 511588a..3be4bf2 100644
--- a/hosts/iroha/stow.txt
+++ b/hosts/iroha/stow.txt
@@ -14,6 +14,7 @@ UNLINK: .config/mako
 UNLINK: .config/pipewire
 UNLINK: .config/sway
 UNLINK: .config/user-dirs.dirs
+UNLINK: .extract_urlview
 UNLINK: .gitconfig
 UNLINK: .gtkrc-2.0
 UNLINK: .local/bin/7z-password
@@ -73,7 +74,7 @@ LINK: .config/mako => ../c/dotfiles/hosts/iroha/stow/.config/mako (reverts previ
 LINK: .config/pipewire => ../c/dotfiles/hosts/iroha/stow/.config/pipewire (reverts previous action)
 LINK: .config/sway => ../c/dotfiles/hosts/iroha/stow/.config/sway (reverts previous action)
 LINK: .config/user-dirs.dirs => ../c/dotfiles/hosts/iroha/stow/.config/user-dirs.dirs (reverts previous action)
-LINK: .extract_urlview => c/dotfiles/hosts/iroha/stow/.extract_urlview
+LINK: .extract_urlview => c/dotfiles/hosts/iroha/stow/.extract_urlview (reverts previous action)
 LINK: .gitconfig => c/dotfiles/hosts/iroha/stow/.gitconfig (reverts previous action)
 LINK: .gtkrc-2.0 => c/dotfiles/hosts/iroha/stow/.gtkrc-2.0 (reverts previous action)
 LINK: .local/bin/7z-password => ../../c/dotfiles/hosts/iroha/stow/.local/bin/7z-password (reverts previous action)
diff --git a/hosts/iroha/stow/.config/sway/scripts/vrr_fullscreen.sh b/hosts/iroha/stow/.config/sway/scripts/vrr_fullscreen.sh
new file mode 120000
index 0000000..9eb11e5
--- /dev/null
+++ b/hosts/iroha/stow/.config/sway/scripts/vrr_fullscreen.sh
@@ -0,0 +1 @@
+../../../../../../files/sway/vrr_fullscreen.sh
\ No newline at end of file
diff --git a/hosts/iroha/sway_input_output b/hosts/iroha/sway_input_output
index ce992ae..c695d31 100644
--- a/hosts/iroha/sway_input_output
+++ b/hosts/iroha/sway_input_output
@@ -32,7 +32,7 @@ input "1133:50504:Logitech_USB_Receiver_Mouse" {
   scroll_factor 1.0
 }
 
-input "1386:890:Wacom_One_by_Wacom_S_Pen" {
+input "1386:890:Wacom_Co.,Ltd._CTL-472_Mouse" {
   events disabled
 #  map_to_output = "DP-1";
 #  left_handed = "enabled";
@@ -40,34 +40,28 @@ input "1386:890:Wacom_One_by_Wacom_S_Pen" {
 
 include ../monitors
 
-output $monitor1 {
-  mode 2560x1440@120.000Hz
-  subpixel rgb
-  position 1080 200
+output * {
   allow_tearing yes
   max_render_time off
-  adaptive_sync on
   #render_bit_depth 10
 }
 
-output $monitor2 {
-  mode 1920x1080@60.000Hz
-  subpixel vrgb
-  transform 270
+output $monitor1 {
+  mode 2560x1440@119.998Hz
+  #subpixel rgb
   position 0 0
-  allow_tearing yes
-  max_render_time off
-  #render_bit_depth 10
+  render_bit_depth 10
+  hdr off
+  adaptive_sync off
 }
 
-#output $monitor3 {
+#output $monitor2 {
 #  mode 1920x1080@60.000Hz
 #  subpixel rgb
-#  position 0 1000
-#  allow_tearing yes
-#  max_render_time off
-#  #render_bit_depth 10
+#  position 2560 1000
 #}
 
+exec_always ~/.config/sway/scripts/vrr_fullscreen.sh
+
 bindsym $mod4+r exec swaymsg -- output $monitor1 transform 90
 bindsym $mod4+Shift+r exec swaymsg -- output $monitor1 transform 0
diff --git a/hosts/station/cgit/custom.css b/hosts/station/cgit/custom.css
index 2349906..2c79cb8 100644
--- a/hosts/station/cgit/custom.css
+++ b/hosts/station/cgit/custom.css
@@ -15,7 +15,7 @@
   --accent2:    #edece6;
   --accent3:    #f6f6f0;
   --green:      #5bd154;
-  --red:        #d95988;
+  --red:        #e38bac;
   --yellow:     #f1ed73;
   --blue:       #51a2be;
 }
@@ -85,6 +85,7 @@ p code {
 
 div#cgit a.tag-annotated-deco {
   color: var(--black);
+  font-weight: normal;
   margin: 0px 0.5em;
   padding: 0px 0.25em;
   border: solid 1px var(--black);
@@ -199,6 +200,7 @@ div#cgit table.list tr.nohover-highlight:hover:nth-child(even) {
 
 div#cgit a.deco {
   background-color: var(--red);
+  font-weight: normal;
   border: solid 1px var(--black);
 }
 
@@ -208,6 +210,7 @@ div#cgit a:hover.deco {
 
 div#cgit a.branch-deco {
   background-color: var(--green);
+  font-weight: normal;
   border: solid 1px var(--black);
 }
 
diff --git a/nix_archive/flake.lock b/nix_archive/flake.lock
index 7cd61bd..d67cb57 100644
--- a/nix_archive/flake.lock
+++ b/nix_archive/flake.lock
@@ -10,16 +10,14 @@
           "nixos-hardware"
         ],
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1776119159,
-        "narHash": "sha256-9HiqDiptdmTUM5NoJ6h0wnneXUrnVXyflC2mymBcGRQ=",
+        "lastModified": 1783711061,
+        "narHash": "sha256-KB3356Ft/KNxAo1paF5RI/+QamttA92nm2YSY4Bjpmo=",
         "ref": "refs/heads/master",
-        "rev": "22d3be9264087ed80d034df0e805bd8101a7d381",
-        "revCount": 165,
+        "rev": "da9bddc70ff8544f3294b880d719c4605e87ad97",
+        "revCount": 172,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -90,11 +88,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779202205,
-        "narHash": "sha256-UFt7q51IIhBzo1L+4MqNNljIrMOtrrjiT4vrOmz+wDA=",
+        "lastModified": 1786487128,
+        "narHash": "sha256-ad60hrRVhH/bo3Jl1YLzO+QcS3mUNZr9LNJdzhMO2P4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "16663cb13826d6aa519fb8c622460e3ce2a04dc1",
+        "rev": "f404edbfa4117810c96b97048299242fc50e5362",
         "type": "github"
       },
       "original": {
@@ -110,11 +108,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764640700,
-        "narHash": "sha256-WNNK2hZt54+3VM6n4Tac4w/ilE5Ov40E/dinlzOG8is=",
+        "lastModified": 1779209856,
+        "narHash": "sha256-aIekyxRFy0TT5F4L5YifRJkScZIskOcT2rjPuQdUM8k=",
         "ref": "refs/heads/master",
-        "rev": "596a2a0f86800ce2bdee55f1fffdede7d64d64c0",
-        "revCount": 78,
+        "rev": "8ec05d47840f7064945b48312579911ed06614a1",
+        "revCount": 80,
         "type": "git",
         "url": "https://git.akon.city/mauri"
       },
@@ -143,12 +141,15 @@
       }
     },
     "nixos-hardware": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_4"
+      },
       "locked": {
-        "lastModified": 1779099457,
-        "narHash": "sha256-u73aVD/lUmmT3JV+kPDztl7zPwQKd0eobD1AbJltaGs=",
+        "lastModified": 1786437054,
+        "narHash": "sha256-I++HzBBAgQ17UaLVU6aSm1/7LDo6c9xr8rAbpByWywE=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "8792fab9d4a6454a9201675f01326f827ce35ead",
+        "rev": "6ed13b1d888d5cb07dbb0723eb1df86bbacd0b9c",
         "type": "github"
       },
       "original": {
@@ -164,11 +165,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1774972752,
-        "narHash": "sha256-DnLIpFxznohpLkIFs390uZ0gxwkVyhtknhKNu+lQJK8=",
+        "lastModified": 1783336371,
+        "narHash": "sha256-ZisTtweyb7JUwPP54HAXE9TypT8m89dIxDI36Ak0hAs=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "d97e078f4788cddb8d11c3c99f72a4bb9ddec221",
+        "rev": "a9620cfa43f0c1c30a46c31ae3c6e58cdb124a14",
         "type": "github"
       },
       "original": {
@@ -195,11 +196,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1773734432,
-        "narHash": "sha256-IF5ppUWh6gHGHYDbtVUyhwy/i7D261P7fWD1bPefOsw=",
+        "lastModified": 1780243769,
+        "narHash": "sha256-x5UQuRsH3MqI0U9afaXSNqzTPSeZlRLvFAav2Ux1pNw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cda48547b432e8d3b18b4180ba07473762ec8558",
+        "rev": "331800de5053fcebacf6813adb5db9c9dca22a0c",
         "type": "github"
       },
       "original": {
@@ -211,11 +212,40 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1778869304,
-        "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=",
+        "lastModified": 1783224372,
+        "narHash": "sha256-8i/87eeoqiGE4yOTjwSA3Eh/ziJRQEmd/unYU+K27sk=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d407951447dcd00442e97087bf374aad70c04cea",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1767892417,
+        "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=",
+        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
+        "type": "tarball",
+        "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
+        "lastModified": 1786384358,
+        "narHash": "sha256-RzPPiWeUtuvymnpuEWsdtzli5w4kjZs49FqEs3/1u+I=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d233902339c02a9c334e7e593de68855ad26c4cb",
+        "rev": "2fcb964de67fcf60b43471c55d5d99e61a9ccb5a",
         "type": "github"
       },
       "original": {
@@ -233,11 +263,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1779198268,
-        "narHash": "sha256-v83Ri37cD4f4cfYuXm9XhUavcp7UJmOiypAafi64/NA=",
+        "lastModified": 1786493247,
+        "narHash": "sha256-TIZjK2XM7yjA9jGjTP+DrcVP1FRLwO1E9ZoU9Lezlo4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "25413609751dd974d5c21c74241a9309b892d0ec",
+        "rev": "a78633d3281f5e95c769b1c72bfab7f821911f08",
         "type": "github"
       },
       "original": {
@@ -252,7 +282,7 @@
         "home-manager": "home-manager",
         "mauri": "mauri",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_5",
         "nur": "nur"
       }
     },
diff --git a/nix_archive/flake.nix b/nix_archive/flake.nix
index ca1992f..a852899 100644
--- a/nix_archive/flake.nix
+++ b/nix_archive/flake.nix
@@ -19,7 +19,7 @@
     #};
     camu = {
       url = "git+https://git.akon.city/camu";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
       inputs.nixos-hardware.follows = "nixos-hardware";
     };
diff --git a/nix_archive/hosts/palm/configuration.nix b/nix_archive/hosts/palm/configuration.nix
index 9fd4ebc..380c6d8 100644
--- a/nix_archive/hosts/palm/configuration.nix
+++ b/nix_archive/hosts/palm/configuration.nix
@@ -133,7 +133,7 @@ in {
       allowedTCPPorts = [];
     };
     extraHosts = ''
-      192.168.1.153 iroha
+      192.168.1.182 iroha
       192.168.1.158 moyo
       66.135.26.42 rod
     '';
@@ -187,7 +187,7 @@ in {
             allow_tearing = "no";
             max_render_time = "10";
             scale = "2";
-            bg = "${../../themes/year_of_snake/wallpaper.png} fit";
+            bg = "#${colo.background-alt} solid_color";
           };
           "${monitor2}" = {
             mode = "1024x768@60.004Hz";
diff --git a/nix_archive/nix/programs/waydroid.nix b/nix_archive/nix/programs/waydroid.nix
index af0c207..4410be5 100644
--- a/nix_archive/nix/programs/waydroid.nix
+++ b/nix_archive/nix/programs/waydroid.nix
@@ -1,3 +1,6 @@
-{ ... }: {
-  virtualisation.waydroid.enable = true;
+{ pkgs, ... }: {
+  virtualisation.waydroid = {
+    package = pkgs.waydroid-nftables;
+    enable = true;
+  };
 }
diff --git a/nix_archive/nix/user.nix b/nix_archive/nix/user.nix
index 7dd53cc..f71cf62 100644
--- a/nix_archive/nix/user.nix
+++ b/nix_archive/nix/user.nix
@@ -63,6 +63,7 @@ in {
     bc
     screen
     loccount
+    asciidoctor-with-extensions
     (aspellWithDicts (dicts: with dicts; [ en en-computers en-science ]))
     rsync
     (python3.withPackages (python-pkgs: [ python-pkgs.requests python-pkgs.beautifulsoup4 ]))
diff --git a/scripts/desktop/7z-password b/scripts/desktop/7z-password
index 30d843c..711cdb5 100755
--- a/scripts/desktop/7z-password
+++ b/scripts/desktop/7z-password
@@ -1,2 +1,2 @@
 #! /usr/bin/env sh
-7z a -p -mhe=on $@
+7z a -p -snl -mhe=on $@
diff --git a/scripts/desktop/proton-env b/scripts/desktop/proton-env
index 4c87487..4652d0b 100755
--- a/scripts/desktop/proton-env
+++ b/scripts/desktop/proton-env
@@ -11,15 +11,23 @@ export PROTON_WAYLAND_MONITOR=$MAIN_MONITOR
 export DXVK_HUD=compiler
 export DXVK_LOG_LEVEL=none
 export DXVK_DEBUG=none
+export DXVK_CONFIG="dxvk.enableDescriptorHeap = True;"
 
 export VKD3D_DEBUG=none
 export VKD3D_SHADER_DEBUG=none
+export VKD3D_CONFIG=descriptor_heap
+
+export RADV_EXPERIMENTAL=heap
 
 unset SDL_VIDEODRIVER
 unset SDL_VIDEO_DRIVER
 
-if [[ ! -z $DISPLAY_MODE_60HZ ]]; then
-  swaymsg "output $MAIN_MONITOR mode 2560x1440@60.000Hz"
+if [[ $DISPLAY_MODE_60HZ == 1 ]]; then
+  swaymsg "output $MAIN_MONITOR mode 2560x1440@59.951Hz"
+fi
+
+if [[ $DISPLAY_MODE_HDR == 1 ]]; then
+  swaymsg "output $MAIN_MONITOR hdr on"
 fi
 
 xrandr --output $MAIN_MONITOR --primary
@@ -34,6 +42,10 @@ fi
 
 scxctl stop
 
-if [[ ! -z $DISPLAY_MODE_60HZ ]]; then
-  swaymsg "output $MAIN_MONITOR mode 2560x1440@144.000Hz"
+if [[ $DISPLAY_MODE_HDR == 1 ]]; then
+  swaymsg "output $MAIN_MONITOR hdr off"
+fi
+
+if [[ $DISPLAY_MODE_60HZ == 1 ]]; then
+  swaymsg "output $MAIN_MONITOR mode 2560x1440@119.998Hz"
 fi
diff --git a/scripts/desktop/proton-env32 b/scripts/desktop/proton-env32
index 6b69976..025506e 100755
--- a/scripts/desktop/proton-env32
+++ b/scripts/desktop/proton-env32
@@ -9,9 +9,13 @@ export PROTON_WAYLAND_MONITOR=$MAIN_MONITOR
 export DXVK_HUD=compiler
 export DXVK_LOG_LEVEL=none
 export DXVK_DEBUG=none
+export DXVK_CONFIG="dxvk.enableDescriptorHeap = True;"
 
 export VKD3D_DEBUG=none
 export VKD3D_SHADER_DEBUG=none
+export VKD3D_CONFIG=descriptor_heap
+
+export RADV_EXPERIMENTAL=heap
 
 unset SDL_VIDEODRIVER
 unset SDL_VIDEO_DRIVER
diff --git a/themes/iroha/sway/theme b/themes/iroha/sway/theme
index 6092cd7..df603f4 100644
--- a/themes/iroha/sway/theme
+++ b/themes/iroha/sway/theme
@@ -14,13 +14,13 @@ set $wallpaperV "~/c/dotfiles/themes/iroha/wallpaper/wallpaper_vert.png"
 include ../monitors
 
 output $monitor1 {
-  bg $wallpaper1 fill
-  #bg $c1 solid_color
+  #bg $wallpaper1 fill
+  bg $c1 solid_color
 }
 
 output $monitor2 {
-  bg $wallpaperV fill
-  #bg $c1 solid_color
+  #bg $wallpaperV fill
+  bg $c1 solid_color
 }
 
 bindsym --no-repeat $mod4+F1 output $monitor1 bg $wallpaper1 fill