From 691eb6aac16d7fe9d43b701a6b071a5418964396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9ophile=20Bastian?= Date: Fri, 9 Oct 2020 15:13:49 +0200 Subject: [PATCH] Changes from patate --- files/.bashrc | 4 ++-- files/.config/i3/config | 2 +- files/.i3/py3status/microphone.py | 0 files/.i3status.conf | 10 +++++----- files/.vimrc | 8 +++++++- 5 files changed, 15 insertions(+), 9 deletions(-) mode change 100644 => 100755 files/.i3/py3status/microphone.py diff --git a/files/.bashrc b/files/.bashrc index 2e506cd..14ffcd5 100644 --- a/files/.bashrc +++ b/files/.bashrc @@ -25,8 +25,8 @@ if [ -n "$PS1" ]; then # make less more friendly for non-text input files, see lesspipe(1) [ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)" - if [ -f /etc/bash_completion ] && ! shopt -oq posix; then - . /etc/bash_completion + if [ -f /usr/share/bash_completion ] && ! shopt -oq posix; then + . /usr/share/bash_completion fi [ -f ~/.bash_ps1 ] && source ~/.bash_ps1 diff --git a/files/.config/i3/config b/files/.config/i3/config index c0812c1..d2ceab8 100644 --- a/files/.config/i3/config +++ b/files/.config/i3/config @@ -34,6 +34,7 @@ bindsym $mod+Return exec /usr/bin/terminator # lock the screen bindsym $mod+z exec ~/.config/i3/bin/i3lock +bindsym $mod+Shift+z exec ~/bin/locksuspend # kill focused window bindsym $mod+Shift+q kill @@ -231,4 +232,3 @@ exec --no-startup-id setxkbmap -option caps:swapescape # Screen lock exec --no-startup-id xautolock -time 10 -locker ~/.config/i3/bin/i3lock - diff --git a/files/.i3/py3status/microphone.py b/files/.i3/py3status/microphone.py old mode 100644 new mode 100755 diff --git a/files/.i3status.conf b/files/.i3status.conf index 6db2db9..2bcba46 100644 --- a/files/.i3status.conf +++ b/files/.i3status.conf @@ -29,7 +29,7 @@ order += "cpu_temperature 0" order += "tztime local" arch_updates { - format = "\uf0ed {pacman}" + format = " {pacman}" } microphone { @@ -53,8 +53,8 @@ wireless wlo1 { ethernet eno1 { # if you use %speed, i3status requires root privileges - format_up = " %ip (%speed)" - format_down = "" + format_up = " %ip (%speed)" + format_down = "" } path_exists VPN { @@ -64,7 +64,7 @@ path_exists VPN { battery 1 { format = "%status %percentage %remaining (%consumption)" status_chr = "" - status_bat = "" + status_bat = "" status_full= "" low_threshold = 20 threshold_type = "percentage" @@ -84,7 +84,7 @@ tztime local { } load { - format = " %1min" + format = " %1min" } cpu_temperature 0 { diff --git a/files/.vimrc b/files/.vimrc index be0c9a2..df31ec4 100644 --- a/files/.vimrc +++ b/files/.vimrc @@ -136,15 +136,21 @@ execute "set rtp+=" . g:opamshare . "/merlin/vimbufsync" execute "set rtp+=" . g:opamshare . "/ocp-indent/vim" """"""""""""""""" Python +function Autoblack() + if g:black_auto + execute ':Black' + endif +endfunction augroup python_settings autocmd! - autocmd BufWritePre *.py execute ':Black' + autocmd BufWritePre *.py call Autoblack() autocmd FileType python nmap b :Black autocmd FileType python set colorcolumn=88 autocmd FileType python set textwidth=87 augroup END let g:jedi#goto_definitions_command = "l" let g:jedi#completions_enabled = 0 +let g:black_auto = 1 """"""""""""""""" Airline set laststatus=2