diff options
| -rw-r--r-- | .bash_profile | 2 | ||||
| -rw-r--r-- | .config/i3/config | 6 | ||||
| -rw-r--r-- | .config/i3blocks/config | 59 | ||||
| -rwxr-xr-x | .config/i3blocks/scripts/batterybar | 8 | ||||
| -rw-r--r-- | .vim/vimrc | 13 |
5 files changed, 46 insertions, 42 deletions
diff --git a/.bash_profile b/.bash_profile index ae4555c..89a3939 100644 --- a/.bash_profile +++ b/.bash_profile @@ -4,4 +4,4 @@ [[ -f ~/.bashrc ]] && . ~/.bashrc -export PATH="$HOME/.cargo/bin:$PATH" +export PATH="$HOME/.cargo/bin:$HOME/go/bin:$PATH" diff --git a/.config/i3/config b/.config/i3/config index c67ff77..4ca37a3 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -181,7 +181,7 @@ client.background #FFFFFF bar { status_command i3blocks #i3status # | python ~/.config/i3status/wrapper.py position top - font pango:DejaVuSansMono 13 + font pango:DejaVu Sans Mono 13 colors { background #292929 statusline #FFFFFF @@ -191,7 +191,7 @@ bar { active_workspace #333333 #222222 #FFFFFF inactive_workspace #666666 #292929 #888888 urgent_workspace #2F343A #00FFFF #292929 - binding_mode #2F343A #2E9D11 #FFFFFF + binding_mode #00FFFF #292929 #FFFFFF } } @@ -203,7 +203,7 @@ bindsym Mod1+Shift+Tab workspace prev bindsym XF86PowerOff exec --no-startup-id "i3lock -i /home/alec/Downloads/notabug2.png" # fix mouse pointer speed -bindsym ctrl+Mod1+Tab exec --no-startup-id "xinput set-prop 15 'libinput Accel Speed' '-0.75'" +bindsym ctrl+Mod1+Tab exec --no-startup-id "xinput set-prop 'pointer:MX Master 2S' 'libinput Accel Speed' '-0.75'" # jump to urgent window bindsym $mod+x [urgent=latest] focus diff --git a/.config/i3blocks/config b/.config/i3blocks/config index 9ffb7b1..ac3ddbb 100644 --- a/.config/i3blocks/config +++ b/.config/i3blocks/config @@ -101,7 +101,6 @@ interval=10 separator=false label=AVG - # # Temperature # @@ -113,6 +112,29 @@ label=TEMP interval=10 command=/usr/lib/i3blocks/temperature --chip coretemp-isa-0000 +# Key indicators +# +# Add the following bindings to i3 config file: +# +# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks +# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks +[keyindicator] +instance=CAPS +interval=once +signal=11 +# +#[keyindicator] +#instance=NUM +#interval=once +#signal=11 + +[brightness] +command=~/.config/i3blocks/scripts/brightness.py +label= +#☀️ +interval=once +signal=12 + # Battery indicator # # The battery instance defaults to 0. @@ -127,42 +149,19 @@ markup=pango interval=30 #separator=false -[brightness] -command=~/.config/i3blocks/scripts/brightness.py -label= -#☀️ -interval=once -signal=12 - -# Key indicators -# -# Add the following bindings to i3 config file: -# -# bindsym --release Caps_Lock exec pkill -SIGRTMIN+11 i3blocks -# bindsym --release Num_Lock exec pkill -SIGRTMIN+11 i3blocks -#[keyindicator] -#instance=CAPS -#interval=once -#signal=11 -# -#[keyindicator] -#instance=NUM -#interval=once -#signal=11 - # Volume indicator # # The first parameter sets the step (and units to display) # The second parameter overrides the mixer selection # See the script for details. -[volume] -#label=VOL -label=♪ -instance=Master +#[volume] +##label=VOL +#label=♪ +#instance=Master #instance=PCM -interval=once -signal=10 +#interval=once +#signal=10 # Date Time diff --git a/.config/i3blocks/scripts/batterybar b/.config/i3blocks/scripts/batterybar index 46ad51d..5b5e869 100755 --- a/.config/i3blocks/scripts/batterybar +++ b/.config/i3blocks/scripts/batterybar @@ -22,6 +22,7 @@ readarray -t output <<< $(acpi battery) battery_count=${#output[@]} + for line in "${output[@]}"; do percentages+=($(echo "$line" | grep -o -m1 '[0-9]\{1,3\}%' | tr -d '%')) @@ -40,7 +41,7 @@ squares="■" #discharging dis_colors=("#FF0027" "#FF3B05" "#FFB923" "#FFD000" "#E4FF00" "#ADFF00" "#6DFF00" "#10BA00") -charging_color="#00AFE3" +charging_color="#00FFFF" full_color="#FFFFFF" ac_color="#535353" @@ -73,7 +74,7 @@ while getopts 1:2:3:4:5:6:7:8:c:f:a:h opt; do done end=$(($battery_count - 1)) -for i in $(seq 1 $end); +for i in $(seq 0 $end); do if (( percentages[$i] >=85 )); then squares="" @@ -88,7 +89,8 @@ do fi if [[ "${statuses[$i]}" = "Unknown" ]]; then - squares="<sup>?</sup>$squares" + #squares="<sup>?</sup>$squares" + continue fi case "${statuses[$i]}" in @@ -21,6 +21,8 @@ Plugin 'vim-syntastic/syntastic' " Plugin 'powerline/powerline' Plugin 'vim-airline/vim-airline' Plugin 'vim-airline/vim-airline-themes' +"C++ Highlighting +Plugin 'octol/vim-cpp-enhanced-highlight' " The following are examples of different formats supported. " Keep Plugin commands between vundle#begin/end. " plugin on GitHub repo @@ -95,12 +97,12 @@ set smarttab "------------Start Python PEP 8 stuff---------------- " Number of spaces that a pre-existing tab is equal to. -au BufRead,BufNewFile *.html,*py,*pyw,*.c,*.h,*.js set tabstop=4 +au BufRead,BufNewFile *.html,*py,*pyw,*.c,*.h,*.js,*.tex set tabstop=4 "spaces for indents -au BufRead,BufNewFile *.html,*.py,*.pyw,*.js set shiftwidth=4 -au BufRead,BufNewFile *.html,*.py,*.pyw,*.js set expandtab -au BufRead,BufNewFile *.html,*.py,*.js set softtabstop=4 +au BufRead,BufNewFile *.html,*.py,*.pyw,*.js,*.tex set shiftwidth=4 +au BufRead,BufNewFile *.html,*.py,*.pyw,*.js,*.tex set expandtab +au BufRead,BufNewFile *.html,*.py,*.js,*.tex set softtabstop=4 " Use the below highlight group when displaying bad whitespace is desired. highlight BadWhitespace ctermbg=red guibg=red @@ -127,6 +129,7 @@ au BufRead,BufNewFile *.css set shiftwidth=2 au BufRead,BufNewFile *.css set expandtab au BufRead,BufNewFile *.css set softtabstop=2 +au BufRead,BufNewFile *.tex set syntax=context set ai "auto indent set si "smart indent @@ -139,7 +142,7 @@ syntax on highlight Pmenu ctermfg=cyan ctermbg=black let g:ycm_python_binary_path = 'python' -let g:ycm_server_python_interpreter = '/usr/bin/python2' +let g:ycm_server_python_interpreter = '/usr/bin/python' let g:ycm_autoclose_preview_window_after_completion=1 let g:ycm_collect_identifiers_from_comments_and_strings=1 |