dotfiles

commit 5b4d63ffafdde99c8c973c65d0df45437e6588fd
parent 1405479b47694d915f96efadd522a97999c7563e
Author: Anders Damsgaard <anders@adamsgaard.dk>
Date:   Fri,  8 Mar 2019 12:41:58 +0100

Fix lock, use file as colortheme input, update dwm

Diffstat:
M
links/.colors/solarized
 | 
2
+-
M
links/.colors/solarized_black
 | 
2
+-
M
links/.colors/solarized_light
 | 
2
+-
M
links/.commands.sh
 | 
6
++++--
M
links/bin/colortheme
 | 
20
++++++--------------
M
links/bin/xlock
 | 
4
++--

6 files changed, 15 insertions(+), 21 deletions(-)
diff --git a/links/.colors/solarized b/links/.colors/solarized
@@ -40,7 +40,7 @@
 *foreground:            #657b83
 *fading:                40
 *fadeColor:             S_base03
-*cursorColor:           S_base1
+*cursorColor:           #93a1a1
 *pointerColorBackground:S_base01
 *pointerColorForeground:S_base1
 
diff --git a/links/.colors/solarized_black b/links/.colors/solarized_black
@@ -40,7 +40,7 @@
 *foreground:            #657b83
 *fading:                40
 *fadeColor:             S_base03
-*cursorColor:           S_base1
+*cursorColor:           #93a1a1
 *pointerColorBackground:S_base01
 *pointerColorForeground:S_base1
 
diff --git a/links/.colors/solarized_light b/links/.colors/solarized_light
@@ -20,7 +20,7 @@
 *foreground: #657b83
 *fading: 40
 *fadeColor: S_base3
-*cursorColor: S_base01
+*cursorColor: #586e75
 *pointerColorBackground:S_base1
 *pointerColorForeground:S_base01
 
diff --git a/links/.commands.sh b/links/.commands.sh
@@ -178,7 +178,7 @@ t-remove-all() {
 
 m-all-sl() {
     for d in ~/code/dotfiles/lib/{dwm,slstatus,st,surf,tabbed}; do
-        cd "$d" && make install
+        cd "$d" && sudo make install; cd - || return
     done
 }
 
@@ -187,7 +187,9 @@ gcagp-all-sl() {
     read -r "input?commit message [$msg]: "
     msg="${input:-$msg}"
     for d in ~/code/dotfiles/lib/{dwm,slstatus,st,surf,tabbed}; do
-        cd "$d" && git commit --all -m "$msg" --verbose --gpg-sign && git push
+        cd "$d" && \
+            git commit --all -m "$msg" --verbose --gpg-sign && git push;
+        cd - || return
     done
 }
 
diff --git a/links/bin/colortheme b/links/bin/colortheme
@@ -2,7 +2,6 @@
 set -e
 
 version="0.1.0"
-themedir=~/.colors
 slroot=~/code/dotfiles/lib
 
 function die {
@@ -11,15 +10,13 @@ function die {
 }
 
 function show_help {
-    echo "usage: ${0##*/} [OPTION] COMMAND THEMENAME"
-    echo "where COMMAND is one of the following:"
-    echo "  list: Show all color schemes available in $themedir"
-    echo "   set: Write colors from THEMENAME to:"
+    echo "usage: ${0##*/} [OPTION] COMMAND THEMEFILE"
+    echo "Writes colors from THEMEFILE to:"
     echo "            ~/.Xresources"
     echo "            $slroot/st/config.h"
     echo "            $slroot/tabbed/config.h"
     echo "            $slroot/dwm/config.h"
-    echo "        if they exist."
+    echo "if they exist."
     echo "Valid OPTIONS are:"
     echo "   -h, --help     show this message"
     echo "   -v, --version  show version information"
@@ -31,11 +28,6 @@ function show_version {
     echo "Written by Anders Damsgaard <anders@adamsgaard.dk>"
 }
 
-function show_themes {
-    themes=$(ls "$themedir/")
-    echo "${themes[@]}"
-}
-
 function get_theme_color {
     ! [ -f "$path" ] && die "Error: Could not find $path"
     grep --ignore-case "^\*\.*$1:" "$path" | awk '{ print $2 }'
@@ -64,7 +56,7 @@ function report_colors {
 }
 
 function get_colors {
-    path="$themedir/$1"
+    path="$1"
     ! [ -f "$path" ] && die "Error: Could not find $path"
     foreground=$(get_theme_color foreground)
     background=$(get_theme_color background)
@@ -206,7 +198,7 @@ while :; do
     shift
 done
 
-[[ $settheme = 1 && $# -lt 1 ]] && die 'Error: No THEMENAME specified'
-[[ $settheme = 1 && $# -gt 1 ]] && die 'Error: More than one THEMENAME specified'
+[[ $settheme = 1 && $# -lt 1 ]] && die 'Error: No THEMEFILE specified'
+[[ $settheme = 1 && $# -gt 1 ]] && die 'Error: More than one THEMEFILE specified'
 
 set_colors "$1"
diff --git a/links/bin/xlock b/links/bin/xlock
@@ -16,8 +16,8 @@ maim $img
 #gm convert $img -blur 0x10 $img
 convert $img \
     -blur 0x10 \
-    -gamma 0.20 \
-    -level -20% \
+    -gamma 0.25 \
+    -level -50% \
     -fill white \
     -gravity Center \
     -font 'PragmataPro' \