More cleanup

apps/de/sway/config

@@ -20,11 +20,10 @@ input type:keyboard {
 }
 
 bindsym $mod+control+space exec makoctl dismiss
-# bindsym $mod+Control+Space exec makoctl invoke
+bindsym $mod+shift+space exec makoctl invoke
 bindsym $mod+return exec term
 bindsym $mod+shift+return exec floating-term
 bindsym $mod+t exec term
-bindsym $mod+alt+return exec urxvt
 bindsym $mod+shift+alt+return exec kitty
 bindsym $mod+c kill
 bindsym $mod+shift+c kill # TODO: kill -9?

apps/de/sway/lock

@@ -1,6 +1,6 @@
 color=111111ff
 image=/home/daniel/.home/.wallpaper
-font=iosevka-lyte
+font=Iosevka
 font-size=24
 
 indicator-idle-visible

apps/mutt/rc

@@ -2,11 +2,11 @@ set realname = "Daniel Flanagan"
 set from = "Daniel Flanagan <daniel@lyte.dev>"
 set use_from = yes
 set envelope_from = yes
-set edit_headers = yes
+# set edit_headers = yes
 
-set folder="~/../mail"
-set sendmail="/usr/bin/esmtp"
-set sidebar_visible
+# set folder="~/../mail"
+# set sendmail="/usr/bin/esmtp"
+# set sidebar_visible
 set sidebar_format = "%B%?F? [%F]?%* %?N?%N/?%S"
 set mail_check_stats
 
@@ -16,6 +16,14 @@ bind index,pager \CN sidebar-next
 bind index,pager \CI sidebar-open
 bind index,pager \CB sidebar-toggle-visible
 
+set smtp_url = "smtps://wraithx2@gmail.com@smtp.gmail.com:465/"
+set smtp_pass = "`pass google-app-password`"
+set imap_user = "wraithx2@gmail.com"
+set imap_pass = "`pass google-app-password`"
+set folder = "imaps://imap.gmail.com:993"
+set spoolfile = "+INBOX"
+set ssl_force_tls = yes
+
 bind pager g top
 bind pager G bottom
 
@@ -25,12 +33,15 @@ bind pager k half-up
 bind pager j half-down
 bind pager J next-entry
 bind pager K previous-entry
+bind index \CR imap-fetch-mail
 
 bind attach,index g first-entry
 bind attach,index G last-entry
 
+macro index,pager A s><return>y
+
+set record = ""
+set editor = "nvim"
+set charset = "utf-8"
 set header_cache = "~/.cache/mutt/headers"
 set message_cachedir = "~/.cache/mutt/bodies"
-macro index,pager A s><return>y
-bind index \CR imap-fetch-mail
-set record=""

apps/neovim/ftplugin/cs.vim

@@ -1 +0,0 @@
-let g:OmniSharp_server_use_mono = 1

apps/neovim/ftplugin/elm.vim

@@ -1 +0,0 @@
-let g:elm_format_autosave=0

apps/neovim/ftplugin/haskell.vim

@@ -1 +0,0 @@
-let g:LanguageClient_rootMarkers = ['*.cabal', 'stack.yaml']

apps/neovim/ftplugin/lua.vim

@@ -1 +0,0 @@
-call coc#config('languageserver', {"lua": {"command": "lua-lsp", "filetypes": ["lua"]}})

apps/neovim/ftplugin/markdown.vim

@@ -1,2 +0,0 @@
-let g:neomake_markdown_enabled_makers = []
-autocmd BufNewFile,BufReadPost *.md setl filetype=markdown spell

apps/neovim/ftplugin/moon.vim

@@ -1,12 +0,0 @@
-" let g:moonscriptls = {'path': printf('/home/daniel/code/open-source/moonscript-language-server')}
-
-" let g:moonscriptls.lsp = printf('%s/main.moon', g:moonscriptls.path)
-
-" call coc#config('languageserver', {
-" 	\ 'moon': {
-" 	\	 'command': g:moonscriptls.lsp,
-" 	\	 'trace.server': 'verbose',
-" 	\	 'filetypes': ['moon']
-" 	\ }
-" 	\})
-

apps/neovim/ftplugin/rust.vim

@@ -1 +0,0 @@
-

apps/neovim/ftplugin/vue.vim

@@ -1 +0,0 @@
-autocmd FileType vue syntax sync fromstart

apps/neovim/init.vim

@@ -12,6 +12,7 @@ endif
 
 call plug#begin($vimdir.'/bundle')
 source $vimdir/plugins.vim
+source $vimdir/airline.vim
 call plug#end()
 
 filetype on

apps/neovim/plugins.vim

