f01b60ea69c5

Merge.
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Thu, 28 Feb 2019 14:01:51 -0500
parents fd1ced257076 (diff) fba717445635 (current diff)
children 80f5ec3932ae c6e6e4b4d601
branches/tags (none)
files

Changes

--- a/bash_profile	Mon Feb 25 19:08:32 2019 -0500
+++ b/bash_profile	Thu Feb 28 14:01:51 2019 -0500
@@ -34,3 +34,5 @@
 
 GPG_TTY=`tty`
 export GPG_TTY
+
+export EDITOR=nvim
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/st-brows	Thu Feb 28 14:01:51 2019 -0500
@@ -0,0 +1,6 @@
+#!/bin/sh
+# see https://st.suckless.org/patches/externalpipe/editscreen.sh
+tmpfile=$(mktemp /tmp/st-brows.XXXXXX)
+trap  'rm "$tmpfile"' 0 1 15
+cat > "$tmpfile"
+st /bin/bash -c "cat $tmpfile | /home/sjl/src/dotfiles/bin/brows"
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/st-edit	Thu Feb 28 14:01:51 2019 -0500
@@ -0,0 +1,6 @@
+#!/bin/sh
+# see https://st.suckless.org/patches/externalpipe/editscreen.sh
+tmpfile=$(mktemp /tmp/st-edit.XXXXXX)
+trap  'rm "$tmpfile"' 0 1 15
+cat > "$tmpfile"
+st -e "nvim" "$tmpfile"
--- a/tmux/tmux.conf	Mon Feb 25 19:08:32 2019 -0500
+++ b/tmux/tmux.conf	Thu Feb 28 14:01:51 2019 -0500
@@ -21,7 +21,10 @@
 setw -g pane-base-index 1
 
 # Reload the config.
-bind r source-file ~/.tmux.conf \; display "Reloaded ~/.tmux.conf"
+bind R source-file ~/.tmux.conf \; display "Reloaded ~/.tmux.conf"
+
+# Rename session.
+bind r command-prompt -I "#S" "rename-session '%%'"
 
 # Saner splitting.
 bind v split-window -h -c '#{pane_current_path}'
@@ -35,20 +38,20 @@
 bind l select-pane -R
 
 # DVTM style pane selection
-bind 1 select-pane -t 1
-bind 2 select-pane -t 2
-bind 3 select-pane -t 3
-bind 4 select-pane -t 4
-bind 5 select-pane -t 5
-bind 6 select-pane -t 6
-bind 7 select-pane -t 7
-bind 8 select-pane -t 8
-bind 9 select-pane -t 9
+# bind 1 select-pane -t 1
+# bind 2 select-pane -t 2
+# bind 3 select-pane -t 3
+# bind 4 select-pane -t 4
+# bind 5 select-pane -t 5
+# bind 6 select-pane -t 6
+# bind 7 select-pane -t 7
+# bind 8 select-pane -t 8
+# bind 9 select-pane -t 9
 
 # Layouts
-set -g main-pane-width 260
-bind M select-layout main-vertical
-bind E select-layout even-horizontal
+# set -g main-pane-width 260
+# bind M select-layout main-vertical
+# bind E select-layout even-horizontal
 
 # Pane resizing
 bind -r C-h resize-pane -L 5
@@ -85,12 +88,12 @@
 set -g status-right-length 150
 set -g status-interval 5
 
-set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour238,nobold] #[fg=colour15,bg=colour238,bold] #(ls ~/.mail/steve-stevelosh.com/INBOX/cur  ~/.mail/steve-stevelosh.com/INBOX/new | wc -l | tr -d " ") #[fg=colour238,bg=colour234,nobold] '
+set -g status-left '#[fg=colour16,bg=colour254,bold] #S #[fg=colour238,bg=colour234,nobold] '
 
-set -g status-right "#[fg=colour245] #(date -u +%%H:%%M) UTC %d %b #[fg=colour254,bg=colour234,nobold] #[fg=colour16,bg=colour254,bold] #h "
+set -g status-right "#[fg=colour245]#(date -u +%%H:%%M) UTC %d %b #[fg=colour16,bg=colour254,bold] #h "
 
 set -g window-status-format "#[fg=white,bg=colour234] #I #W "
-set -g window-status-current-format "#[fg=colour234,bg=colour39] #[fg=colour16,bg=colour39,noreverse,bold] #I #W #[fg=colour39,bg=colour234,nobold] "
+set -g window-status-current-format "#[fg=colour16,bg=colour39,noreverse,bold] #I #W #[fg=colour39,bg=colour234,nobold] "
 
 # Activity
 setw -g monitor-activity on
--- a/vim/vimrc	Mon Feb 25 19:08:32 2019 -0500
+++ b/vim/vimrc	Thu Feb 28 14:01:51 2019 -0500
@@ -258,6 +258,7 @@
 silent! digr !, 8816 "U+2270=≰    NEITHER LESS-THAN NOR EQUAL TO
 silent! digr !. 8817 "U+2271=≱    NEITHER GREATER-THAN NOR EQUAL TO
 silent! digr xs 8339 "U+2093=ₓ    SUBSCRIPT X
+silent! digr ns 8345 "U+2093=ₙ    SUBSCRIPT N
 silent! digr >< 8652 "U+21cc=⇌    EQUILIBRIUM
 silent! digr o+ 8853 "U+2295=⊕    CIRCLED PLUS