Uconf updateHEADmaster

7 files changed, 172 insertions, 22 deletions

diff --git a/.config/aerc/accounts.conf b/.config/aerc/accounts.conf
index 07039c0..94d0de0 100644
--- a/.config/aerc/accounts.conf
+++ b/.config/aerc/accounts.conf
@@ -1,12 +1,20 @@
 [main]
-# source            = maildir://~/.local/share/mail/runxiyu
-source            = notmuch://~/.local/share/mail/runxiyu
-maildir-store     = ~/.local/share/mail/runxiyu
-check-mail-cmd    = /usr/bin/env mailsync
-outgoing          = /usr/bin/env msmtp --account=runxiyu
-default           = Inbox
+source            = imaps://me%40runxiyu.org@mail.runxiyu.org
+source-cred-cmd   = pass show runxiyu.org/me
+outgoing          = smtps://me%40runxiyu.org@mail.runxiyu.org
+outgoing-cred-cmd = pass show runxiyu.org/me
+default           = INBOX
 from              = Runxi Yu <me@runxiyu.org>
 copy-to           = Sent
+# [main]
+# # source            = maildir://~/.local/share/mail/runxiyu
+# source            = notmuch://~/.local/share/mail/runxiyu
+# maildir-store     = ~/.local/share/mail/runxiyu
+# check-mail-cmd    = /usr/bin/env mailsync
+# outgoing          = /usr/bin/env msmtp --account=runxiyu
+# default           = Inbox
+# from              = Runxi Yu <me@runxiyu.org>
+# copy-to           = Sent
 
 [school]
 from              = Runxi Yu <s22537@ykpaoschool.cn>
@@ -35,11 +43,3 @@ default           = INBOX
 from              = Runxi Yu <andrew@andrewyu.org>
 copy-to           = Sent
 
-[mdirect]
-source            = imaps://me%40runxiyu.org@mail.runxiyu.org
-source-cred-cmd   = pass show runxiyu.org/me
-outgoing          = smtps://me%40runxiyu.org@mail.runxiyu.org
-outgoing-cred-cmd = pass show runxiyu.org/me
-default           = INBOX
-from              = Runxi Yu <me@runxiyu.org>
-copy-to           = Sent
diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index 8af0234..06c2497 100755
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -113,9 +113,9 @@ require'nvim-treesitter.configs'.setup {
 }
 
 require'lspconfig'.ccls.setup{}
-require'lspconfig'.pylsp.setup{}
+-- require'lspconfig'.pylsp.setup{}
 require'lspconfig'.gopls.setup{}
