Merge branch 'project-overhaul' into dev

This commit is contained in:
2Shirt 2020-01-19 15:58:26 -07:00
commit e59073cf20
Signed by: 2Shirt
GPG key ID: 152FAC923B0E132C
4 changed files with 4 additions and 3 deletions

View file

@ -1285,7 +1285,7 @@ def screensaver(name):
# Switch pane to fullscreen and start screensaver
tmux.zoom_pane()
exe.run_program(cmd, check=False, pipe=False)
exe.run_program(cmd, check=False, pipe=False, stderr=subprocess.PIPE)
tmux.zoom_pane()

View file

@ -16,7 +16,7 @@
<execute>gparted</execute>
</action> </item>
<item label="GSmartControl"> <action name="Execute">
<execute>gsmartcontrol</execute>
<execute>gsmartcontrol_polkit</execute>
</action> </item>
<item label="Network Diagnostics"> <action name="Execute">
<execute>urxvt -title "Network Diagnostics" -hold -e hw-diags-network</execute>

View file

@ -26,7 +26,7 @@ sed -i -r "s/#Network//" "${CONFIG_NEW}"
# Fix under i3
if ! [[ "${I3SOCK:-}" == "" ]]; then
sed -i -r 's/(own_window_type)(.*)(desktop)/\1\2override/' "${CONKY_NEW}"
sed -i -r 's/(own_window_type)(.*)(desktop)/\1\2override/' "${CONFIG_NEW}"
fi
# Replace config if there were changes

View file

@ -21,6 +21,7 @@ ntfs-3g
openssh
p7zip
pango
perl-rename
progsreiserfs
refind-efi
rsync