diff --git a/X11/.Xresources b/X11/.Xresources index b566560..8963fd1 100644 --- a/X11/.Xresources +++ b/X11/.Xresources @@ -2,6 +2,9 @@ *faceName: FantasqueSansMono Nerd Font:size=8 *metaSendsEscape: true +XTerm.vt100.backarrowKey: false +XTerm.ttyModes: erase ^? + *VT100.Translations: #override \n\ Ctrl Shift V: insert-selection(CLIPBOARD) \n\ Ctrl Shift C: copy-selection(CLIPBOARD) \n\ diff --git a/bin/w3m-wallabagger.sh b/bin/w3m-wallabagger.sh index 3878584..7abc430 100755 --- a/bin/w3m-wallabagger.sh +++ b/bin/w3m-wallabagger.sh @@ -1,10 +1,9 @@ #!/bin/bash set -euo pipefail -# curl commands are currently '--insecure' until the certificate situation is sorted out -token=$(curl --silent --insecure -X POST --data grant_type=password --data client_id=3_3kfqif569iqsk8s88koccsk8kkg8oc0o4k8kckoo8ss84cgw0k --data client_secret=4s5ioftf8juocc0woskscogogwgw0wwwsg4cccoscwoc0c88cc --data username=adam --data password="$(secret-tool lookup Title wallabag)" 'https://wallabag.theadamcooper.com/oauth/v2/token' | jshon -e access_token | sed 's/"//g') +token=$(curl --silent -X POST --data grant_type=password --data client_id=3_3kfqif569iqsk8s88koccsk8kkg8oc0o4k8kckoo8ss84cgw0k --data client_secret=4s5ioftf8juocc0woskscogogwgw0wwwsg4cccoscwoc0c88cc --data username=adam --data password="$(secret-tool lookup service wallabag)" 'https://wallabag.theadamcooper.com/oauth/v2/token' | jshon -e access_token | sed 's/"//g') if [[ -n $token ]]; then - curl --silent --insecure -X POST --header "Authorization: Bearer ${token}" --data url="$1" 'https://wallabag.theadamcooper.com/api/entries.json' &> /dev/null + curl --silent -X POST --header "Authorization: Bearer ${token}" --data url="$1" 'https://wallabag.theadamcooper.com/api/entries.json' &> /dev/null else echo "$(date +"%Y-%m-%d %H:%M") Invalid token" >> /home/adam/.config/local/share/w3m/w3m-wallabagger.log fi diff --git a/mail/aerc/aerc.conf b/mail/aerc/aerc.conf index a38bf1a..75df126 100644 --- a/mail/aerc/aerc.conf +++ b/mail/aerc/aerc.conf @@ -7,8 +7,12 @@ # with mutt's printf-like syntax. # # Default: %D %-17.17n %Z %s -index-format=%D %-17.17n %Z %s - +# index-format=%D %-17.17n %Z %s +index-columns = date<16,name<25,flags>4,subject<* +column-date = {{.DateAutoFormat .Date.Local}} +column-name = {{index (.From | names) 0}} +column-flags = {{.Flags | join ""}} +column-subject = {{.Subject}} # # See time.Time#Format at https://godoc.org/time#Time.Format # @@ -69,6 +73,14 @@ next-message-on-delete=true fuzzy-complete=true +[ui:folder=Sent] +# index-format=%D %-25.25r %Z %s +index-columns = date<16,name<25,flags>4,subject<* +column-date = {{.DateAutoFormat .Date.Local}} +column-name = {{index (.Peer | names) 0}} +column-flags = {{.Flags | join ""}} +column-subject = {{.Subject}} + [viewer] # # Specifies the pager to use when displaying emails. Note that some filters diff --git a/mail/aerc/mail-sync.sh.example b/mail/aerc/mail-sync.sh.example index 0cf5e82..5a31e11 100755 --- a/mail/aerc/mail-sync.sh.example +++ b/mail/aerc/mail-sync.sh.example @@ -23,6 +23,7 @@ notmuch tag +mailinglist -- to:guile-user@gnu.org notmuch tag +mailinglist -- to:zsh-users@zsh.org notmuch tag +mailinglist -- to:qutebrowser@lists.qutebrowser.org notmuch tag +mailinglist -- to:~rjarry/aerc-discuss@lists.sr.ht +notmuch tag +mailinglist -- from:outgoing@sr.ht # TODO: Confirm that we need to do this # move tagged items across folders and retag diff --git a/newsboat/.newsboat/config b/newsboat/.newsboat/config index a193f9b..fc94ecd 100644 --- a/newsboat/.newsboat/config +++ b/newsboat/.newsboat/config @@ -17,6 +17,7 @@ confirm-exit yes define-filter "nitter feeds" "tags !# \"nitter_personal\" and tags !# \"nitter_institutional\" and tags !# \"nitter_noise\"" feed-sort-order firsttag keep-articles-days 45 +macro c set browser "xterm -e mpv --vid=no -- %u &"; one; set browser qutebrowser max-items 4096 notify-program "/usr/bin/notify-send" urls-source "ttrss" diff --git a/newsboat/.newsboat/history.search b/newsboat/.newsboat/history.search index 397a651..7580163 100644 --- a/newsboat/.newsboat/history.search +++ b/newsboat/.newsboat/history.search @@ -2,3 +2,9 @@ Guardian pool rss deeplinks +Ukraine +Ukraine election +Ukraine election +Ukraine +leak +leak diff --git a/newsboat/.newsboat/urls b/newsboat/.newsboat/urls index 57223e7..8acc77a 100644 --- a/newsboat/.newsboat/urls +++ b/newsboat/.newsboat/urls @@ -3,5 +3,6 @@ "query:nitter_institutional Articles:tags # \"nitter_institutional\"" "query:nitter_noise Articles:tags # \"nitter_noise\"" "query:nuggets Articles:tags # \"nuggets\"" +"query:podcasts Articles:tags # \"podcasts\"" "query:release_notes Articles:tags # \"release_notes\"" "query:tech Articles:tags # \"tech\"" diff --git a/vim/.vimrc b/vim/.vimrc index d303ed8..d092024 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -24,6 +24,10 @@ set splitright " Allow hidden buffers, don't limit to one file per window/split set hidden +" Enable folding +set foldmethod=indent +set foldlevel=99 + " Sane vim split naviagation (via Gaslight blog) nnoremap j nnoremap k @@ -45,6 +49,19 @@ au! autocmd VimEnter * silent !echo -ne "\e[2 q" augroup END +" Indentation for Python - throws error, needs fixing +" au BufNewFile,BufRead *.py + " \ set tabstop=4 + " \ set softtabstop=4 + " \ set shiftwidth=4 + " \ set textwidth=79 + " \ set expandtab + " \ set autoindent + " \ set fileformat=unix + +" Flag extraneous whitespace - throws error, needs fixing +" au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/ + " vim-plug if empty(glob('~/.vim/autoload/plug.vim')) silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs @@ -69,8 +86,10 @@ Plug 'HerringtonDarkholme/yats.vim' Plug 'Quramy/tsuquyomi' Plug 'rust-lang/rust.vim' Plug 'neovimhaskell/haskell-vim' +Plug 'vim-scripts/indentpython.vim' Plug 'severij/vadelma' Plug 'tpope/vim-surround' +Plug 'mattn/emmet-vim' call plug#end() " Tsuquyomi @@ -82,7 +101,7 @@ let g:airline_theme = 'light' let g:airline#extensions#tmuxline#enabled = 0 " ALE -let g:ale_linters = {'haskell': ['hlint', 'hdevtools']} +let g:ale_linters = {'haskell': ['hlint', 'hdevtools'], 'python': ['flake8']} " YouCompleteMe noremap :YcmCompleter GoTo diff --git a/xmobar/.xmobarrc b/xmobar/.xmobarrc index f606bc3..5e3343f 100644 --- a/xmobar/.xmobarrc +++ b/xmobar/.xmobarrc @@ -1,9 +1,9 @@ Config { overrideRedirect = False - , font = "xft:InconsolataGo Nerd Font Mono:size=8" - , additionalFonts = ["xft:JoyPixels:size=8"] + , font = "InconsolataGo Nerd Font Mono 16" + , additionalFonts = ["JoyPixels 24"] , bgColor = "#ffff99" , fgColor = "#191970" - , position = TopW L 90 + , position = TopSize L 90 28 , commands = [ Run WeatherX "KLGA" [ ("clear", "clear") , ("sunny", "sunny") diff --git a/xmonad/autostart.sh b/xmonad/autostart.sh index 4bcd138..237894c 100755 --- a/xmonad/autostart.sh +++ b/xmonad/autostart.sh @@ -3,15 +3,20 @@ /usr/sbin/keepassxc & sleep 16 -# /usr/sbin/qutebrowser --restore home & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2" -# /usr/sbin/qutebrowser & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2" -# /usr/sbin/firefox-developer-edition & sleep 5 && sh -c "wmctrl -r firefox -t 2" -/usr/sbin/xterm -fa 'Fantasque Sans Mono:size=6' -e btm --battery --color default-light --dot_marker & sleep 5 && sh -c "wmctrl -r btm -t 1" -# /usr/sbin/xterm -e newsboat & sleep 5 && sh -c "wmctrl -r newsboat -t 4" -# /usr/sbin/xterm -e joplin & sleep 5 && sh -c "wmctrl -r joplin -t 5" /usr/sbin/cbatticon & /usr/sbin/nextcloud & /usr/sbin/nm-applet --no-agent & /usr/sbin/pasystray & +/usr/sbin/blueman-applet & + +/home/adam/.local/bin/alacritty --title 001 & sleep 5 && sh -c "wmctrl -r 001 -t 3" +/home/adam/.local/bin/alacritty msg create-window --title btm --command btm --battery --color default-light & sleep 5 && sh -c "wmctrl -r btm -t 1" + +# /usr/sbin/qutebrowser --restore home & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2" +# /usr/sbin/qutebrowser & sleep 5 && sh -c "wmctrl -r qutebrowser -t 2" +# /usr/sbin/firefox-developer-edition & sleep 5 && sh -c "wmctrl -r firefox -t 2" +# /usr/sbin/xterm -fa 'Fantasque Sans Mono:size=6' -e btm --battery --color default-light & sleep 5 && sh -c "wmctrl -r btm -t 1" +# /usr/sbin/xterm -e newsboat & sleep 5 && sh -c "wmctrl -r newsboat -t 4" +# /usr/sbin/xterm -e joplin & sleep 5 && sh -c "wmctrl -r joplin -t 5" # /usr/sbin/xterm -e neomutt & sleep 5 && sh -c "wmctrl -r neomutt -t 3" # /usr/sbin/xterm -e aerc & sleep 5 && sh -c "wmctrl -r aerc -t 3" diff --git a/xmonad/xmonad.hs b/xmonad/xmonad.hs index dd50751..2801440 100644 --- a/xmonad/xmonad.hs +++ b/xmonad/xmonad.hs @@ -16,10 +16,12 @@ main = xmonad myConfig = def { borderWidth = 4 - , terminal = "xterm" + , terminal = "/home/adam/.local/bin/alacritty" , modMask = mod4Mask , focusedBorderColor = "#ff00ff" } + `additionalKeysP` + [ ("M-S-", spawn "/home/adam/.local/bin/alacritty msg create-window || /home/adam/.local/bin/alacritty") ] myXmobarPP :: PP myXmobarPP = def diff --git a/zsh/.zshrc b/zsh/.zshrc index bc8c7e7..abb2696 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -136,3 +136,7 @@ source /home/adam/.config/broot/launcher/bash/br # tea PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source "/home/adam/.config/tea/autocomplete.zsh" + +# gomphotherium +export GOMPHOTHERIUM_SERVER='https://toot.cat' +export GOMPHOTHERIUM_ACCESS_TOKEN='qqscVpLBugWAv6cFUqu1vBm0QMbgsWTiafg7TwZsTec'