autostart: combine with keyboard-swap

diff --git a/autostart b/autostart
index 8cdc59eb73cf40624bd7d513e0ee4f1f1b30a4c7..264004f576b24e06f6181bc5dddd92d085f4f711 100755 (executable)
--- a/autostart
+++ b/autostart
@@ -7,7 +7,8 @@ else
   hsetroot -solid "#282828"
 fi
 
   hsetroot -solid "#282828"
 fi
 

-/home/armaa/Code/scripts/keyboard-swap
+setxkbmap -option "ctrl:swapcaps"
+pkill xcape ; xcape

 pkill batsignal ; batsignal -b
 pkill redshift ; redshift -l 42.2:-71.3 -t 6500:2500 &
 pkill dunst ; dunst &
 pkill batsignal ; batsignal -b
 pkill redshift ; redshift -l 42.2:-71.3 -t 6500:2500 &
 pkill dunst ; dunst &

diff --git a/keyboard-swap b/keyboard-swap
deleted file mode 100755 (executable)
index 6e77d16..0000000
--- a/keyboard-swap
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env sh
-# Swaps caps and control, then makes it so holding the old caps key acts as
-# control and tapping it as escape
-
-setxkbmap -option "ctrl:swapcaps"
-pkill xcape && xcape