1
0
Fork 0

dunst fix, switch to xscreensaver and proper support for the whole git repo tree

This commit is contained in:
Von Random 2017-08-08 14:02:56 +03:00
parent 724af4b844
commit 25eeeff21d
3 changed files with 18 additions and 4 deletions

View file

@ -38,13 +38,26 @@ gdf()
fi fi
} }
is_git_repo()
{
local curr_dir="$PWD"
while [[ -n "${curr_dir}" ]]; do
if [[ -r "${curr_dir}/.git/HEAD" ]]; then
return 0
else
curr_dir="${curr_dir%/*}"
fi
done
return 1
}
git_prompt() git_prompt()
{ {
prompt_command prompt_command
if [[ ! -r ./.git/HEAD ]] || ! local raw_status="$(git status --porcelain -bu 2>/dev/null)"; then is_git_repo || return 0
return
fi local raw_status="$(git status --porcelain -bu 2>/dev/null)"
local branch_info full_status IFS= local branch_info full_status IFS=
local git_status='' local git_status=''
local staged_count=0 local staged_count=0

View file

@ -29,6 +29,7 @@
browser = /home/von/.local/bin/default-web-browser browser = /home/von/.local/bin/default-web-browser
icon_position = left icon_position = left
icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/ icon_folders = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
max_icon_size = 32
[frame] [frame]
width = 1 width = 1

View file

@ -111,7 +111,7 @@ bindsym $mod+Control+r restart
# exit i3 (logs you out of your X session) # exit i3 (logs you out of your X session)
bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'" bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
# lock screen # lock screen
bindsym $mod+z exec "xautolock -locknow" bindsym $mod+z exec "xscreensaver-command -lock"
# toggle touchpad # toggle touchpad
bindsym XF86TouchpadToggle exec "touchpad-toggle" bindsym XF86TouchpadToggle exec "touchpad-toggle"
bindsym XF86KbdBrightnessDown exec "keybrightness d" bindsym XF86KbdBrightnessDown exec "keybrightness d"