Merge branch 'master' of https://github.com./Matir/skel

dotfiles/config/i3/config

@@ -130,10 +130,11 @@ bindsym $alt+Control+Left workspace prev
 
 # i3 lock
 exec --no-startup-id ~/bin/i3lock.sh &
+exec --no-startup-id xset dpms 600
 bindsym $mod+l exec \
-  bash -c "i3lock -c 000000 -d && (sleep 2 && xset dpms force off) &"
+  bash -c "i3lock -c 000000 && (sleep 2 && xset dpms force off) &"
 bindsym $alt+Control+l exec \
-  bash -c "i3lock -c 000000 -d && (sleep 2 && xset dpms force off) &"
+  bash -c "i3lock -c 000000 && (sleep 2 && xset dpms force off) &"
 
 # things to start quickly
 bindsym $mod+g exec /usr/bin/google-chrome-beta --password-store=gnome
@@ -169,14 +170,14 @@ bindsym --release $alt+Sys_Req exec --no-startup-id \
   /usr/bin/scrot -s $screendir/$scrotformat
 
 # useful utilities
-exec --no-startup-id \
-  (which xss-lock >/dev/null || /usr/bin/cinnamon-settings-daemon) &
+#exec --no-startup-id \
+#  (which xss-lock >/dev/null || /usr/bin/cinnamon-settings-daemon) &
 exec --no-startup-id gnome-keyring-daemon --start --components=pkcs11,secrets
 # Make GTK fonts look great again
-exec --no-startup-id gnome-settings-daemon
-exec --no-startup-id (sleep 2; nm-applet) &
+#exec --no-startup-id gnome-settings-daemon
+#exec --no-startup-id (sleep 2; nm-applet) &
 exec --no-startup-id xset r rate 200 20
-exec --no-startup-id ~/bin/autostart.py
+#exec --no-startup-id ~/bin/autostart.py
 exec --no-startup-id dex --autostart --environment x-cinnamon
 
 # customize windows

dotfiles/env

@@ -47,7 +47,7 @@ export GPG_ID=7FD58D9A196DCEEEAD671F94F4D7A7915DEA789B
 
 # Setup locale
 if test -x /usr/bin/locale ; then
-  for l in en_US.UTF-8 C.UTF-8 C ; do
+  for l in en_US.utf8 C.UTF-8 C ; do
     if /usr/bin/locale -a | grep -q "${l}" ; then
       export LC_CTYPE=${l}
       export LC_NUMERIC=${l}

dotfiles/rvmrc

@@ -0,0 +1 @@
+rvm_silence_path_mismatch_check_flag=1

dotfiles/zpreztorc

@@ -80,6 +80,9 @@ zstyle ':prezto:module:editor' key-bindings 'vi'
 # Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
 # zstyle ':prezto:module:git:status:ignore' submodules 'all'
 
+# Don't set up aliases I never use
+zstyle ':prezto:module:git:alias' skip 'yes'
+
 #
 # GNU Utility
 #

dotfiles/zshrc

@@ -59,7 +59,8 @@ bindkey '^r' history-incremental-search-backward
 # Source extras and aliases if interactive
 if [[ $- == *i* ]] ; then
   if [[ -e $HOME/.aliases ]] ; then source $HOME/.aliases ; fi
-  for file in $HOME/.zshrc.d/* ; do source "$file" ; done
+  # zsh-only-ism to avoid error if glob doesn't expand
+  for file in $HOME/.zshrc.d/*(N) ; do source "$file" ; done
 fi
 
 # In case ack is named ack-grep
@@ -75,5 +76,11 @@ if command -v most >/dev/null 2>&1; then
   export PAGER="most"
 fi
 
+# Enable grc if we have it
+if ls --version 2>&1 >/dev/null ; then
+  alias ls='ls --color -C'
+fi
+[[ -s "/etc/grc.zsh" ]] && source /etc/grc.zsh
+
 # Load any local settings
 if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi