updates

diff --cc dotvimrc
index 1c676151b48ca64ec7fcf9349bc5f0100013e131,e600bddbf5ef40dd1f58cdddcee7dd0c6639f969..fbb570781b77252cefe0c016dfff158446581791
--- 1/dotvimrc
--- 2/dotvimrc
+++ b/dotvimrc
@@@ -34,9 -36,12 +34,9 @@@ set v
  set hlsearch
  set switchbuf=usetab
  
- " Disable Mouse Interactions
++" Mouse Interactions
  set mouse=a
 -if !has('nvim')
 -  set ttymouse=xterm2
 -endif
 -set guioptions-=T
 -set guifont=Menlo:h14
 +set ttymouse=urxvt
  
  map <C-t> :tabnew<cr>
  map <C-tab> :tabnext<cr>
@@@ -54,23 -58,20 +54,8 @@@ let g:ale_set_loclist=
  let g:ale_set_quickfix=1
  let g:ale_fixers = {}
  let g:ale_fixers.python = ['black']
- 
- let wiki = {}
- let wiki.path = '~/vimwiki'
- let wiki.syntax = 'markdown'
- let wiki.ext = '.md'
- let wiki.auto_toc = 1
- let wiki.auto_header = 1
- 
- let zettlr = {}
- let zettlr.path = '~/Documents/znotebook'
- let zettlr.syntax = 'markdown'
- let zettlr.ext = '.md'
- let zettlr.auto_toc = 1
- let zettlr.auto_header = 1
- 
- let g:vimwiki_list = [wiki, zettlr]
+ let g:ale_linters = {'asm': []}
  
 -let wiki = {}
 -let wiki.path = '~/vimwiki/'
 -let wiki.syntax = 'markdown'
 -let wiki.ext = '.md'
 -let wiki.auto_toc = 1
 -let wiki.nested_syntaxes = {'bash': 'bash', 'python': 'python'}
 -let g:vimwiki_list = [wiki]
 -
 -"let g:vimwiki_list = [{'path': '~/vimwiki',
 -"  \ 'syntax': 'markdown', 'ext': '.md',
 -"  \ 'auto_toc': 1}]
 -
  map <leader>f :CtrlP<cr>
  map <leader>a :NERDTreeToggle<cr>
  map <leader>b :Git blame<cr>
@@@ -91,8 -92,10 +76,9 @@@ endfunctio
  
  autocmd FileType make setlocal noexpandtab
  autocmd FileType python setlocal tabstop=4 softtabstop=4 shiftwidth=4
+ autocmd FileType asm setlocal tabstop=8 softtabstop=8 shiftwidth=8
  
 -au BufNewFile,BufRead *.js set filetype=javascript
 -au BufNewFile,BufRead *.json set filetype=javascript
 +au BufNewFile,BufRead *.js,*.json set filetype=javascript
  au BufNewFile,BufRead *.ts set filetype=typescript
  au BufNewFile,BufRead Podfile,*.podspec set filetype=ruby
  au BufNewFile,BufRead /usr/local/nginx/conf/* set filetype=nginx

diff --cc i3/i3.conf
index 2233cdfaca8c90fa444d5add7f3d14b58bdbfe9f,98e280df614de60f361e52e3c06c9a18ce656beb..ccadb008661d04893e35d592b8cc7f750d592f23
--- 1/i3/i3.conf
--- 2/i3/i3.conf
+++ b/i3/i3.conf
@@@ -52,7 -52,8 +52,7 @@@ bindsym $mod+Shift+q kil
  # bindsym $mod+d exec --no-startup-id dmenu_run
  # bindsym $mod+Shift+d exec --no-startup-id i3-dmenu-desktop
  # A more modern dmenu replacement is rofi:
- bindcode $mod+40 exec "rofi -show combi"
+ bindsym $mod+d exec "rofi -show combi"
 -# bindsym $mod+Shift+d exec "rofi -modi drun,run -show drun"
  # There also is i3-dmenu-desktop which only displays applications shipping a
  # .desktop file. It is a wrapper around dmenu, so you need that installed.
  # bindcode $mod+40 exec --no-startup-id i3-dmenu-desktop

diff --cc i3/i3status.conf
index aa3d72597b3603b3d7237f33d04b88e38869159b,8b82cb1738413d095926c7f28211b05390b9e068..6f8518b76f815baeaa07fd811acb813519953085
--- 1/i3/i3status.conf
--- 2/i3/i3status.conf
+++ b/i3/i3status.conf
@@@ -17,11 -17,12 +17,10 @@@ general 
  order += "ipv6"
  order += "wireless _first_"
  order += "ethernet _first_"
 -order += "ethernet us-den-wg-001"
 +order += "ethernet gpd0"
  order += "battery 0"
- order += "load"
 -# order += "load"
  order += "memory"
  order += "tztime local"
 -# order += "tztime UTC"
  order += "volume master"
  
  wireless _first_ {