M .config/kanshi/config → .config/kanshi/config

@@ -4,7 +4,7 @@ }
 
 profile {
 	output eDP-1 disable
-	output DP-1 enable
+	output DP-1 enable mode 2560x1440
 }
 
 profile {

M .config/nvim/init.vim → .config/nvim/init.vim

@@ -2,7 +2,6 @@ call plug#begin()
 Plug 'junegunn/vim-easy-align'
 Plug 'neovim/nvim-lspconfig'
 Plug 'nvim-lua/plenary.nvim' " lua funcs i guess
-Plug 'vhyrro/neorg'
 Plug 'hrsh7th/nvim-compe'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'cormacrelf/vim-colors-github'
@@ -20,12 +19,6 @@ 
 lua << EOF
 require'lspconfig'.gopls.setup{}
 require'lspconfig'.terraformls.setup{}
-require('neorg').setup {
-    load = {
-        ["core.defaults"] = {},
-        ["core.norg.concealer"] = {},
-    }
-}
 EOF
 
 " set keybinds for go LSP - warning: disgusting
@@ -85,8 +78,11 @@ autocmd FileType mail setlocal noautoindent
 augroup filetypedetect
   autocmd BufRead,BufNewFile *mutt-*              setfiletype mail
 augroup filetypedetect
+autocmd FileType json setlocal et ts=2 sw=2
+" markdown auto-wrapping per 
+" https://vi.stackexchange.com/questions/9421/how-to-make-formatoptions-a-useful
+autocmd FileType markdown set fo+=aw
 autocmd FileType markdown setlocal tw=80 et ts=2 sw=2
-autocmd FileType json setlocal et ts=2 sw=2
 
 " terraform ft detection
 " vint: -ProhibitAutocmdWithNoGroup

M .config/sway/config → .config/sway/config

@@ -45,11 +45,13 @@ ### keybinds ###
 bindsym $mod+Return exec $term
 bindsym $mod+Shift+Return exec $term --title 'weallfloatdownhere'
 bindsym $mod+Shift+q kill
+bindsym $mod+Home exec swaylock
 bindsym Delete exec makoctl dismiss
 bindsym $mod+Delete exec makoctl dismiss --all
 bindsym Mod1+Shift+Return Return
 bindsym $mod+d exec bemenu-run -l 20 -c -W 0.2
 bindsym $mod+Shift+p exec --no-startup-id pa-bemenu
+bindsym $mod+Shift+o exec --no-startup-id shmoji bemenu
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
 

M .tmux.conf → .tmux.conf

@@ -1,4 +1,6 @@ 
 # Global opts
+set -g base-index 1
+setw -g pane-base-index 1
 setw -g mode-keys vi
 set-option -sg escape-time 0
 set -s escape-time 0