diff options
| -rw-r--r-- | Xresources | 18 | ||||
| -rw-r--r-- | config/aerc/accounts.conf | 1 | ||||
| -rw-r--r-- | config/aerc/aerc.conf | 2 | ||||
| -rw-r--r-- | config/aerc/binds.conf | 3 | ||||
| -rw-r--r-- | cwmrc | 22 | ||||
| -rw-r--r-- | gitconfig | 2 | ||||
| -rw-r--r-- | mbsyncrc | 6 | ||||
| -rw-r--r-- | profile | 8 | ||||
| -rw-r--r-- | shrc | 40 | ||||
| -rwxr-xr-x | xinitrc | 13 | ||||
| -rwxr-xr-x | xsession | 16 |
11 files changed, 89 insertions, 42 deletions
@@ -10,6 +10,20 @@ XTerm*Background: #FFFFFF XTerm*Foreground: #000000 XTerm*HiBackColor: #FFFFFF XTerm*scaleHeight: 1.2 -VT100.translations: #override \n\ - <Btn3Down>: exec-formatted("xdg-open '%t'", PRIMARY) +urxvt*selectToClipboard: true +urxvt*font: xft:Iosevka SS13 Extended :size=14:style=Regular:antialias=true:hinting=false +urxvt*scrollBar: false +urxvt*rightScrollbar: false +urxvt.termName: xterm-256color +urxvt*Background: #FFFFFF +urxvt*Foreground: #000000 +urxvt*HiBackColor: #FFFFFF +urxvt*scaleHeight: 1.2 +URxvt.perl-ext-common: default,matcher +URxvt.url-launcher: /usr/local/bin/xdg-open +URxvt.matcher.button: 1 + +! yellow +*.color3: #ffb319 +*.color11: #ffb319 diff --git a/config/aerc/accounts.conf b/config/aerc/accounts.conf index 7167eb6..f104d32 100644 --- a/config/aerc/accounts.conf +++ b/config/aerc/accounts.conf @@ -4,6 +4,7 @@ outgoing = smtps+plain://marcc%40fastmail.fr@smtp.fastmail.com:465 default = INBOX outgoing-cred-cmd = pass fastmail/marcc from = "Marc Coquand" <marc@mccd.space> +address-book-cmd = grep -F -i -- "%s" "/home/mccd/.local/share/maildir2addr/addrs.tsv" copy-to = Sent [Work] diff --git a/config/aerc/aerc.conf b/config/aerc/aerc.conf index 439bb4a..9729724 100644 --- a/config/aerc/aerc.conf +++ b/config/aerc/aerc.conf @@ -379,6 +379,7 @@ parse-http-links=true # Specifies the command to run the editor with. It will be shown in an embedded # terminal, though it may also launch a graphical window if the environment # supports it. Defaults to $EDITOR, or vi. +editor=vim # # Default header fields to display when composing a message. To display @@ -399,7 +400,6 @@ parse-http-links=true # ignored. # # This parameter can also be set per account in accounts.conf. -#address-book-cmd= # Specifies the command to be used to select attachments. Any occurence of '%s' # in the file-picker-cmd will be replaced the argument <arg> to :attach -m diff --git a/config/aerc/binds.conf b/config/aerc/binds.conf index db96bca..3296c29 100644 --- a/config/aerc/binds.conf +++ b/config/aerc/binds.conf @@ -68,6 +68,7 @@ S = :save<space> | = :pipe<space> D = :delete<Enter> A = :archive flat<Enter> +ga = :pipe -mb git am -3<Enter> <C-l> = :open-link <space> @@ -133,4 +134,4 @@ $ex = <C-x> D = :mv Trash<Enter> [messages:account=Work] -D = :mv [Gmail]/Bin<Enter> +D = :mv [Gmail]/Trash<Enter> @@ -1,29 +1,33 @@ sticky yes fontname "Iosevka Aile:pixelsize=18:Normal" -borderwidth 4 +borderwidth 6 autogroup 0 xclock,XClock autogroup 0 xarclock, XClock autogroup 0 clock, clock -autogroup 0 xclock, alacritty +autogroup 0 xclock, urxvt vtile 55 ignore xclock unbind-key all color menufg "#FFFFFF" #black color font "#000000" #black -color menubg "#DDDDDD" "#000000" -color selfont #white #white +#color menubg "#DDDDDD" "#000000" +#color selfont #white #white color activeborder "#68b0b3" color inactiveborder "#AAAAAA" -#bind-key 0-XF86MonBrightnessUp "backlight incr 10" -#bind-key 0-XF86MonBrightnessDown "backlight decr 10" +bind-key 0-XF86MonBrightnessUp "backlight incr 10" +bind-key 0-XF86MonBrightnessDown "backlight decr 10" + +bind-key 0-XF86AudioRaiseVolume "mixer vol=+5%" +bind-key 0-XF86AudioLowerVolume "mixer vol=-5%" +bind-key 0-XF86AudioMute "mixer vol.mute=toggle" bind-mouse 4-3 window-resize bind-mouse 4-1 window-move -bind-key 4-s menu-window -bind-key 4-Return alacritty -bind-key 4-e "alacritty -e aerc" +bind-key 4-s "urxvt -e aerc mailto:link@mccd.space" +bind-key 4-Return urxvt +bind-key 4-e "urxvt -e aerc" bind-key 4-q window-close bind-key 4-m window-fullscreen bind-key 4-l window-vtile @@ -14,6 +14,8 @@ helper = !pass 'fastmail/git' [color] ui = false +[merge] + tool = meld [mergetool] layout = LOCAL,MERGED,REMOTE [sendemail] @@ -11,8 +11,8 @@ User marcc@fastmail.fr # For simplicity, this is how to read the password from another file. # For better security you should use GPG https://gnupg.org/ PassCmd "pass fastmail/marcc" -SSLType IMAPS -SSLVersions TLSv1.2 +TLSType IMAPS +TLSVersions +1.2 IMAPStore Home-remote Account Home @@ -40,7 +40,7 @@ IMAPAccount Work Host imap.gmail.com User marc.coquand@sustainably.app PassCmd "pass sustainably/gmail" -SSLType IMAPS +TLSType IMAPS Timeout 60 IMAPStore Work-remote @@ -1,9 +1,9 @@ test -r /home/mccd/.opam/opam-init/init.sh && . /home/mccd/.opam/opam-init/init.sh > /dev/null 2> /dev/null || true -PATH=$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/X11R6/bin:/usr/local/bin:/usr/local/sbin:/home/mccd/go/bin:/home/mccd/.cargo/bin:/home/mccd/.local/bin +PATH=${PATH}:/home/mccd/go/bin:/home/mccd/.cargo/bin:/home/mccd/.local/bin export PATH HOME TERM -export EDITOR="vim" +export EDITOR="kak" export GDK_DPI_SCALE="1.5" export GDK_SCALE="1.5" export XCURSOR_SIZE="32" @@ -14,8 +14,10 @@ export PF_ALIGN="5" export PF_COLOR="0" export MOZ_ACCELERATED=1 -export ENV=$HOME/.kshrc +export ENV=$HOME/.shrc export HISTSIZE=65535 export HISTFILE=$HOME/.history export STITCH_DIRECTORY=/home/mccd/notes export STITCH_GREP_CMD=ugrep + + @@ -1,4 +1,4 @@ -# # be paranoid + # be paranoid alias rm='rm -i' alias grep="ugrep --exclude-dir=node-modules --exclude-dir=_build" @@ -6,19 +6,30 @@ alias e="$EDITOR" alias g="git" alias grep="ugrep" alias tldr="NO_COLOR=1 tldr" -alias fd="find . -name $1*" alias dedoc="dedoc --color off" alias doc="dedoc --color off search" alias kill-sessions="tmux kill-session -a" +alias restart-wifi="doas /usr/sbin/service netif restart" +alias de='. ./.envrc' -kill-unattached() { +optimizeimg() { + convert -strip -quality 85% $1 $2 +} + + +killunattached() { tmux list-sessions -F '#{session_attached} #{session_id}' | \ awk '/^0/{print $2}' | \ xargs -n 1 tmux kill-session -t } refs() { - recsel -q $1 ~/refs.rec + recsel -q $1 ~/personal-db/refs.rec +} + +# Remove trailing newlines +cleartrail() { + cat $1 | tr -d '\n' } addref() { @@ -26,16 +37,31 @@ addref() { cat /tmp/description | xargs -I {} recins refs.rec -f Title -v $1 -f Tags -v $2 -f Text -v {} } +isrootprompt() { + CURR="$(id -u)" + case "$CURR" in + "0") echo "#" + ;; + *) echo "$" + ;; + esac +} + notes() { grep -i "$1" --format='%f%~' ~/notes/ | xargs -I {} cat {} } -#eval "$(opam env)" echo "BAT: $(apm -l), $(apm -b)" set -o vi -export PS1='\W \$ ' +eval "$(direnv hook bash)" + +PS1='${PWD##*/} $(isrootprompt) ' eval "$(zoxide init posix --hook prompt)" -#[[ $TERM != "tmux-256color" ]] && exec tmux + + + + +[ $(tty) == "/dev/ttyv0" ] && exec startx @@ -0,0 +1,13 @@ +. ~/.profile +export LC_ALL=en_US.UTF-8 +xrdb -load ~/.Xresources & +autocutsel & +xsetroot -solid '#282C34' & +ulimit -c 0 & +xclock -digital -geometry +7+1400 -face "Iosevka Aile:pixelsize=18:style=regular" -bg \#282C34 -fg \#B8BCC4 -strftime "FreeBSD/amd64 (mccd) %H:%M" & +gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' & +gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' & +gsettings set org.gnome.desktop.interface cursor-size 32 & +gsettings set org.gnome.desktop.interface cursor-theme Adwaita & +setxkbmap -layout us -variant colemak -option "caps:capslock" & +dbus-run-session cwm diff --git a/xsession b/xsession deleted file mode 100755 index 2b0636d..0000000 --- a/xsession +++ /dev/null @@ -1,16 +0,0 @@ -. ~/.profile -export LC_ALL=en_US.UTF-8 -xrdb -load ~/.Xresources & -autocutsel & -xsetroot -solid '#282C34' & -ulimit -Sc 0 & -#xclock -digital -geometry +7+1400 -face "Iosevka Aile:pixelsize=18:style=Semibold Italic" -bg \#EEEEEE -fg \#444444 -strftime "%a %d %b %H:%M [Unix Machine]" & -gsettings set org.gnome.desktop.interface document-font-name 'Iosevka Aile' & -gsettings set org.gnome.desktop.interface font-name 'Iosevka Aile' & -gsettings set org.gnome.desktop.interface cursor-size 32 & -gsettings set org.gnome.desktop.interface cursor-theme Adwaita & -xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation" 1 & -xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Button" 2 & -xinput set-prop "/dev/wsmouse" "WS Pointer Wheel Emulation Axes" 6 7 4 5 & -setxkbmap -layout us -variant colemak -option "caps:swapescape" & -dbus-run-session cwm |