Merge branch 'project-overhaul' into dev
This commit is contained in:
commit
e59073cf20
4 changed files with 4 additions and 3 deletions
|
|
@ -1285,7 +1285,7 @@ def screensaver(name):
|
||||||
|
|
||||||
# Switch pane to fullscreen and start screensaver
|
# Switch pane to fullscreen and start screensaver
|
||||||
tmux.zoom_pane()
|
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()
|
tmux.zoom_pane()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
<execute>gparted</execute>
|
<execute>gparted</execute>
|
||||||
</action> </item>
|
</action> </item>
|
||||||
<item label="GSmartControl"> <action name="Execute">
|
<item label="GSmartControl"> <action name="Execute">
|
||||||
<execute>gsmartcontrol</execute>
|
<execute>gsmartcontrol_polkit</execute>
|
||||||
</action> </item>
|
</action> </item>
|
||||||
<item label="Network Diagnostics"> <action name="Execute">
|
<item label="Network Diagnostics"> <action name="Execute">
|
||||||
<execute>urxvt -title "Network Diagnostics" -hold -e hw-diags-network</execute>
|
<execute>urxvt -title "Network Diagnostics" -hold -e hw-diags-network</execute>
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ sed -i -r "s/#Network//" "${CONFIG_NEW}"
|
||||||
|
|
||||||
# Fix under i3
|
# Fix under i3
|
||||||
if ! [[ "${I3SOCK:-}" == "" ]]; then
|
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
|
fi
|
||||||
|
|
||||||
# Replace config if there were changes
|
# Replace config if there were changes
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ ntfs-3g
|
||||||
openssh
|
openssh
|
||||||
p7zip
|
p7zip
|
||||||
pango
|
pango
|
||||||
|
perl-rename
|
||||||
progsreiserfs
|
progsreiserfs
|
||||||
refind-efi
|
refind-efi
|
||||||
rsync
|
rsync
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue