updates from work

15 files changed, 68 insertions, 24 deletions

diff --git a/.config/coc/extensions/package.json b/.config/coc/extensions/package.json
index bde07e1..cad168a 100644
--- a/.config/coc/extensions/package.json
+++ b/.config/coc/extensions/package.json
@@ -17,5 +17,5 @@
   },
   "disabled": [],
   "locked": [],
-  "lastUpdate": 1755852809949
+  "lastUpdate": 1760374931571
 }
\ No newline at end of file
diff --git a/.config/firefox/chrome/userChrome.css b/.config/firefox/chrome/userChrome.css
index b6c58f8..330b18e 100644
--- a/.config/firefox/chrome/userChrome.css
+++ b/.config/firefox/chrome/userChrome.css
@@ -3,7 +3,10 @@
 #appMenu-fxa-status2,
 #appMenu-fxa-separator,
 #fullscreen-warning,
-.findbar-highlight
+.findbar-highlight,
+#urlbar-searchmode-switcher,
+#translations-button,
+#reader-mode-button
 { display: none !important; }
 
 /* undo shit */
@@ -32,3 +35,5 @@ body { font-size: 10pt; }
 #navigator-toolbox
 { border: none !important; }
 
+#urlbar-input
+{ padding: 0px 8px !important; }
diff --git a/.config/firefox/user.js b/.config/firefox/user.js
index 4768c69..a18c1e9 100644
--- a/.config/firefox/user.js
+++ b/.config/firefox/user.js
@@ -3,6 +3,7 @@ user_pref("browser.toolbars.bookmarks.visibility", "never");
 user_pref("browser.quitShortcut.disabled", true);
 user_pref("media.videocontrols.picture-in-picture.video-toggle.enabled", false);
 user_pref("layout.spellcheckDefault", 0);
+user_pref("findbar.highlightAll", true);
 
 // i know what i'm doing
 user_pref("browser.safebrowsing.downloads.enabled", false);
diff --git a/.config/git/config##template b/.config/git/config##template
index 8f34c5d..0a3418a 100644
--- a/.config/git/config##template
+++ b/.config/git/config##template
@@ -33,6 +33,10 @@
 	l = log
 	d = diff
 	cloc = !git ls-files -z | xargs -0 cloc
+	conflict = !git diff --name-only --diff-filter=U --relative
+	ec = !git conflict -z | xargs -0 -- $EDITOR
+	ours = !git conflict -z | xargs -0 -- git checkout --ours
+	theirs = !git conflict -z | xargs -0 -- git checkout --theirs
 [pager]
 	log = diff-highlight | less
 	show = diff-highlight | less
diff --git a/.config/i3/autostart b/.config/i3/autostart
index 586ccaf..00e55d5 100755
--- a/.config/i3/autostart
+++ b/.config/i3/autostart
@@ -15,6 +15,8 @@ xdimmer -t 45 -p 3 &
 redshift -l 52:6 &
 nicotine --hidden &
 desktop2mqtt --config "$XDG_CONFIG_HOME/desktop2mqtt/config.yml" &
+light-locker --late-locking --lock-after-screensaver=0 --no-lock-on-suspend --no-lock-on-lid &
+systembus-notify &
 
 # auto start lazy script after everything else
 [ -x "$HOME/do.sh" ] && "$HOME/do.sh" &
diff --git a/.config/i3/config##template b/.config/i3/config##template
index 66874a0..d147a54 100644
--- a/.config/i3/config##template
+++ b/.config/i3/config##template
@@ -7,13 +7,7 @@ set $outer_gaps 0
 gaps inner $inner_gaps
 gaps outer $outer_gaps
 
-# border color
-client.focused          #262427 #262427 #fdf9f7 #262427 #262427
-client.focused_inactive #121213 #121213 #fdf9f7 #121213 #121213
-client.unfocused        #121213 #121213 #fdf9f7 #121213 #121213
-client.urgent           #121213 #de9dac #fdf9f7 #de9dac #de9dac
-client.placeholder      #000000 #0c0c0c #fdf9f7 #121213 #121213
-client.background       #f9ece8
+include color.conf
 
 # Replace window decorations with a border
 for_window [class=".*"] border pixel 0
diff --git a/.config/ncmpcpp/config##template b/.config/ncmpcpp/config##template
index 2214e7b..8059509 100644
--- a/.config/ncmpcpp/config##template
+++ b/.config/ncmpcpp/config##template
@@ -1,9 +1,9 @@
-mpd_host = "127.0.0.1"
+mpd_host = "0.0.0.0"
 mpd_port = "6600"
 #mpd_host = "/mnt/e/mpd/socket"
 mpd_music_dir = "/mnt/e/mpd/music"
