Added slock color, merged master

4 files changed, 20 insertions, 2 deletions

diff --git a/.zsh_aliases b/.zsh_aliases
index 69975d1..da8e309 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -110,3 +110,8 @@ alias openpdf='zathura `ls -1 *.pdf | dmenu` &'
 
 alias cagob='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo build'
 alias cagor='RUSTFLAGS="$RUSTFLAGS -A dead_code" cargo run'
+
+# wifi
+wificonnect() {
+    nmcli device wifi connect $1 password $2
+}
diff --git a/install.sh b/install.sh
index e6cff50..c33481a 100755
--- a/install.sh
+++ b/install.sh
@@ -34,6 +34,8 @@ create_dotfile_link_same .gitconfig
 [ ! -d $HOME/.config ] && mkdir $HOME/.config
 create_dotfile_link redshift.conf .config/redshift.conf
 
+create_dotfile_link_same slock/config.def.h
+
 ln -sf $DOTDIR/.xinitrc $HOME/.xinitrc
 ln -sf $DOTDIR/.zprofile $HOME/.zprofile
 
diff --git a/slock/config.def.h b/slock/config.def.h
new file mode 100644
index 0000000..a21b349
--- /dev/null
+++ b/slock/config.def.h
@@ -0,0 +1,12 @@
+/* user and group to drop privileges to */
+static const char *user  = "charles";
+static const char *group = "wheel";
+
+static const char *colorname[NUMCOLS] = {
+	[INIT] =   "#003355",   /* after initialization */
+	[INPUT] =  "#005577",   /* during input */
+	[FAILED] = "#CC3333",   /* wrong password */
+};
+
+/* treat a cleared input like a wrong password (color) */
+static const int failonclear = 1;
diff --git a/xmonad.hs b/xmonad.hs
index a0ac671..6fe103a 100644
--- a/xmonad.hs
+++ b/xmonad.hs
@@ -18,7 +18,7 @@ main = xmonad $ desktopConfig
         , focusedBorderColor = "#bbc5ff"
         , terminal           = "st"
         , layoutHook         = myLayouts
-        , manageHook         = myManageHook
+       , manageHook         = myManageHook
         , modMask            = mod4Mask       -- mod key to super
         , borderWidth        = 1
         , startupHook        = myStartupHook
@@ -33,7 +33,6 @@ myLayouts = tiledBigMaster        -- bigger master for code and smaller slave fo
           tiledEven      = Tall 1 (3 / 100) (1 / 2)
 
 myStartupHook = do
-    spawnOnce "xinput disable 'ETPS/2 Elantech Touchpad' &"        -- disable touchpad
     spawnOnce "redshift -c /home/charles/.config/redshift.conf &"  -- start redshift
 
 myManageHook = insertPosition End Newer  -- insert new window at the end of the current layout