From: Adam Date: Thu, 4 May 2023 20:05:56 +0000 (-0600) Subject: updates X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=7c35dadb8ef62b39ec2dab58c0ec389343c12978;p=dotfiles.git updates --- diff --git a/dotvim/bundle/ale b/dotvim/bundle/ale index da1e4dc..0f51c3b 160000 --- a/dotvim/bundle/ale +++ b/dotvim/bundle/ale @@ -1 +1 @@ -Subproject commit da1e4dcd1e5ebf340b1edbedb18dc2ba139e6e40 +Subproject commit 0f51c3b01bdafc7f8ad2ece4aacef089f952e884 diff --git a/dotvim/bundle/black b/dotvim/bundle/black index 2018e66..2ddea29 160000 --- a/dotvim/bundle/black +++ b/dotvim/bundle/black @@ -1 +1 @@ -Subproject commit 2018e667a6a36ee3fbfa8041cd36512f92f60d49 +Subproject commit 2ddea293a88919650266472186620a98a4a8bb37 diff --git a/dotvim/bundle/ctrlp.vim b/dotvim/bundle/ctrlp.vim index ed04d2e..8b4a952 160000 --- a/dotvim/bundle/ctrlp.vim +++ b/dotvim/bundle/ctrlp.vim @@ -1 +1 @@ -Subproject commit ed04d2ec91c78748f0d8ddf69df2f6e5cffa7bb8 +Subproject commit 8b4a9523632049b3b373de1233bef346073b8982 diff --git a/dotvim/bundle/nerdtree b/dotvim/bundle/nerdtree index eed488b..fc85a6f 160000 --- a/dotvim/bundle/nerdtree +++ b/dotvim/bundle/nerdtree @@ -1 +1 @@ -Subproject commit eed488b1cd1867bd25f19f90e10440c5cc7d6424 +Subproject commit fc85a6f07c2cd694be93496ffad75be126240068 diff --git a/dotvim/bundle/typescript-vim b/dotvim/bundle/typescript-vim index 67e81e4..52f3ca3 160000 --- a/dotvim/bundle/typescript-vim +++ b/dotvim/bundle/typescript-vim @@ -1 +1 @@ -Subproject commit 67e81e4292186889a1a519e1bf3a600d671237eb +Subproject commit 52f3ca3474d51f5021696ffb7297d989e49121ac diff --git a/dotvim/bundle/vim-cue b/dotvim/bundle/vim-cue new file mode 160000 index 0000000..bd1a623 --- /dev/null +++ b/dotvim/bundle/vim-cue @@ -0,0 +1 @@ +Subproject commit bd1a62303d096aa24fe4160a475645087f8770b3 diff --git a/dotvim/bundle/vim-flake8 b/dotvim/bundle/vim-flake8 index 5bd5873..03316ea 160000 --- a/dotvim/bundle/vim-flake8 +++ b/dotvim/bundle/vim-flake8 @@ -1 +1 @@ -Subproject commit 5bd58732be452a32e923179673b94e5f1ed5dc9e +Subproject commit 03316eab49fddce2fc9cea84588e623a658b35aa diff --git a/dotvim/bundle/vim-fugitive b/dotvim/bundle/vim-fugitive index 59529a2..99cdb88 160000 --- a/dotvim/bundle/vim-fugitive +++ b/dotvim/bundle/vim-fugitive @@ -1 +1 @@ -Subproject commit 59529a2c3634dc1cb3956c4faaf824f5c4dd7be1 +Subproject commit 99cdb88bc64063dc4656ae53496f06fb2a394cd4 diff --git a/dotvim/bundle/vim-go b/dotvim/bundle/vim-go index 430bc22..9b6c5a6 160000 --- a/dotvim/bundle/vim-go +++ b/dotvim/bundle/vim-go @@ -1 +1 @@ -Subproject commit 430bc227654abc3eb5e27a9052a857344ca08cdc +Subproject commit 9b6c5a66a1305179e9b130a8074d05973ea57315 diff --git a/dotvim/bundle/vim-javascript b/dotvim/bundle/vim-javascript index d6e1375..c470ce1 160000 --- a/dotvim/bundle/vim-javascript +++ b/dotvim/bundle/vim-javascript @@ -1 +1 @@ -Subproject commit d6e137563c47fb59f26ed25d044c0c7532304f18 +Subproject commit c470ce1399a544fe587eab950f571c83cccfbbdc diff --git a/dotvimrc b/dotvimrc index 636728c..8e3b5c3 100644 --- a/dotvimrc +++ b/dotvimrc @@ -13,10 +13,8 @@ let g:gruvbox_contrast_dark="hard" colorscheme gruvbox -if has('gui_running') - set colorcolumn=80 - set cursorline -endif +set colorcolumn=+1 +hi ColorColumn ctermbg=235 set autoindent set cindent @@ -36,16 +34,16 @@ set vb set hlsearch set switchbuf=usetab -set mouse=a -set ttymouse=xterm2 -set guioptions-=T -set guifont=Menlo:h14 +" Disable Mouse Interactions +set mouse= +set ttymouse= map :tabnew map :tabnext map :tabprevious -set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/*,coverage/*,*.log,test/output +set wildignore+=**/node_modules,**/node_modules/*,**/target,**/target/* +set wildignore+=coverage/*,*.log,test/output let mapleader="," let NERDTreeRespectWildIgnore=1 @@ -78,8 +76,7 @@ endfunction autocmd FileType make setlocal noexpandtab autocmd Filetype python setlocal tabstop=4 softtabstop=4 shiftwidth=4 -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 --git a/dotxprofile b/dotxprofile index 3003918..120eaed 100644 --- a/dotxprofile +++ b/dotxprofile @@ -1,6 +1,5 @@ #!/bin/sh -#xrandr --newmode "2560x1080_68.00" 264.25 2560 2736 3008 3456 1080 1083 1093 1126 -hsync +vsync -#xrandr --addmode HDMI-1 2560x1080_68.00 -#xrandr --output eDP-1 --mode 1366x768 --pos 0x0 --rotate normal --output VGA-1 --off --output DP-1 --off --output HDMI-1 --primary --mode 2560x1080_68.00 --pos 1366x0 --rotate normal --output DP-2 --off --output HDMI-2 --off +#xrandr --output HDMI-1 --primary --mode 3440x1440 --rate 100 xinput set-prop "Logitech USB Optical Mouse" "libinput Natural Scrolling Enabled" 1 +xinput set-prop "ELAN0672:00 04F3:3187 Touchpad" "libinput Natural Scrolling Enabled" 1 diff --git a/dotxresources b/dotxresources index 918a958..03712a2 100644 --- a/dotxresources +++ b/dotxresources @@ -1,7 +1,7 @@ URxvt*loginShell: true URxvt*background: #1D2021 URxvt*foreground: #FBF1C7 -URxvt*font: xft:Liberation Mono:pixelsize=16:antialias=true:autohint=true +URxvt*font: xft:Liberation Mono:pixelsize=18:antialias=true:autohint=true URxvt*scrollBar: false URxvt*saveLines: 65535 Xft*dpi: 96 diff --git a/i3/i3.conf b/i3/i3.conf index 4deb853..e939f1f 100644 --- a/i3/i3.conf +++ b/i3/i3.conf @@ -178,6 +178,9 @@ mode "resize" { bindsym $mod+r mode "resize" +# Move current workspace to next output +bindsym $mod+x move workspace to output next + # Screenshot, bound to PRINT SCREEN bindsym 0xff61 exec screenshot.sh for_window [class="Display-im6.q16"] floating enable @@ -191,6 +194,7 @@ for_window [class="KeePassXC"] floating enable, border normal for_window [class="Rhythmbox"] floating enable, border normal bindsym --release $mod+Pause exec --no-startup-id slock +bindsym --release $mod+Escape exec --no-startup-id slock # Theming, ala Gruvbox font pango:Exo 2.0 10 diff --git a/i3/i3status.conf b/i3/i3status.conf index 6fe96b8..c549a3d 100644 --- a/i3/i3status.conf +++ b/i3/i3status.conf @@ -35,8 +35,8 @@ ethernet _first_ { } ethernet vpn0 { - format_up = "VPN (wifi): %ip" - format_down = "VPN (wifi): down" + format_up = "VPN: %ip" + format_down = "VPN: down" } battery 0 { @@ -61,6 +61,7 @@ volume master { format = "♪: %volume" format_muted = "♪: muted (%volume)" device = "pulse:alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y75Z9UA21E5007-00.analog-stereo" +#device = "pulse:alsa_output.usb-Burr-Brown_from_TI_USB_Audio_CODEC-00.analog-stereo-output" mixer = "Master" mixer_idx = 0 }