-mpd_connection_timeout = "5"
-mpd_crossfade_time = "1"
+mpd_connection_timeout = 1
+mpd_crossfade_time = 1
 
 external_editor = "{{ env.EDITOR }}"
 ncmpcpp_directory = "{{ env.XDG_CONFIG_HOME }}/ncmpcpp"
@@ -16,7 +16,8 @@ visualizer_color = default
 playlist_display_mode = classic
 autocenter_mode = yes
 centered_cursor = yes
-user_interface = alternative
+user_interface = classic
+connected_message_on_startup = no
 
 header_visibility = no
 statusbar_visibility = no
@@ -26,7 +27,7 @@ state_flags_color = black:b
 main_window_color = white
 current_item_prefix = "$r"
 song_columns_list_format = "(20)[]{a} (6f)[blue]{NE} (50)[default]{t|f:Title} (20)[blue]{} (7f)[magenta]{l}"
-song_list_format = " {{%a - %t}|{%f}}{$R%l} "
+song_list_format = " {{%a - %t}|{%f}}$R{  %l} "
 window_border_color = default
 
 alternative_header_first_line_format = "{{%a $8-$0 %t}|{%f}}"
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index dae5d1c..f2fcf0b 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -23,6 +23,7 @@ set tabpagemax=999
 set breakindent
 set breakindentopt=shift:2
 set formatoptions+=mM
+set tags^=build/tags
 let g:sneak#label = 1
 let g:which_key_map = {}
 let g:airline_powerline_fonts = 1
@@ -50,10 +51,14 @@ endif
 
 " plugged
 call plug#begin('~/.config/nvim/plugged')
-" quality of life
-Plug 'jiangmiao/auto-pairs'
+" tim <3
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-speeddating'
+Plug 'tpope/vim-eunuch'
+Plug 'tpope/vim-commentary'
+
+" quality of life
+Plug 'jiangmiao/auto-pairs'
 Plug 'itchyny/lightline.vim'
 Plug 'terryma/vim-multiple-cursors'
 Plug 'liuchengxu/vim-which-key'
@@ -69,6 +74,7 @@ Plug 'rrethy/vim-hexokinase', { 'do': 'make hexokinase' }
 Plug 'dkarter/bullets.vim'
 Plug 'editorconfig/editorconfig-vim'
 Plug 'rickhowe/diffunitsyntax'
+Plug 'lervag/file-line'
 
 " language plugins
 Plug 'lervag/vimtex'
@@ -197,6 +203,9 @@ let g:which_key_map.u = 'toggle undo tree'
 nnoremap <silent> <leader>e 0f!xC<c-r>=system(@-)<cr><esc>ddk$
 let g:which_key_map.e = 'read and execute after !'
 
+nnoremap <leader>] <c-w>v<c-]>zt
+let g:which_key_map[']'] = 'open tag in split'
+
 " cmd maps
 cnoreabbrev W w
 cnoreabbrev sudow w !sudo tee %
@@ -380,3 +389,5 @@ source $XDG_CONFIG_HOME/nvim/mode.vim
 set exrc
 set secure
 
+" file-line
+let g:file_line_crosshairs = v:false
diff --git a/.config/picom.conf b/.config/picom.conf
index 30e2693..0f59fde 100644
--- a/.config/picom.conf
+++ b/.config/picom.conf
@@ -73,6 +73,10 @@ rules = (
 		shadow = true;
 		corner-radius = 10;
 	},
