Commit c16cd2dd authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge remote-tracking branch 'origin/master'

parents fdfea330 000dce1e

.config/awesome/user-defined.lua

+6 −1
Original line number Diff line number Diff line
@@ -107,7 +107,12 @@ end 
if util.path.has_executable('light-locker') then

	awful.spawn{'light-locker'}

end

if util.path.has_executable('pulseaudio') then

if util.path.has_executable('nitrogen') then

	awful.spawn{'nitrogen', '--restore'}

end

if util.path.has_executable('start-pulseaudio-x11') then

	awful.spawn{'start-pulseaudio-x11'}

elseif util.path.has_executable('pulseaudio') then

	awful.spawn{'pulseaudio'}

end

if util.path.has_executable('guake') then

.oh-my-zsh @ f461d21d

Compare ebda8af8 to f461d21d
Original line number Diff line number Diff line 
Subproject commit ebda8af870acc295388ed187f0139a8bffa83196
 
Subproject commit f461d21de1bd0c1394e57a2e3af69778692e4ba4

vim-fugitive @ b571bff9

Compare dd4d4c75 to b571bff9
Original line number Diff line number Diff line 
Subproject commit dd4d4c75959767b591852091bb73b7c7a85a02e2
 
Subproject commit b571bff9ec146685947ab91a2f11dd73d0d7ae44