From: Adam Date: Wed, 14 Sep 2022 15:17:56 +0000 (-0600) Subject: Update Makefile, fix i3 fonts, fix Xresources X-Git-Url: https://git.vexinglabs.com/?a=commitdiff_plain;h=9f6202f8a285245e27f1372605e2c435839312d3;p=dotfiles.git Update Makefile, fix i3 fonts, fix Xresources --- diff --git a/.gitmodules b/.gitmodules index df6cbd6..97c7894 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,11 @@ [submodule "dotvim/bundle/gruvbox"] path = dotvim/bundle/gruvbox url = git@github.com:morhetz/gruvbox.git +[submodule "dotvim/bundle/--force"] + path = dotvim/bundle/--force + url = git@github.com:psf/black.git + branch = stable +[submodule "dotvim/bundle/black"] + path = dotvim/bundle/black + url = git@github.com:psf/black.git + branch = stable diff --git a/Makefile b/Makefile index 61fc46a..cb0e20e 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,11 @@ install: xorg i3 xorg: ln -s $(CURDIR)/dotxprofile ~/.xprofile ln -s $(CURDIR)/doxmodmaprc ~/.xmodmaprc + ln -s $(CURDIR)/dotxresources ~/.Xresources i3: - mkdir -p ~/.config/i3 ~/.config/i3status + mkdir -p ~/.config/i3 + mkdir -p ~/.config/i3status ln -s $(CURDIR)/i3/i3.conf ~/.config/i3/config ln -s $(CURDIR)/i3/i3status.conf ~/.config/i3status/config diff --git a/dotbash_profile b/dotbash_profile index c8e6142..7fa1a0b 100644 --- a/dotbash_profile +++ b/dotbash_profile @@ -118,11 +118,7 @@ export PATH=$PATH:$(go env GOPATH)/bin # ################################################## -export NVM_DIR="$HOME/.nvm" - -if [ -f /usr/local/opt/nvm/nvm.sh ]; then - . /usr/local/opt/nvm/nvm.sh -fi +export PATH=/opt/node/bin:$PATH ################################################## # @@ -156,7 +152,7 @@ complete -F _ssh_hosts ssh # ################################################## -KIND_EXPERIMENTAL_PROVIDER=podman +#KIND_EXPERIMENTAL_PROVIDER=podman ################################################## # @@ -164,7 +160,10 @@ KIND_EXPERIMENTAL_PROVIDER=podman # ################################################## +alias ls="ls --color=auto" alias grep="grep --color=auto" export EDITOR=/usr/bin/vi -export PATH=~/bin:/opt/bin:$PATH +export PATH=~/bin:~/.local/bin:/opt/bin:$PATH . "$HOME/.cargo/env" + +eval "$(direnv hook bash)" diff --git a/dotvim/black/bin/python b/dotvim/black/bin/python new file mode 100755 index 0000000..b656e21 Binary files /dev/null and b/dotvim/black/bin/python differ diff --git a/dotvim/black/bin/python3 b/dotvim/black/bin/python3 new file mode 100755 index 0000000..b656e21 Binary files /dev/null and b/dotvim/black/bin/python3 differ diff --git a/dotvim/black/bin/python3.10 b/dotvim/black/bin/python3.10 new file mode 100755 index 0000000..b656e21 Binary files /dev/null and b/dotvim/black/bin/python3.10 differ diff --git a/dotvim/black/lib64 b/dotvim/black/lib64 new file mode 120000 index 0000000..7951405 --- /dev/null +++ b/dotvim/black/lib64 @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/dotvim/black/pyvenv.cfg b/dotvim/black/pyvenv.cfg new file mode 100644 index 0000000..8e8e0b9 --- /dev/null +++ b/dotvim/black/pyvenv.cfg @@ -0,0 +1,3 @@ +home = /usr/bin +include-system-site-packages = false +version = 3.10.4 diff --git a/dotvim/bundle/black b/dotvim/bundle/black new file mode 160000 index 0000000..2018e66 --- /dev/null +++ b/dotvim/bundle/black @@ -0,0 +1 @@ +Subproject commit 2018e667a6a36ee3fbfa8041cd36512f92f60d49 diff --git a/dotvimrc b/dotvimrc index c9a4a42..2fca675 100644 --- a/dotvimrc +++ b/dotvimrc @@ -54,6 +54,8 @@ let NERDTreeIgnore=['\.pyc$', '__pycache__', '\.swp$'] let g:ale_set_loclist=0 let g:ale_set_quickfix=1 +let g:ale_fixers = {} +let g:ale_fixers.python = ['black'] map f :CtrlP map a :NERDTreeToggle @@ -83,11 +85,14 @@ au BufNewFile,BufRead *.less set filetype=less au BufNewfile,BufRead Jenkinsfile set filetype=groovy au BufNewFile,BufRead *.md,*.txt,*.html setlocal textwidth=80 au BufNewFile,BufRead *.md,*.txt setlocal nocindent -au BufWritePost *.py call Flake8() - au BufNewFile,BufRead *.dat setlocal noexpandtab au BufNewFile,BufRead *.jade setlocal noexpandtab +augroup black_on_save + autocmd! + autocmd BufWritePre *.py Black +augroup end + vmap p Repl() let localrc = expand("~/.vim.local") diff --git a/dotxprofile b/dotxprofile index 84c8a17..3003918 100644 --- a/dotxprofile +++ b/dotxprofile @@ -1,6 +1,6 @@ #!/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 --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 xinput set-prop "Logitech USB Optical Mouse" "libinput Natural Scrolling Enabled" 1 diff --git a/dotxresources b/dotxresources index e13e972..918a958 100644 --- a/dotxresources +++ b/dotxresources @@ -1,13 +1,14 @@ -URxvt.background: #1D2021 -URxvt.foreground: #FBF1C7 -URxvt.font: xft:Liberation Mono:pixelsize=16:antialias=true:autohint=true -URxvt.scrollBar: false -URxvt.saveLines: 65535 +URxvt*loginShell: true +URxvt*background: #1D2021 +URxvt*foreground: #FBF1C7 +URxvt*font: xft:Liberation Mono:pixelsize=16:antialias=true:autohint=true +URxvt*scrollBar: false +URxvt*saveLines: 65535 Xft*dpi: 96 Xft*antialias: True Xft*hinting: Full -Emacs.menuBar: off -Emacs.verticalScrollBars: off -Emacs.toolBar: off -Emacs.background: #1d2021 -Emacs.foreground: #fbf1c7 +Emacs*menuBar: off +Emacs*verticalScrollBars: off +Emacs*toolBar: off +Emacs*background: #1d2021 +Emacs*foreground: #fbf1c7 diff --git a/i3/i3.conf b/i3/i3.conf index f7c1b22..e63d962 100644 --- a/i3/i3.conf +++ b/i3/i3.conf @@ -188,11 +188,12 @@ bindsym $mod+t exec komputeko.sh for_window [class="Tor Browser"] floating enable, border normal for_window [class="XCalc"] floating enable, border normal 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 # Theming, ala Gruvbox -font pango:Exo 2:style=Regular 8 +font pango:Exo 2.0 10 set $gruv_bg #282828 set $gruv_bg1 #3c3836 @@ -222,6 +223,7 @@ bar { active_workspace $gruv_fg4 $gruv_bg1 $gruv_fg4 urgent_workspace $gruv_fg $gruv_red $gruv_fg } + font pango:Exo 2.0 14 } # Apply xmodmap diff --git a/i3/i3status.conf b/i3/i3status.conf index 6ad0a30..40887fe 100644 --- a/i3/i3status.conf +++ b/i3/i3status.conf @@ -14,6 +14,7 @@ general { order += "ipv6" order += "wireless _first_" order += "ethernet _first_" +order += "ethernet vpn0" order += "battery 0" order += "load" order += "memory" @@ -30,6 +31,11 @@ ethernet _first_ { format_down = "E: down" } +ethernet vpn0 { + format_up = "VPN (wifi): %ip" + format_down = "VPN (wifi): down" +} + battery 0 { format = "%status %percentage %remaining" }