+	{
+		match = "class_i *= 'RAIL'";
+		corner-radius = 0;
+	},
 )
 
 animations = (
diff --git a/.config/polybar/config.ini##template b/.config/polybar/config.ini##template
index 4581b90..2521ce4 100644
--- a/.config/polybar/config.ini##template
+++ b/.config/polybar/config.ini##template
@@ -42,6 +42,7 @@ font-1 = "sans-serif:pixelsize=8:weight=bold:size=0;2"
 font-2 = "Hiragino Kaku Gothic ProN W3:pixelsize=8:weight=medium:size=0;1"
 font-3 = "Hiragino Kaku Gothic ProN W6:pixelsize=8:weight=medium:size=0;1"
 font-4 = "Noto Sans KR:pixelsize=8:weight=medium:size=0;2"
+font-5 = "Noto Sans CJK SC:pixelsize=8:weight=medium:size=0;2"
 
 modules-left = time date
 {% if yadm.hostname == "thoncc" %}
@@ -124,7 +125,7 @@ type = internal/mpd
 format-online = <label-song>
 format-offline =
 format-stopped =
-label-song = %artist% - %{T2}%title%%{T-}
+label-song = %artist% - %title%
 label-song-maxlen = 50
 label-song-ellipsis = true
 
diff --git a/.config/rofi/config.rasi##template b/.config/rofi/config.rasi##template
index c6bf9c4..bb09bdf 100644
--- a/.config/rofi/config.rasi##template
+++ b/.config/rofi/config.rasi##template
@@ -57,7 +57,7 @@ listview {
 
 element {
 	margin: -2px 0px;
-	padding: 6px 10px 3px 10px;
+	padding: 6px 10px 2px 10px;
 	background-color: transparent;
 	text-color: ${fg};
 }
diff --git a/.config/yadm/packages-arch b/.config/yadm/packages-arch
index 5ccc6f9..b9b9781 100644
--- a/.config/yadm/packages-arch
+++ b/.config/yadm/packages-arch
@@ -16,6 +16,7 @@ xorg-xset
 # directly used in scripts / startup
 augeas
 autocutsel
+bat
 dbus
 dunst
 fcitx5
@@ -24,6 +25,7 @@ imagemagick
 jq
 libpulse # for pactl
 maim
+moreutils
 mpd
 neovim-remote
 nicotine+
diff --git a/.config/yadm/root/etc/lightdm/lightdm-gtk-greeter.conf b/.config/yadm/root/etc/lightdm/lightdm-gtk-greeter.conf
index 14e8ee1..7ba729d 100644
--- a/.config/yadm/root/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/.config/yadm/root/etc/lightdm/lightdm-gtk-greeter.conf
@@ -1,5 +1,8 @@
 [greeter]
-theme-name=adw-gtk3-dark
-indicators=~session;~power
-hide-user-image=true
+font-name = Inter 9
+theme-name = adw-gtk3-dark
+indicators = ~clock;~spacer;~power
+hide-user-image = true
 screensaver-timeout = 15
+default-session = xinitrc
+clock-format = %t%H:%M
diff --git a/.local/share/bin/mk b/.local/share/bin/mk
index b7e2b41..54b6908 100755
--- a/.local/share/bin/mk
+++ b/.local/share/bin/mk
@@ -1,6 +1,9 @@
 #!/bin/sh
 progname="$(basename "$0")"
 showmode() {
+	! [ -n "$FROM_PROMPT" ] && return
+	! [ -t 1 ] && return
+
 	mode=" ($1)"
 	col=$(( $(tput cols) - $(echo "$mode" | wc -L) + 1 ))
 	printf '\e[1A\e['$col'G\e[1;30m%s\e[0m\n' "$mode"
@@ -23,11 +26,17 @@ mode_cmake() {
 
 	# re-run configuration if fresh or CMakeLists was changed
 	if [ ! -e "$builddir/build.ninja" ] ||
-		 [ "CMakeLists.txt" -nt "$builddir/build.ninja" ] ; then
-		 cmake --log-level WARNING -B "$builddir"
+		[ "CMakeLists.txt" -nt "$builddir/build.ninja" ] ; then
+		cmake --log-level WARNING -B "$builddir"
 	fi
 
-	exec cmake --build "$builddir" -- "$@"
+	# build
+	cmake --build "$builddir" -- "$@" || exit $?
+
+	# generate vim tags (continue after mk exits)
+	ninja -C "$builddir" -t deps | sed -n 's/^ \{4\}//p' | sort -u | ctags -L - -f "$builddir/tags" &
+
+	exit 0
 }
 [ -e "CMakeLists.txt" ] && mode_cmake "$@"
 
diff --git a/.profile b/.profile
index 08b6711..d7d011d 100644
--- a/.profile
+++ b/.profile
@@ -66,6 +66,7 @@ export PASSWORD_STORE_ENABLE_EXTENSIONS=true
 export PASSWORD_STORE_EXTENSIONS_DIR="$XDG_DATA_HOME/pass-extensions"
 export MOZ_USE_XINPUT2=1
 export CMAKE_EXPORT_COMPILE_COMMANDS=1
+export CMAKE_GENERATOR=Ninja
 export LIBVIRT_DEFAULT_URI='qemu:///system'
 
 # LS_COLORS
@@ -94,6 +95,12 @@ export WGETRC="$XDG_CONFIG_HOME/wgetrc"
 export TEXMFHOME="$XDG_DATA_HOME/texmf"
 export TEXMFVAR="$XDG_CACHE_HOME/texlive/texmf-var"
 export TEXMFCONFIG="$XDG_CONFIG_HOME/texlive/texmf-config"
+alias poke="poke --quiet"
+
+# colors
+alias diff='diff --color=auto'
+alias mk='FROM_PROMPT=y mk'
+alias diffstat='diffstat -C'
 
 # disable dotnet telemetry
 export DOTNET_CLI_TELEMETRY_OPTOUT=1