-require'lspconfig'.eslint.setup{}
+-- require'lspconfig'.eslint.setup{}
 
 require'nvim-lastplace'.setup {
 	lastplace_ignore_buftype = {"quickfix", "nofile", "help"},
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 5c36edb..550b1b8 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -31,9 +31,9 @@ set -g default-terminal "tmux-256color"
 # bind C-a send-prefix
 
 # Turn the mouse on, but without copy mode dragging
-set -g mouse on
-unbind -n MouseDrag1Pane
-unbind -Tcopy-mode MouseDrag1Pane
+set -g mouse off
+# unbind -n MouseDrag1Pane
+# unbind -Tcopy-mode MouseDrag1Pane
 
 # Some extra key bindings to select higher numbered windows
 # bind F1 selectw -t:10
diff --git a/.config/weechat/irc.conf b/.config/weechat/irc.conf
index 574ddcd..e5fb646 100644
--- a/.config/weechat/irc.conf
+++ b/.config/weechat/irc.conf
@@ -1293,3 +1293,49 @@ localhost.split_msg_max_length
 localhost.charset_message
 localhost.default_chantypes
 localhost.registered_mode
+__paospace.addresses = "paospace.runxiyu.org/6697"
+__paospace.proxy
+__paospace.ipv6
+__paospace.tls = on
+__paospace.tls_cert
+__paospace.tls_password
+__paospace.tls_priorities
+__paospace.tls_dhkey_size
+__paospace.tls_fingerprint
+__paospace.tls_verify
+__paospace.password
+__paospace.capabilities
+__paospace.sasl_mechanism
+__paospace.sasl_username
+__paospace.sasl_password
+__paospace.sasl_key
+__paospace.sasl_timeout
+__paospace.sasl_fail
+__paospace.autoconnect
+__paospace.autoreconnect
+__paospace.autoreconnect_delay
+__paospace.nicks
+__paospace.nicks_alternate
+__paospace.username
+__paospace.realname
+__paospace.local_hostname
+__paospace.usermode
+__paospace.command_delay
+__paospace.command
+__paospace.autojoin_delay
+__paospace.autojoin
+__paospace.autojoin_dynamic
+__paospace.autorejoin
+__paospace.autorejoin_delay
+__paospace.connection_timeout
+__paospace.anti_flood
+__paospace.away_check
+__paospace.away_check_max_nicks
+__paospace.msg_kick
+__paospace.msg_part
+__paospace.msg_quit
+__paospace.notify
+__paospace.split_msg_max_length
+__paospace.charset_message
+__paospace.default_chantypes
+__paospace.registered_mode
diff --git a/.config/weechat/weechat.conf b/.config/weechat/weechat.conf
index 82276a1..826041e 100644
--- a/.config/weechat/weechat.conf
+++ b/.config/weechat/weechat.conf
@@ -95,7 +95,7 @@ jump_previous_buffer_when_closing = on
 jump_smart_back_to_buffer = on
 key_bind_safe = on
 key_grab_delay = 800
-mouse = on
+mouse = off
 nick_color_force = ""
 nick_color_hash = djb2
 nick_color_hash_salt = ""
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index f78d1f0..0389bc4 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,3 +1,107 @@
+#!/bin/zsh
+# Shouldn't actually be run directly, obviously
+
+if [ "$TERM" = tmux-256color ]
+then
+	export TERM=xterm-256color
+fi
+
+ulimit -c unlimited
+
+export PATH="$HOME/.local/share/npm/bin:$PATH"
+if [ -d "/opt/homebrew/bin" ]
+then
+	export PATH="/opt/homebrew/bin:$PATH"
+fi
+export PATH="$HOME/.local/share/cargo/bin:$PATH"
+export PATH="$HOME/.local/share/go/bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$HOME/infrastructure/rxmenus:$PATH"
+export PATH="$HOME/misc:$PATH"
+unsetopt PROMPT_SP
+export EDITOR="nvim"
+export TERMINAL="foot"
+
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_STATE_HOME="$HOME/.local/state"
+export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
+export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # May break some WMs
+export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config"
+export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0"
+export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc"
+export INPUTRC="$XDG_CONFIG_HOME/inputrc"
+export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
+# export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default"
+export KODI_DATA="$XDG_DATA_HOME/kodi"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
+export TMUX_TMPDIR="$XDG_RUNTIME_DIR"
+export ANDROID_SDK_HOME="$XDG_CONFIG_HOME/android"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export GOPATH="$XDG_DATA_HOME/go"
+export GOMODCACHE="$XDG_CACHE_HOME/go/mod"
+export ANSIBLE_CONFIG="$XDG_CONFIG_HOME/ansible/ansible.cfg"
+export UNISON="$XDG_DATA_HOME/unison"
+export HISTFILE="$XDG_DATA_HOME/history"
+export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
+export ELECTRUMDIR="$XDG_DATA_HOME/electrum"
+export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/pythonrc"
+export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history"
+
+export DICS="/usr/share/stardict/dic/"
+# export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
+export FZF_DEFAULT_OPTS="--layout=reverse --height 40%"
+export QT_QPA_PLATFORMTHEME="qt6ct"
+export QT_QPA_PLATFORM=wayland
+export _JAVA_AWT_WM_NONREPARENTING=1
+export MOZ_ENABLE_WAYLAND=1
+export MOZ_USE_XINPUT2="1"
+export GDK_BACKEND="wayland"
+export NPM_CONFIG_USERCONFIG=$XDG_CONFIG_HOME/npm/npmrc
+
+[ ! -f ${XDG_CONFIG_HOME:-$HOME/.config}/shell/shortcutrc ] && setsid shortcuts >/dev/null 2>&1
+
+
+sudo -n loadkeys ${XDG_DATA_HOME:-$HOME/.local/share}/larbs/ttymaps.kmap 2>/dev/null
+
+# umask 007
+
+
+PLAN9="$HOME"/ext/plan9port
+export PLAN9
+PATH=$PATH:$PLAN9/bin
+export PATH
+
+#export GOPROXY=https://mirrors.aliyun.com/goproxy/
+#export GOPROXY=https://goproxy.io,direct
+
+export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
+
+# GTK_IM_MODULE=fcitx
+export QT_IM_MODULES="wayland;fcitx;ibus"
+export XMODIFIERS=@im=fcitx
+export INPUT_METHOD=fcitx
+export SDL_IM_MODULE=fcitx
+export GLFW_IM_MODULE=fcitx
+export QT_ENABLE_HIGHDPI_SCALING=1
+export QT_AUTO_SCREEN_SCALE_FACTOR=1
+export QT_SCALE_FACTOR=1.25
+export MANWIDTH=80
+
+export CVSROOT="$HOME/.local/cvsroot"
+test -r /home/runxiyu/.opam/opam-init/init.sh && . /home/runxiyu/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true
+
+eval "$(/opt/homebrew/bin/brew shellenv)"
+export LC_CTYPE=en_US.UTF-8
+export PATH="/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH"
+export PATH="/opt/homebrew/opt/postgresql@15/bin:$PATH"
+export PATH="/usr/local/texlive/2024/bin/universal-darwin:$PATH"
+export PATH="$HOME/go/bin:$PATH"
+
+# [ "$(tty)" = "/dev/tty1" ] && ! pidof -s sway >/dev/null 2>&1 && exec dbus-run-session -- sway
+
 
 
 autoload -U colors && colors
@@ -23,7 +127,7 @@ setopt interactive_comments
 
 HISTSIZE=10000000
 SAVEHIST=10000000
-HISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/zsh/history"
+HISTFILE="$HOME/.config/zsh/.zsh_history"
 
 autoload -U compinit
 zstyle ':completion:*' menu select
diff --git a/.gnupg/gpg-agent.conf b/.gnupg/gpg-agent.conf
index fe2fb73..1fdf0d2 100755
--- a/.gnupg/gpg-agent.conf
+++ b/.gnupg/gpg-agent.conf
@@ -1,4 +1,4 @@
 default-cache-ttl 3600
 max-cache-ttl 3600
 no-allow-external-cache
-# pinentry-program /usr/bin/pinentry-gnome3
+pinentry-program /opt/homebrew/bin/pinentry-mac