From 06ffb007eb49a940a9c371eb6961a5432df6ac60 Mon Sep 17 00:00:00 2001
From: Adam Shamblin <adam@vexingworkshop.com>
Date: Thu, 13 Jun 2024 21:00:19 -0600
Subject: [PATCH] periodic update

---
 dotvim/bundle/ale |  2 +-
 dotvimrc          | 24 +++++++++++++++++++++++-
 i3/i3.conf        |  8 +++++---
 i3/i3status.conf  | 17 +++++++++++++----
 4 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/dotvim/bundle/ale b/dotvim/bundle/ale
index da1e4dc..7021ed0 160000
--- a/dotvim/bundle/ale
+++ b/dotvim/bundle/ale
@@ -1 +1 @@
-Subproject commit da1e4dcd1e5ebf340b1edbedb18dc2ba139e6e40
+Subproject commit 7021ed0c6859ec8b1bf5012d1276d54a786449c3
diff --git a/dotvimrc b/dotvimrc
index f856a01..e600bdd 100644
--- a/dotvimrc
+++ b/dotvimrc
@@ -37,7 +37,9 @@ set hlsearch
 set switchbuf=usetab
 
 set mouse=a
-set ttymouse=xterm2
+if !has('nvim')
+  set ttymouse=xterm2
+endif
 set guioptions-=T
 set guifont=Menlo:h14
 
@@ -56,6 +58,19 @@ let g:ale_set_loclist=0
 let g:ale_set_quickfix=1
 let g:ale_fixers = {}
 let g:ale_fixers.python = ['black']
+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>
@@ -77,6 +92,7 @@ endfunction
 
 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
@@ -101,3 +117,9 @@ let localrc = expand("~/.vim.local")
 if filereadable(localrc)
     so ~/.vim.local
 endif
+
+let g:copilot_filetypes = {
+      \ 'c': v:true,
+      \ 'python': v:true,
+      \ 'markdown': v:true
+      \ }
diff --git a/i3/i3.conf b/i3/i3.conf
index f65b190..98e280d 100644
--- a/i3/i3.conf
+++ b/i3/i3.conf
@@ -49,10 +49,11 @@ bindsym $mod+Return exec i3-sensible-terminal
 bindsym $mod+Shift+q kill
 
 # start dmenu (a program launcher)
-bindsym $mod+d exec --no-startup-id dmenu_run
-bindsym $mod+Shift+d exec --no-startup-id i3-dmenu-desktop
+# 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 -modi drun,run -show drun"
+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
@@ -185,6 +186,7 @@ for_window [class="Display-im6.q16"] floating enable
 
 # Komputeko
 bindsym $mod+t exec komputeko.sh
+bindsym $mod+Scroll_Lock exec reset.sh
 
 for_window [class="Tor Browser"] floating enable, border normal
 for_window [class="XCalc"] floating enable, border normal
diff --git a/i3/i3status.conf b/i3/i3status.conf
index 865b771..8b82cb1 100644
--- a/i3/i3status.conf
+++ b/i3/i3status.conf
@@ -17,11 +17,12 @@ general {
 order += "ipv6"
 order += "wireless _first_"
 order += "ethernet _first_"
-order += "ethernet mullvad-us10"
+order += "ethernet us-den-wg-001"
 order += "battery 0"
-order += "load"
+# order += "load"
 order += "memory"
 order += "tztime local"
+# order += "tztime UTC"
 order += "volume master"
 
 wireless _first_ {
@@ -34,13 +35,15 @@ ethernet _first_ {
         format_down = "E: down"
 }
 
-ethernet mullvad-us10 {
+ethernet us-den-wg-001 {
         format_up = "VPN: %ip"
         format_down = "VPN: down"
 }
 
 battery 0 {
         format = "%status %percentage %remaining"
+        status_chr = "⚡"
+        status_bat = "🔋"
 }
 
 load {
@@ -54,12 +57,18 @@ memory {
 }
 
 tztime local {
-        format = "%Y-%m-%d %I:%M"
+        format = "%Y-%m-%d %I:%M %Z"
+}
+
+tztime UTC {
+        timezone = "UTC"
+        format = "%H:%M %Z"
 }
 
 volume master {
         format = "♪: %volume"
         format_muted = "♪: muted (%volume)"
+#device = "pulse:alsa_output.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo"
         device = "pulse:alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y75Z9UA21E5007-00.iec958-stereo"
         mixer = "Master"
         mixer_idx = 0
-- 
2.39.5