fire merge conflict

This commit is contained in:
Tristaan
2017-12-22 21:10:14 +01:00
2 changed files with 5 additions and 3 deletions

View File

@@ -7,7 +7,6 @@ exec --no-startup-id xautolock -time 10 -locker ~/.i3/scripts/locker.sh
exec --no-startup-id xautolock -locknow
#DAEMONS
#exec --no-startup-id urxvtd -q
exec --no-startup-id tracker daemon -s
exec --no-startup-id udiskie -t
exec --no-startup-id nitrogen --restore
exec --no-startup-id compton -G -b
@@ -15,6 +14,7 @@ exec --no-startup-id dunst
#exec --no-startup-id mpd
exec --no-startup-id megasync
exec --no-startup-id parcellite
exec --no-startup-id dunst
exec --no-startup-id blueman-applet
#Layout
exec setxkbmap us altgr-intl
@@ -224,8 +224,8 @@ bindsym $alt+i mode "ignore"
#--BAR CONFIGURATION--#
bar {
tray_output primary
status_command i3blocks -c ~/.i3/i3blocks.conf
#status_command i3blocks -c ~/.i3/i3blocks-netbook.conf
#status_command i3blocks -c ~/.i3/i3blocks.conf
status_command i3blocks -c ~/.i3/i3blocks-netbook.conf
mode dock
hidden_state show