minor inconsequential updates
This commit is contained in:
parent
06f2f570f7
commit
a3aacb7415
3 changed files with 16 additions and 11 deletions
|
@ -1,11 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
set -e
|
|
||||||
GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
|
|
||||||
(
|
|
||||||
crontab -l 2>/dev/null
|
|
||||||
echo "* * * * * $GIT_DIR/commit.sh"
|
|
||||||
) | crontab -
|
|
||||||
|
|
||||||
############################################################################
|
|
||||||
# NOTE: commit signing must be turned off, or not require any interaction. #
|
|
||||||
############################################################################
|
|
|
@ -4,12 +4,15 @@ command_exists() { type "$1" &>/dev/null; }
|
||||||
|
|
||||||
cd distro-specific-scripts/
|
cd distro-specific-scripts/
|
||||||
distro=""
|
distro=""
|
||||||
|
|
||||||
if command_exists "pacman"; then
|
if command_exists "pacman"; then
|
||||||
distro="arch"
|
distro="arch"
|
||||||
elif command_exists "dnf" || command_exists "rpm-ostree"; then
|
elif command_exists "dnf" || command_exists "rpm-ostree"; then
|
||||||
distro="fedora"
|
distro="fedora"
|
||||||
elif command_exists "xbps-install"; then
|
elif command_exists "xbps-install"; then
|
||||||
distro="void"
|
distro="void"
|
||||||
|
else
|
||||||
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
./${distro}-${XDG_CURRENT_DESKTOP}.sh
|
./${distro}-${XDG_CURRENT_DESKTOP}.sh
|
||||||
|
|
13
sway/config
13
sway/config
|
@ -137,6 +137,7 @@ exec waybar
|
||||||
# Workspaces:
|
# Workspaces:
|
||||||
#
|
#
|
||||||
# Switch to workspace
|
# Switch to workspace
|
||||||
|
<<<<<<< Updated upstream
|
||||||
bindsym $mod+1 exec "~/.config/sway/switch-workspace.sh 1"
|
bindsym $mod+1 exec "~/.config/sway/switch-workspace.sh 1"
|
||||||
bindsym $mod+2 exec "~/.config/sway/switch-workspace.sh 2"
|
bindsym $mod+2 exec "~/.config/sway/switch-workspace.sh 2"
|
||||||
bindsym $mod+3 exec "~/.config/sway/switch-workspace.sh 3"
|
bindsym $mod+3 exec "~/.config/sway/switch-workspace.sh 3"
|
||||||
|
@ -147,6 +148,18 @@ exec waybar
|
||||||
bindsym $mod+8 exec "~/.config/sway/switch-workspace.sh 8"
|
bindsym $mod+8 exec "~/.config/sway/switch-workspace.sh 8"
|
||||||
bindsym $mod+9 exec "~/.config/sway/switch-workspace.sh 9"
|
bindsym $mod+9 exec "~/.config/sway/switch-workspace.sh 9"
|
||||||
bindsym $mod+0 exec "~/.config/sway/switch-workspace.sh 10"
|
bindsym $mod+0 exec "~/.config/sway/switch-workspace.sh 10"
|
||||||
|
=======
|
||||||
|
bindsym $mod+1 exec '~/.config/sway/switch-workspace.sh 1'
|
||||||
|
bindsym $mod+2 exec '~/.config/sway/switch-workspace.sh 2'
|
||||||
|
bindsym $mod+3 exec '~/.config/sway/switch-workspace.sh 3'
|
||||||
|
bindsym $mod+4 exec '~/.config/sway/switch-workspace.sh 4'
|
||||||
|
bindsym $mod+5 exec '~/.config/sway/switch-workspace.sh 5'
|
||||||
|
bindsym $mod+6 exec '~/.config/sway/switch-workspace.sh 6'
|
||||||
|
bindsym $mod+7 exec '~/.config/sway/switch-workspace.sh 7'
|
||||||
|
bindsym $mod+8 exec '~/.config/sway/switch-workspace.sh 8'
|
||||||
|
bindsym $mod+9 exec '~/.config/sway/switch-workspace.sh 9'
|
||||||
|
bindsym $mod+0 exec '~/.config/sway/switch-workspace.sh 10'
|
||||||
|
>>>>>>> Stashed changes
|
||||||
bindsym $mod+equal workspace side
|
bindsym $mod+equal workspace side
|
||||||
# Move focused container to workspace
|
# Move focused container to workspace
|
||||||
bindsym $mod+Shift+1 move container to workspace number 1
|
bindsym $mod+Shift+1 move container to workspace number 1
|
||||||
|
|
Loading…
Reference in a new issue