askiiart/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the merge conflict. i already did this, why did it not get committed

Browse source
This commit is contained in:
askiiart 2024-09-27 09:40:00 -05:00
parent a3aacb7415
commit 6cddb84903
Signed by untrusted user who does not match committer: askiiart
GPG key ID: EA85979611654C30
1 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
sway/config
View file

@ -137,7 +137,6 @@ 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"
@ -148,18 +147,6 @@ 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