@@ -6,39 +6,11 @@ augroup PluginManagerInstaller
 	endif
 augroup End
 
-let g:airline_powerline_fonts = 1
-let g:airline#extensions#tabline#enabled = 1 " automatically displays all buffers when there's only one tab open
-let g:airline#extensions#tabline#fnamemod = ':t'
-
-let g:airline#extensions#tabline#left_sep = ''
-let g:airline#extensions#tabline#left_alt_sep = ''
-let g:airline_right_alt_sep = ''
-let g:airline_right_sep = ''
-let g:airline_left_alt_sep= ''
-let g:airline_left_sep = ''
-let g:airline#extensions#tabline#buffers_label = ''
-
-let g:airline_mode_map = {
-	\ '__' : '-',
-	\ 'n'  : 'N',
-	\ 'i'  : 'I',
-	\ 'R'  : 'R',
-	\ 'T'  : 'T',
-	\ 't'  : 'T',
-	\ 'c'  : 'C',
-	\ 'v'  : 'V',
-	\ 'V'  : 'V',
-	\ '' : 'V',
-	\ 's'  : 'S',
-	\ 'S'  : 'S',
-	\ '' : 'S',
-	\ }
-
 let g:indent_guide_auto_colors = 1
 let g:indent_guides_enable_on_vim_startup = 1
 let g:prosession_dir = $vimdir."/session/"
-
 let g:polyglot_disabled = ['cue', 'cuesheet']
+let g:jsonnet_fmt_on_save = 0
 
 " let g:fzf_layout = { 'window': 'enew' }
 
@@ -76,7 +48,6 @@ Plug 'junegunn/goyo.vim'                                        " better distrac
 Plug 'junegunn/limelight.vim'                                   " dim inactive blocks of code
 Plug 'tpope/vim-sleuth'                                         " try and detect indent method
 Plug 'editorconfig/editorconfig-vim'                            " loads project-specific editor settings
-Plug 'scrooloose/nerdtree'                                      " file browser
 Plug 'tpope/vim-eunuch'                                         " unix helper commands
 Plug 'mbbill/undotree'                                          " undo tree visualizer
 " Plug 'junegunn/vim-peekaboo'                                  " preview registers

apps/shell/fish/aliases.fish

@@ -1,7 +1,6 @@
 #!/usr/bin/env fish
 
 # ls aliases
-alias lx 'ls -lXB' # order by filetype
 alias lk 'ls -lSr' # order by filesize reversed
 alias lt 'ls -ltr' # order by file modified time
 alias lc 'ls -ltcr' # order by filectime
@@ -9,18 +8,14 @@ alias lu 'ls -ltur' # order by file access time
 alias ls 'ls -h --color --group-directories-first' # flat view w/ directories first
 alias l  'ls -h --color --group-directories-first' # same as above
 alias ll 'ls -lv --group-directories-first' # non-flat view
-alias lm 'll | more'
-alias lr 'll -R' # please don't - why is this even here...?
 alias la 'll -A' # show all
 
 # other file aliases
 alias tree 'tree -Csuh'
 alias f fzf
-alias cp 'rsync -ah --progress'
+alias rcp 'rsync -ah --progress'
 
