commit af6f380c31dde220b7dcd5495201ac221c98cef3
parent 2da95a09ee649e4b601587f6df9ab8af5e3da001
Author: Luke Smith <luke@lukesmith.xyz>
Date: Sat, 1 Feb 2020 16:07:22 -0500
Merge branch 'master' of github.com:LukeSmithxyz/voidrice
Diffstat:
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.config/gtk-2.0/gtkrc-2.0 b/.config/gtk-2.0/gtkrc-2.0
@@ -1,7 +1,7 @@
# DO NOT EDIT! This file will be overwritten by LXAppearance.
# Any customization should be done in ~/.gtkrc-2.0.mine instead.
-include "/home/luke/.gtkrc-2.0.mine"
+include "~/.gtkrc-2.0.mine"
gtk-theme-name="Arc-Gruvbox"
gtk-icon-theme-name="Adwaita"
gtk-font-name="Sans 10"
diff --git a/.config/i3/config b/.config/i3/config
@@ -55,7 +55,7 @@ bindsym $mod+grave exec --no-startup-id dmenuunicode
##bindsym $mod+asciitilde
#STOP/HIDE EVERYTHING:
-bindsym $mod+Shift+Delete exec --no-startup-id amixer sset Master mute ; exec --no-startup-id mpc pause ; pkill -RTMIN+10 i3blocks ; exec --no-startup-id pauseallmpv; workspace 0; exec $term -e htop ; exec $term -e $FILE
+bindsym $mod+Shift+Delete exec --no-startup-id amixer sset Master mute ; exec --no-startup-id mpc pause && pkill -RTMIN+10 i3blocks ; exec --no-startup-id pauseallmpv; workspace 0; exec $term -e htop ; exec $term -e $FILE
# Show selection:
bindsym $mod+Insert exec --no-startup-id showclip
@@ -146,7 +146,7 @@ bindsym $mod+n exec $term -e newsboat && pkill -RTMIN+6 i3blocks
bindsym $mod+Shift+n floating toggle; sticky toggle; exec --no-startup-id hover right
bindsym $mod+m exec --no-startup-id $term -e ncmpcpp
-bindsym $mod+Shift+m exec --no-startup-id amixer sset Master toggle; pkill -RTMIN+10 i3blocks
+bindsym $mod+Shift+m exec --no-startup-id amixer sset Master toggle && pkill -RTMIN+10 i3blocks
# #---Workspace Bindings---# #
bindsym $mod+Home workspace $ws1
@@ -247,10 +247,10 @@ bindsym $mod+Ctrl+Right move workspace to output right
# #---Media Keys---# #
# Volume keys
-bindsym $mod+plus exec --no-startup-id amixer sset Master 5%+; pkill -RTMIN+10 i3blocks
-bindsym $mod+Shift+plus exec --no-startup-id amixer sset Master 15%+; pkill -RTMIN+10 i3blocks
-bindsym $mod+minus exec --no-startup-id amixer sset Master 5%-; pkill -RTMIN+10 i3blocks
-bindsym $mod+Shift+minus exec --no-startup-id amixer sset Master 15%-; pkill -RTMIN+10 i3blocks
+bindsym $mod+plus exec --no-startup-id amixer sset Master 5%+ && pkill -RTMIN+10 i3blocks
+bindsym $mod+Shift+plus exec --no-startup-id amixer sset Master 15%+ && pkill -RTMIN+10 i3blocks
+bindsym $mod+minus exec --no-startup-id amixer sset Master 5%- && pkill -RTMIN+10 i3blocks
+bindsym $mod+Shift+minus exec --no-startup-id amixer sset Master 15%- && pkill -RTMIN+10 i3blocks
bindsym $mod+less exec --no-startup-id mpc prev
bindsym $mod+Shift+less exec --no-startup-id mpc seek 0%
bindsym $mod+greater exec --no-startup-id mpc next
@@ -271,13 +271,13 @@ bindsym $mod+Delete exec $stoprec
bindsym XF86Launch1 exec --no-startup-id xset dpms force off
# #---Extra XF86 Keys---# #
-bindsym XF86AudioMute exec --no-startup-id amixer sset Master toggle; pkill -RTMIN+10 i3blocks
-bindsym XF86AudioLowerVolume exec --no-startup-id amixer sset Master 5%-; pkill -RTMIN+10 i3blocks
-bindsym Shift+XF86AudioLowerVolume exec --no-startup-id amixer sset Master 10%-; pkill -RTMIN+10 i3blocks
-bindsym Control+XF86AudioLowerVolume exec --no-startup-id amixer sset Master 1%-; pkill -RTMIN+10 i3blocks
-bindsym XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 5%+; pkill -RTMIN+10 i3blocks
-bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 10%+; pkill -RTMIN+10 i3blocks
-bindsym Control+XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 1%+; pkill -RTMIN+10 i3blocks
+bindsym XF86AudioMute exec --no-startup-id amixer sset Master toggle && pkill -RTMIN+10 i3blocks
+bindsym XF86AudioLowerVolume exec --no-startup-id amixer sset Master 5%- && pkill -RTMIN+10 i3blocks
+bindsym Shift+XF86AudioLowerVolume exec --no-startup-id amixer sset Master 10%- && pkill -RTMIN+10 i3blocks
+bindsym Control+XF86AudioLowerVolume exec --no-startup-id amixer sset Master 1%- && pkill -RTMIN+10 i3blocks
+bindsym XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 5%+ && pkill -RTMIN+10 i3blocks
+bindsym Shift+XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 10%+ && pkill -RTMIN+10 i3blocks
+bindsym Control+XF86AudioRaiseVolume exec --no-startup-id amixer sset Master 1%+ && pkill -RTMIN+10 i3blocks
bindsym XF86PowerOff exec --no-startup-id prompt "Shutdown computer?" "$shutdown"
##bindsym XF86Copy exec
##bindsym XF86Open exec
diff --git a/.local/bin/cron/IMPORTANT_NOTE.md b/.local/bin/cron/IMPORTANT_NOTE.md
@@ -8,4 +8,4 @@ When you add them as cronjobs, I recommend you precede the command with commands
export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/1000/bus; export DISPLAY=:0; . $HOME/.zprofile; then_command_goes_here
```
-This ensures that notifications will display, xdotool commands will function and environmental varialbes will work as well.
+This ensures that notifications will display, xdotool commands will function and environmental variables will work as well.