misc

6 files changed, 33 insertions, 5 deletions

diff --git a/.config/bash/rc.d/10_aliases.sh b/.config/bash/rc.d/10_aliases.sh
index 2e28a5d..8499bde 100644
--- a/.config/bash/rc.d/10_aliases.sh
+++ b/.config/bash/rc.d/10_aliases.sh
@@ -100,9 +100,12 @@ alias l='ls -CF'
 alias tree='tree --charset utf8'
 alias cd=pushd
 alias gitk='gitk --all --date-order'
-alias userctl='systemctl --user'
 alias mv='mv -i'
 
+alias userctl='systemctl --user'
+alias journalctl='journalctl --no-hostname' # I know what host I'm on
+alias datetimectl=timedatectl # I forget which it is
+
 ######################################################################
 # These are actually functions :P                                    #
 ######################################################################
@@ -175,3 +178,6 @@ jarmain() {
 	    grep -E '(^[a-z]|public static void main\(java\.lang\.String\[\]\))' |
 	    grep -B1 '^ '
 }
+calc() {
+	bc <<<"$*"
+}
diff --git a/.config/emacs/custom.el b/.config/emacs/custom.el
index a099221..8e72fec 100644
--- a/.config/emacs/custom.el
+++ b/.config/emacs/custom.el
@@ -33,6 +33,9 @@
    (quote
     ("xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f" "xelatex -interaction nonstopmode -output-directory %o %f")))
  '(org-src-fontify-natively t)
+ '(package-selected-packages
+   (quote
+    (yaml-mode smart-tabs-mode scss-mode sass-mode page-break-lines nginx-mode mediawiki markdown-mode jabber graphviz-dot-mode gradle-mode go-mode glsl-mode editorconfig dtrt-indent coffee-mode cmake-mode bison-mode)))
  '(ruby-deep-arglist nil)
  '(ruby-deep-indent-paren nil)
  '(safe-local-variable-values
diff --git a/.config/emacs/init.el b/.config/emacs/init.el
index f1650a4..9fe3b9c 100644
--- a/.config/emacs/init.el
+++ b/.config/emacs/init.el
@@ -99,6 +99,7 @@
                   (mapcar 'car smart-tabs-insinuate-alist))))
   ;; Major modes
   (:name bison-mode :type elpa)
+  (:name cmake-mode :type elpa)
   (:name coffee-mode :type elpa
    :after (add-hook 'coffee-mode-hook
                     '(lambda ()
@@ -107,6 +108,7 @@
                        )))
   (:name glsl-mode :type elpa)
   (:name go-mode :type elpa)
+  (:name gradle-mode :type elpa)
   (:name graphviz-dot-mode :type elpa)
   (:name haml-mode :type elpa)
   (:name markdown-mode :type elpa
@@ -116,6 +118,7 @@
    :after (put 'nginx-indent-level 'safe-local-variable 'integerp))
   (:name scss-mode :type elpa)
   (:name yaml-mode :type elpa)
+  (:name editorconfig :type elpa)
   ))
 ;; What packages el-get should install, both from above, and its
 ;; internal list of sources.
@@ -125,6 +128,7 @@
   '(dtrt-indent
     page-break-lines
     smart-tabs-mode
+    editorconfig
     )
   ;; Major modes
   (if (file-exists-p "~/Maildir") ; wanderlust is huge, only use on emailing boxes
@@ -133,13 +137,14 @@
   '(
     ;;nxhtml ; nxhtml is invasive, only enable if actively using
     bison-mode
+    cmake-mode
     coffee-mode
     glsl-mode
     go-mode
+    gradle-mode
     graphviz-dot-mode
     haml-mode
     markdown-mode
-    yaml-mode
     mediawiki
     nginx-mode
     php-mode-improved
@@ -206,6 +211,10 @@ sh-script.el is broken."
                (if xterm-mouse-mode (xterm-mouse-mode 1))
                )))
 
+;; Make TRAMP obey ~/.ssh/config for ControlMaster.  For some reason,
+;; customize doesn't correctly set this.
+(setq tramp-use-ssh-controlmaster-options nil)
+
 ;; Use mailcrypt to encrypt/decrypt email
 (when (require 'mailcrypt nil t)
   (mc-setversion "gpg")
diff --git a/.config/ssh/config b/.config/ssh/config
index 9dbf510..7687d08 100644
--- a/.config/ssh/config
+++ b/.config/ssh/config
@@ -20,13 +20,20 @@ Host parabola.nu *.parabola.nu
 
 # Personal #################################################
 
-Host lukeshu.com
+Host lukeshu.com *.lukeshu.com
 	Port 1863
 	User lukeshu
 Host ssl.lukeshu.com
 	User lukeshu
 	ProxyCommand proxytunnel --proxy=lukeshu.com:8443 --proxyauth=frc4272:password --encrypt-proxy --dest=lukeshu.com:1863
 
+Host team4272.com
+	Port 1863
+	User lukeshu
+Host ssl.team4272.com
+	User lukeshu
+	ProxyCommand proxytunnel --proxy=lukeshu.com:8443 --proxyauth=frc4272:password --encrypt-proxy --dest=team4272.com:1863
+
 Match host build64-par exec "nslookup %n.lan."
 	HostName build64-par
 	Port 22
@@ -37,6 +44,6 @@ Host build64-par
 	ForwardX11 yes
 	ForwardX11Trusted yes
 
-Host 192.168.*.1 10.*
+Host 192.168.*.1 10.* 169.254.* roborio-*-frc.local
 	StrictHostKeyChecking no
 	UserKnownHostsFile /dev/null
diff --git a/.local/bin/config-path b/.local/bin/config-path
index 4b7cccb..1894fba 100755
--- a/.local/bin/config-path
+++ b/.local/bin/config-path
@@ -9,6 +9,7 @@ prefixes=(
 	"$HOME/.prefix"
 	"$HOME"/.gem/ruby/*
 	"$HOME"/.npm-prefix
+	"$HOME"/go
 )
 
 in_array() {
diff --git a/.local/bin/xrotate b/.local/bin/xrotate
index 55b4e88..c7d9f0d 100755
--- a/.local/bin/xrotate
+++ b/.local/bin/xrotate
@@ -4,7 +4,9 @@
 type xrandr &>/dev/null && modules+=(xrandr)
 
 xrandr.get() {
-	xrandr --query --verbose|awk -v OFS=$'\t' '/ connected /{print "xrandr", $1, $5}'
+	# FIXME: I don't think simple column counting is reliable.
+	# I'll have to study the exact output format.
+	xrandr --query --verbose|awk -v OFS=$'\t' '/ connected /{print "xrandr", $1, $6}'
 }
 
 xrandr.set() {