-# gets the newest file in the current directory (or the specified directory
-# if one is provided)
-function ltl
+function ltl --description 'Echoes the newest file in the specified directory (or current directory if none is given)'
 	set d $argv[1] .
 	set -l l ""
 	for f in $d[1]/*
@@ -36,7 +31,7 @@ function scount -d "Silent count" -w count
 	count $argv > /dev/null
 end
 
-function ltld
+function ltld --description 'Echoes the newest subdirectory in the specified directory (or current directory if none is given)'
 	set d $argv[1] .
 	set -l l ""
 	for f in $d[1]/*
@@ -48,11 +43,10 @@ function ltld
 	echo $l
 end
 
-alias vltl "vim (ltl)"
+alias vltl "$EDITOR (ltl)"
 alias cdltl "cd (ltld)"
-alias ltlv vltl
 
-function d -w cd
+function d -w cd --description "Quickly jump to NICE_HOME (or given dir) and show files."
 	if scount $argv
 		cd $argv || exit 1
 	else
@@ -62,7 +56,7 @@ function d -w cd
 end
 
 # navigation aliases
-function c -w cd
+function c -w cd --description "Quickly jump to a subdirectory of NICE_HOME (or just to NICE_HOME if none given)"
 	if scount $argv
 		cd $NICE_HOME && d $argv || exit 1
 	else
@@ -75,8 +69,8 @@ alias cdd "d $DOTFILES_PATH" # go to dotfiles
 alias cde "d $ENV_PATH" # go to env dotfiles
 alias cdc "d $XDG_CONFIG_HOME" # go to ~/.config
 alias cdn "d $NOTES_PATH"
-alias cdl "d $NICE_HOME/dl"
-alias cdg "d $NICE_HOME/games"
+alias cdl "d $XDG_DOWNLOAD_DIR"
+alias cdg "d $XDG_GAMES_DIR"
 
 # quick parent-directory aliases
 alias .. "d .."
@@ -89,16 +83,19 @@ alias ........ "d ../../../../../../.."
 alias ......... "d ../../../../../../../.."
 
 # tmux aliases
-# TODO: see if this can be worked around?
 alias tmnew "tmux new -s"
 alias tmls "tmux list-sessions | rg --color never -o '^(.*?):.*?\(.*?\)(.*)\$' -r '\$1\$2'"
 alias tmatt "tmux attach -t"
-alias tu "tmux attach -t utils || tmux new -s utils"
+alias tms "tmatt (tmls | fzf | field 1)"
+function tmux-attach-or-new
+	tmux attach -t $argv || tmux new -s $argv
+end
+alias tu "tmux-attach-or-new utils"
+alias tmon "tmux-attach-or-new monitoring"
+alias tcom "tmux-attach-or-new comms"
+alias tm "tmux-attach-or-new music"
 alias tdf "tmux attach -t dotfiles || tmux new -s dotfiles -c $DOTFILES_PATH"
-alias tmon "tmux attach -t monitoring || tmux new -s monitoring"
-alias tcom "tmux attach -t comms || tmux new -s comms"
 alias tn "tmux attach -t notes || tmux new -s notes -c $NOTES_PATH"
-alias tm "tmux attach -t music || tmux new -s music"
 
 # git aliases
 # TODO: make these git aliases in the gitconfig?
@@ -141,46 +138,18 @@ end
 alias p "ping 8.8.8.8"
 alias C "clear && clear"
 alias r "ranger"
-alias rn "/usr/bin/watch -n 1"
 alias sctl "sudo systemctl"
 alias sctlu "systemctl --user"
-alias logs "sudo journalctl"
-alias logsr "sudo journalctl -r"
-alias logsf "sudo journalctl -f"
 alias bt "sudo bluetoothctl"
 alias btctl "bt"
-alias btctl "sudo bluetoothctl"
-alias pbcopy "clip"
-alias pt "htop -t" # experimental htop tree-view-by-default
 alias resrc "source $XDG_CONFIG_HOME/fish/config.fish"
-alias redshift "redshift -r -l 39.0997:-94.5786 -t 6500K:2500K"
-alias noredshift "killall redshift; redshift -P -O 5700"
-alias gpmdpe "electron --app=/usr/share/gpmdp/resources/app.asar"
-alias t "task"
 alias sc "sc-im"
 alias scs "sc-im $NOTES_PATH/_scratch.sc"
 alias disks "lsblk && df -h"
 alias dd "dd status=progress"
 alias wifi "sudo nmtui"
 alias year 'cal (date +%Y)'
-alias y year
 alias pa pulsemixer
-alias vd vdiff
-
-# games aliases
-# this sometimes fixes steam dynamic library issues?
-alias lsteam "env LD_PRELOAD='/usr/$LIB/libstdc++.so.6 /usr/$LIB/libgcc_s.so.1 /usr/$LIB/libxcb.so.1 /usr/$LIB/libgpg-error.so' steam"
-
-# override the man commands with vim
-alias _man "\\man"
-alias man "vman"
-
-# neomutt is better
-alias mutt "neomutt"
-alias mail "mutt"
-
-# fsw aliases
-alias fsw-mix-test 'fsw "mix test" ./**/*.{ex,exs,erl,hrl,xrl,yrl}'
 
 # weechat aliases
 function chat

apps/shell/fish/config.fish

@@ -22,6 +22,7 @@ set -Ux LESS "-r"
 set -Ux EDITOR vim
 if has_command nvim
 	set -Ux EDITOR nvim
+	set -Ux MANPAGER 'env MANWIDTH="" nvim --cmd "let g:prosession_on_startup=0" +Man!'
 end
 alias ovim 'command vim' # always have an alias to normal vim just in case
 alias vim $EDITOR

bin/vman

@@ -1,8 +0,0 @@
-#!/usr/bin/env sh
-
-# our vim config is setup to not auto-load sessions if we set the
-# `asmanviewer` variable, so launch vim that way when using vim as our man
-# page viewer
-
-"$EDITOR" --cmd "let asmanviewer=1" -c "SuperMan $*" || \
-	( echo "No manual entry for $*" && exit 1 )