From d14462a89e3024f8cebe8d20beb4e33fc0479298 Mon Sep 17 00:00:00 2001 From: Adam Date: Mon, 30 Sep 2024 09:27:34 -0600 Subject: [PATCH] local changes, some cleanup --- .gitmodules | 6 ----- dotbash_profile | 36 +++++++++++++++++++++++++++++- dotvim/bundle/jshint.vim | 1 - dotvim/bundle/vim-colors-solarized | 1 - dotvimrc | 20 +++++++++++++++-- dotxresources | 17 +++++++++----- i3/i3.conf | 8 +++---- i3/i3status.conf | 6 ++--- 8 files changed, 71 insertions(+), 24 deletions(-) delete mode 160000 dotvim/bundle/jshint.vim delete mode 160000 dotvim/bundle/vim-colors-solarized diff --git a/.gitmodules b/.gitmodules index 97c7894..f519fcb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,12 +7,6 @@ [submodule "dotvim/bundle/vim-flake8"] path = dotvim/bundle/vim-flake8 url = https://github.com/nvie/vim-flake8.git -[submodule "dotvim/bundle/vim-colors-solarized"] - path = dotvim/bundle/vim-colors-solarized - url = https://github.com/altercation/vim-colors-solarized.git -[submodule "dotvim/bundle/jshint.vim"] - path = dotvim/bundle/jshint.vim - url = https://github.com/walm/jshint.vim.git [submodule "dotvim/bundle/vim-go"] path = dotvim/bundle/vim-go url = git@github.com:fatih/vim-go.git diff --git a/dotbash_profile b/dotbash_profile index 4daa08c..6b3a554 100644 --- a/dotbash_profile +++ b/dotbash_profile @@ -69,6 +69,7 @@ fi export PYTHON_ENV_PATH=$HOME/env export PIP_REQUIRE_VIRTUALENV=true +export VIRTUAL_ENV_DISABLE_PROMPT=1 function activate () { command source $PYTHON_ENV_PATH/$1/bin/activate @@ -90,6 +91,23 @@ function _envdir () { } complete -F _envdir activate +# Load pyenv automatically by appending +# the following to +# ~/.bash_profile if it exists, otherwise ~/.profile (for login shells) +# and ~/.bashrc (for interactive shells) : + +export PYENV_ROOT="$HOME/.pyenv" +[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init -)" + +# Restart your shell for the changes to take effect. + +# Load pyenv-virtualenv automatically by adding +# the following to ~/.bashrc: + +eval "$(pyenv virtualenv-init -)" + + ################################################## # # Go Stuffs @@ -141,6 +159,8 @@ function _ssh_hosts () { } complete -F _ssh_hosts ssh +export SSH_AUTH_SOCK=~/.1password/agent.sock + ################################################## # # k8s stuffs @@ -149,6 +169,14 @@ complete -F _ssh_hosts ssh #KIND_EXPERIMENTAL_PROVIDER=podman +################################################## +# +# jq stuffs +# +################################################## + +export JQ_COLORS="1;37:1;37:1;37:1;37:1;32:1;37:1;37" + ################################################## # # Aliases, etc. @@ -157,9 +185,15 @@ complete -F _ssh_hosts ssh alias ls="ls --color=auto" alias grep="grep --color=auto" +alias mood="curl https://ramses.coffee/stuff/moodface.txt" + export EDITOR=/usr/bin/vi export PATH=~/bin/android_sdk/cmdline-tools/latest/bin:$PATH -export PATH=~/bin:~/.local/bin:/opt/bin:/opt/VSCode-linux-x64/bin:$PATH +export PATH="~/bin:~/.local/bin:~/.krew/bin:/opt/bin:/opt/VSCode-linux-x64/bin:$PATH" . "$HOME/.cargo/env" +export PATH=~/.krew/bin:$PATH # eval "$(direnv hook bash)" +export GH_PAT=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 + +export VAULT_ADDR="https://vault-api.internal.digitalocean.com:8200" diff --git a/dotvim/bundle/jshint.vim b/dotvim/bundle/jshint.vim deleted file mode 160000 index 68a9a7c..0000000 --- a/dotvim/bundle/jshint.vim +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 68a9a7c0fea24ddbbd9beecab1fa68f9bf3d7dc2 diff --git a/dotvim/bundle/vim-colors-solarized b/dotvim/bundle/vim-colors-solarized deleted file mode 160000 index 528a59f..0000000 --- a/dotvim/bundle/vim-colors-solarized +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 528a59f26d12278698bb946f8fb82a63711eec21 diff --git a/dotvimrc b/dotvimrc index 3128c57..1c67615 100644 --- a/dotvimrc +++ b/dotvimrc @@ -35,8 +35,8 @@ set hlsearch set switchbuf=usetab " Disable Mouse Interactions -set mouse= -set ttymouse= +set mouse=a +set ttymouse=urxvt map :tabnew map :tabnext @@ -55,6 +55,22 @@ 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] + map f :CtrlP map a :NERDTreeToggle map b :Git blame diff --git a/dotxresources b/dotxresources index 03712a2..ee59305 100644 --- a/dotxresources +++ b/dotxresources @@ -1,9 +1,14 @@ -URxvt*loginShell: true -URxvt*background: #1D2021 -URxvt*foreground: #FBF1C7 -URxvt*font: xft:Liberation Mono:pixelsize=18: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=18:antialias=true:autohint=true +URxvt.scrollBar: false +URxvt.saveLines: 65535 +URxvt.url-launcher: /usr/bin/xdg-open +URxvt.perl-ext-common: default,matcher +URxvt.matcher.button: 1 +URxvt.matcher.pattern.1: '(?i)\\b((?:[a-z][\\w-]+:(?:/{1,3}|[a-z0-9%])|www\\d{0,3}[.]|[a-z0-9.\\-]+[.][a-z]{2,4}/)(?:[^\\s()<>]+|\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\))+(?:\\(([^\\s()<>]+|(\\([^\\s()<>]+\\)))*\\)|[^\\s`!()\\[\\]{};:\'".,<>?«»“”‘’]))' +URxvt.matcher.rend.0: fg16 RS_Uline Xft*dpi: 96 Xft*antialias: True Xft*hinting: Full diff --git a/i3/i3.conf b/i3/i3.conf index 8410137..2233cdf 100644 --- a/i3/i3.conf +++ b/i3/i3.conf @@ -49,10 +49,10 @@ 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" +bindcode $mod+40 exec "rofi -show combi" # 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 @@ -229,7 +229,7 @@ bar { active_workspace $gruv_fg4 $gruv_bg1 $gruv_fg4 urgent_workspace $gruv_fg $gruv_red $gruv_fg } - font pango:Exo 2 10 + font pango:Exo 2 12 } # Apply xmodmap diff --git a/i3/i3status.conf b/i3/i3status.conf index 8268b6f..aa3d725 100644 --- a/i3/i3status.conf +++ b/i3/i3status.conf @@ -17,7 +17,7 @@ general { order += "ipv6" order += "wireless _first_" order += "ethernet _first_" -order += "ethernet mullvad-us10" +order += "ethernet gpd0" order += "battery 0" order += "load" order += "memory" @@ -34,7 +34,7 @@ ethernet _first_ { format_down = "E: down" } -ethernet vpn0 { +ethernet gpd0 { format_up = "VPN: %ip" format_down = "VPN: down" } @@ -60,7 +60,7 @@ tztime local { volume master { format = "♪: %volume" format_muted = "♪: muted (%volume)" - device = "pulse:alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y75Z9UA21E5007-00.iec958-stereo" + device = "pulse:alsa_output.usb-Focusrite_Scarlett_Solo_USB_Y75Z9UA21E5007-00.analog-stereo" mixer = "Master" mixer_idx = 0 } -- 2.39.5