296941d27cc2

Merge
[view raw] [browse files]
author Steve Losh <steve@stevelosh.com>
date Wed, 26 Oct 2022 17:39:38 -0400
parents c106ae0760f8 (current diff) 3709361eb09c (diff)
children 9baeb5608769 2a6258a8b0e6
branches/tags (none)
files

Changes

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bin/o	Wed Oct 26 17:39:38 2022 -0400
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if test "$#" -eq 0; then
+    open .
+else
+    open "$@"
+fi
--- a/ffignore	Wed Oct 26 17:39:36 2022 -0400
+++ b/ffignore	Wed Oct 26 17:39:38 2022 -0400
@@ -1,6 +1,7 @@
 syntax:literal
 venv
 .venv
+.vagrant
 .DS_Store
 cookbook
 banner.txt
--- a/fish/config.fish	Wed Oct 26 17:39:36 2022 -0400
+++ b/fish/config.fish	Wed Oct 26 17:39:38 2022 -0400
@@ -208,6 +208,22 @@
     echo $PWD | sed -e "s|^$HOME|~|"
 end
 
+set elapsed_start 0
+set elapsed 0
+
+function prompt_time_elapsed --description 'Print the time taken by the previous command, if significant.'
+    if test $elapsed -gt 2
+        echo -n ' ('$elapsed's)'
+    end
+end
+
+function elapsed_timer_pre -e fish_preexec
+    set elapsed_start (date '+%s')
+end
+
+function elapsed_timer_post -e fish_postexec
+    set elapsed (math (date '+%s') - $elapsed_start)
+end
 
 function fish_prompt
     set last_status $status
@@ -232,6 +248,9 @@
         git_prompt
     end
 
+    set_color brblack
+    prompt_time_elapsed
+
     echo
 
     if test $last_status -eq 0
--- a/fish/functions/o.fish	Wed Oct 26 17:39:36 2022 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-function o -d "open" --wraps "open"
-    open $argv
-end
--- a/fish/functions/oo.fish	Wed Oct 26 17:39:36 2022 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-function oo -d "open ."
-    open .
-end
--- a/gitconfig	Wed Oct 26 17:39:36 2022 -0400
+++ b/gitconfig	Wed Oct 26 17:39:38 2022 -0400
@@ -35,6 +35,9 @@
 
     ack = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset' --full-history -S
 
+    # not much what's up with you
+    upsub = submodule update --init --recursive
+
     ci = commit
     cm = commit -m
 
--- a/stumpwmrc	Wed Oct 26 17:39:36 2022 -0400
+++ b/stumpwmrc	Wed Oct 26 17:39:38 2022 -0400
@@ -431,7 +431,7 @@
     ((:alephnull :mobius :papyrifera)
      (run-shell-command "exec lock-screen")
      (run-shell-command "systemctl suspend"))
-    (t (message "Not sleeping this machine for safety.."))))
+    (t (message "Not sleeping this machine for safety."))))
 
 (defcommand copy-clhs-url (s)
     ((:string "Symbol: "))
@@ -667,8 +667,8 @@
   ("H-O" "spotify")
   ("H-o" "files")
   ("H-z" "zoom")
-  ("XF86Launch8" "toggle-zoom-mute")
-  ("H-XF86Launch8" "end-zoom")
+  ("H-Z" "toggle-zoom-mute")
+  ("C-H-Z" "end-zoom")
   ("H-q" "exec lock-screen")
   ("H-y" "screenshot")
   ("H-g" "gcontrol")
@@ -699,9 +699,13 @@
   ("H-K" "move-window up")
   ("H-L" "move-window right")
 
-  ("H-1" "gmove 1")
-  ("H-2" "gmove 2")
-  ("H-3" "gmove 3")
+  ("H-1" "gselect 1")
+  ("H-2" "gselect 2")
+  ("H-3" "gselect 3")
+
+  ("H-!" "gmove 1")
+  ("H-@" "gmove 2")
+  ("H-#" "gmove 3")
 
   ("C-H-H" "exchange-direction left")
   ("C-H-J" "exchange-direction down")
--- a/vim/vimrc	Wed Oct 26 17:39:36 2022 -0400
+++ b/vim/vimrc	Wed Oct 26 17:39:38 2022 -0400
@@ -2098,6 +2098,8 @@
 
 noremap  <F2> :NERDTreeToggle<cr>
 inoremap <F2> <esc>:NERDTreeToggle<cr>
+noremap  <F14> :NERDTreeFind<cr>
+inoremap <F14> <esc>:NERDTreeFind<cr>
 noremap  <S-F2> :NERDTreeFind<cr>
 inoremap <S-F2> <esc>:NERDTreeFind<cr>
 
--- a/weechat/alias.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/alias.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [cmd]
--- a/weechat/autosort.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/autosort.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [sorting]
--- a/weechat/buflist.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/buflist.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/charset.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/charset.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [default]
--- a/weechat/exec.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/exec.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [command]
--- a/weechat/fifo.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/fifo.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [file]
--- a/weechat/fset.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/fset.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/logger.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/logger.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/python.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/python.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/relay.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/relay.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
@@ -30,7 +30,7 @@
 auth_timeout = 60
 bind_address = ""
 clients_purge_delay = 0
-compression = 20
+compression_level = 6
 ipv6 = on
 max_clients = 5
 nonce_size = 16
--- a/weechat/script.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/script.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/trigger.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/trigger.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]
--- a/weechat/urlgrab.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/urlgrab.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [color]
--- a/weechat/xfer.conf	Wed Oct 26 17:39:36 2022 -0400
+++ b/weechat/xfer.conf	Wed Oct 26 17:39:38 2022 -0400
@@ -6,7 +6,7 @@
 #
 # Use commands like /set or /fset to change settings in WeeChat.
 #
-# For more info, see: https://weechat.org/doc/quickstart/
+# For more info, see: https://weechat.org/doc/quickstart
 #
 
 [look]