Misc updatesHEADmaster

12 files changed, 106 insertions, 55 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