diff --git a/mail/aerc/accounts.conf b/mail/aerc/accounts.conf
index e627951..71ba70d 100644
--- a/mail/aerc/accounts.conf
+++ b/mail/aerc/accounts.conf
@@ -8,4 +8,3 @@ copy-to = Sent
check-mail = 4m
check-mail-cmd = /home/adam/.local/bin/mail-sync.sh
check-mail-timeout = 20s
-
diff --git a/mail/aerc/aerc.conf b/mail/aerc/aerc.conf
index 75df126..be33079 100644
--- a/mail/aerc/aerc.conf
+++ b/mail/aerc/aerc.conf
@@ -72,6 +72,8 @@ sort=-r date
next-message-on-delete=true
fuzzy-complete=true
+stylesets-dirs=~/.config/aerc/
+styleset-name=dracula
[ui:folder=Sent]
# index-format=%D %-25.25r %Z %s
diff --git a/mail/aerc/dracula b/mail/aerc/dracula
new file mode 100644
index 0000000..f5a5a06
--- /dev/null
+++ b/mail/aerc/dracula
@@ -0,0 +1,65 @@
+#
+# aerc dracula styleset
+#
+# This styleset uses the terminal defaults as its fallback.
+# More information on how to configure the styleset can be found in
+# the aerc-stylesets(7) manpage. Please read the manual before
+# modifying or creating a styleset.
+#
+
+*.default=true
+
+default.bg=#20212b
+
+title.reverse=true
+header.bold=true
+header.fg=#8be9fd
+
+*error.bold=true
+error.fg=#ff5555
+warning.fg=#f1fa8c
+success.fg=#50fa7b
+
+statusline*.default=true
+statusline_default.reverse=true
+statusline_error.fg=#ff5555
+statusline_error.reverse=true
+statusline_default.fg=#303030
+statusline_default.bg=#af87ff
+
+dirlist_default.selected.fg=#f8f8f2
+dirlist_default.selected.bg=#44475a
+dirlist_recent.selected.fg=#44475a
+dirlist_recent.selected.bg=#f8f8f2
+dirlist_unread.fg=#50fa7b
+dirlist_unread.selected.fg=#50fa7b
+dirlist_unread.selected.bg=#44475a
+
+msglist_default.selected.fg=#44475a
+msglist_default.selected.bg=#f8f8f2
+msglist_unread.bold=true
+msglist_unread.fg=#50fa7b
+msglist_unread.selected.bg=#44475a
+msglist_read.selected.fg=#f8f8f2
+msglist_read.selected.bg=#44475a
+msglist_marked.fg=#f1fa8c
+msglist_marked.selected.fg=#f1fa8c
+msglist_marked.selected.bg=#44475a
+msglist_deleted.fg=#ff5555
+msglist_result.fg=#8be9fd
+msglist_result.selected.bg=#44475a
+
+msglist_deleted.selected.reverse=toggle
+
+completion_pill.reverse=true
+
+tab.reverse=true
+border.reverse = true
+tab.bg=#9c7adf
+tab.fg=#303030
+tab.selected.bg=#303030
+tab.selected.fg=#9c7adf
+border.fg=#20212b
+
+selector_focused.reverse=true
+selector_chooser.bold=true
diff --git a/newsboat/.newsboat/config b/newsboat/.newsboat/config
index fc94ecd..500ab53 100644
--- a/newsboat/.newsboat/config
+++ b/newsboat/.newsboat/config
@@ -7,15 +7,42 @@ browser "w3m %u"
# color22 green
# color199 magenta
# color255 light grey
-color listfocus color255 color199
-color listfocus_unread color255 color199 bold
-color info color255 color22
+# color listfocus color255 color199
+# color listfocus_unread color255 color199 bold
+# color info color255 color22
color title color255 color22 bold
color hint-key color255 color22 bold
color hint-separator color255 color22 bold
+
+# Dark theme based on Dracula color scheme for newsboat.
+#
+# In order to use this color scheme, you must first configure
+# your terminal emulator to use the Dracula palette.
+# See for more information.
+
+color background default default
+color listnormal color255 default
+color listfocus color238 color255 standout
+color listnormal_unread color47 default
+color listfocus_unread color238 color47 standout
+color info color141 color236
+
confirm-exit yes
define-filter "nitter feeds" "tags !# \"nitter_personal\" and tags !# \"nitter_institutional\" and tags !# \"nitter_noise\""
feed-sort-order firsttag
+
+# Dracula highlights
+highlight all "---.*---" yellow
+highlight feedlist ".*(0/0))" black
+highlight article "(^Feed:|^Title:|^Date:|^Link:|^Author:)" cyan default bold
+highlight article "https?://[^ ]+" yellow default
+highlight article "\\[[0-9][0-9]*\\]" magenta default bold
+highlight article "\\[image\\ [0-9]+\\]" green default bold
+highlight article "\\[embedded flash: [0-9][0-9]*\\]" green default bold
+highlight article ":.*\\(link\\)$" cyan default
+highlight article ":.*\\(image\\)$" blue default
+highlight article ":.*\\(embedded flash\\)$" magenta default
+
keep-articles-days 45
macro c set browser "xterm -e mpv --vid=no -- %u &"; one; set browser qutebrowser
max-items 4096
diff --git a/vim/.vimrc b/vim/.vimrc
index d092024..a6c7958 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -50,17 +50,20 @@ 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
+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\+$/
+highlight BadWhitespace ctermbg=red guibg=darkred
+au BufRead,BufNewFile *.py,*.pyw,*.c,*.h match BadWhitespace /\s\+$/
+
+set encoding=utf-8
" vim-plug
if empty(glob('~/.vim/autoload/plug.vim'))
@@ -72,8 +75,8 @@ endif
call plug#begin('~/.vim/plugged')
Plug 'vim-airline/vim-airline'
Plug 'vim-airline/vim-airline-themes'
-Plug 'edkolev/tmuxline.vim'
-Plug 'christoomey/vim-tmux-navigator'
+" Plug 'edkolev/tmuxline.vim'
+" Plug 'christoomey/vim-tmux-navigator'
Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
Plug 'junegunn/fzf.vim'
Plug 'dense-analysis/ale'
@@ -87,7 +90,8 @@ Plug 'Quramy/tsuquyomi'
Plug 'rust-lang/rust.vim'
Plug 'neovimhaskell/haskell-vim'
Plug 'vim-scripts/indentpython.vim'
-Plug 'severij/vadelma'
+" Plug 'severij/vadelma'
+Plug 'dracula/vim', { 'as': 'dracula' }
Plug 'tpope/vim-surround'
Plug 'mattn/emmet-vim'
call plug#end()
@@ -97,11 +101,16 @@ autocmd filetype typescript nmap t : echo tsuquyomi#hint()
" Airline
let g:airline_powerline_fonts = 1
-let g:airline_theme = 'light'
+" let g:airline_theme = 'light'
let g:airline#extensions#tmuxline#enabled = 0
" ALE
-let g:ale_linters = {'haskell': ['hlint', 'hdevtools'], 'python': ['flake8']}
+let g:ale_linters = {
+ \ 'go': ['gofmt', 'golangci-lint', 'gopls', 'govet'],
+ \ 'haskell': ['hlint', 'hdevtools'],
+\}
+
+noremap :ALEFindReferences
" YouCompleteMe
noremap :YcmCompleter GoTo
@@ -119,8 +128,10 @@ filetype plugin indent on
syntax enable
" Set color scheme
-set background=light
-colorscheme vadelma
+" set background=light
+" colorscheme vadelma
+set background=dark
+colorscheme dracula
" Temporary file locations
set backupdir=.backup/,~/.backup/,/tmp//
diff --git a/xmobar/.xmobarrc b/xmobar/.xmobarrc
index 5e3343f..433781d 100644
--- a/xmobar/.xmobarrc
+++ b/xmobar/.xmobarrc
@@ -3,7 +3,7 @@ Config { overrideRedirect = False
, additionalFonts = ["JoyPixels 24"]
, bgColor = "#ffff99"
, fgColor = "#191970"
- , position = TopSize L 90 28
+ , position = TopSize L 89 28
, commands = [ Run WeatherX "KLGA"
[ ("clear", "clear")
, ("sunny", "sunny")
diff --git a/xmonad/autostart.sh b/xmonad/autostart.sh
index 237894c..a9f1eca 100755
--- a/xmonad/autostart.sh
+++ b/xmonad/autostart.sh
@@ -9,8 +9,12 @@ sleep 16
/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"
+# Dark mode
+/home/adam/.local/bin/alacritty --config-file /home/adam/.config/alacritty/alacritty_dark.yml --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 & sleep 5 && sh -c "wmctrl -r btm -t 1"
+# Light mode
+# /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"
diff --git a/zsh/.zshenv b/zsh/.zshenv
index b17c485..fb8aa37 100644
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -31,9 +31,6 @@ export VISUAL="vim"
export FZF_DEFAULT_COMMAND="fd --no-ignore --hidden --type f" # Includes hidden files
export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND"
-# bat theme
-export BAT_THEME=OneHalfLight
-
# exa colors
export LS_COLORS="rs=0:fi=35:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.webp=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:*.md=36"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index abb2696..4bbd27a 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -82,6 +82,9 @@ _fzf_compgen_dir() {
fd --no-ignore --type d --hidden --follow --exclude ".git" . "$1"
}
+# FZF | Dracula theme
+export FZF_DEFAULT_OPTS='--color=fg:#f8f8f2,bg:#282a36,hl:#bd93f9 --color=fg+:#f8f8f2,bg+:#44475a,hl+:#bd93f9 --color=info:#ffb86c,prompt:#50fa7b,pointer:#ff79c6 --color=marker:#ff79c6,spinner:#ffb86c,header:#6272a4'
+
# Block and beam cursors for vim mode
cursor_mode() {
# See https://ttssh2.osdn.jp/manual/4/en/usage/tips/vim.html for cursor shapes
@@ -140,3 +143,18 @@ PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source "/home/adam/.config/tea/autocomplet
# gomphotherium
export GOMPHOTHERIUM_SERVER='https://toot.cat'
export GOMPHOTHERIUM_ACCESS_TOKEN='qqscVpLBugWAv6cFUqu1vBm0QMbgsWTiafg7TwZsTec'
+
+# ripgrep-all
+rga-fzf() {
+ RG_PREFIX="rga --files-with-matches"
+ local file
+ file="$(
+ FZF_DEFAULT_COMMAND="$RG_PREFIX '$1'" \
+ fzf --sort --preview="[[ ! -z {} ]] && rga --pretty --context 5 {q} {}" \
+ --phony -q "$1" \
+ --bind "change:reload:$RG_PREFIX {q}" \
+ --preview-window="70%:wrap"
+ )" &&
+ echo "opening $file" &&
+ xdg-open "$file"
+}