# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1630688006 14400
# Node ID 96b9cf7e7a9047b64474ceae306c4dc60254d696
# Parent  0f6c567726d4e205816bd30f929560fc3cd89716
More

diff -r 0f6c567726d4 -r 96b9cf7e7a90 .hgsub
--- a/.hgsub	Tue Aug 24 16:08:56 2021 -0400
+++ b/.hgsub	Fri Sep 03 12:53:26 2021 -0400
@@ -9,6 +9,7 @@
 vim/bundle/ctrlp                 = [git]https://github.com/ctrlpvim/ctrlp.vim
 vim/bundle/delimitmate           = [git]https://github.com/Raimondi/delimitMate
 vim/bundle/fugitive              = [git]https://github.com/tpope/vim-fugitive
+vim/bundle/firenvim              = [git]https://github.com/glacambre/firenvim
 vim/bundle/gdl                   = [hg]ssh://hg.stevelosh.com/repos/gdl.vim/
 vim/bundle/glsl                  = [git]https://github.com/tikhomirov/vim-glsl
 vim/bundle/gnupg                 = [git]https://github.com/jamessan/vim-gnupg
diff -r 0f6c567726d4 -r 96b9cf7e7a90 .hgsubstate
--- a/.hgsubstate	Tue Aug 24 16:08:56 2021 -0400
+++ b/.hgsubstate	Fri Sep 03 12:53:26 2021 -0400
@@ -8,6 +8,7 @@
 8295187ea1210138c0b171d8e3ec3569936f4c1a vim/bundle/commentary
 c6d1fc5e58d689bfb104ff336aeb89d9ef1b48e2 vim/bundle/ctrlp
 38487bbec8ba50834e257940b357de03991fa8f9 vim/bundle/delimitmate
+b18ee299c49f63f9c25dc8573a282179b06e4028 vim/bundle/firenvim
 755554bb3c44944f70f4b2048acf0c69261782ac vim/bundle/fugitive
 127d706f2def96876605e6bd5d366c973cb8e406 vim/bundle/gdl
 6ea4e1983b18cf440c8f800a3e94b57338a3e99f vim/bundle/glsl
diff -r 0f6c567726d4 -r 96b9cf7e7a90 gitconfig
--- a/gitconfig	Tue Aug 24 16:08:56 2021 -0400
+++ b/gitconfig	Fri Sep 03 12:53:26 2021 -0400
@@ -83,6 +83,7 @@
     fuu = "!sh -c 'git fu && git uu' -"
     fuo = "!sh -c 'git fo && git uo' -"
     fuom = "!sh -c 'git co $(git mainbranch) && git fo && git uo' -"
+    fuum = "!sh -c 'git co $(git mainbranch) && git fu && git uu' -"
 
     addremove = !git add . && git add -u
     addrem = !git addremove
diff -r 0f6c567726d4 -r 96b9cf7e7a90 stumpwmrc
--- a/stumpwmrc	Tue Aug 24 16:08:56 2021 -0400
+++ b/stumpwmrc	Fri Sep 03 12:53:26 2021 -0400
@@ -52,11 +52,6 @@
     (string-trim "%" <>)
     parse-integer))
 
-(defun battery ()
-  (run-shell-command
-    "acpi -b | tail -n1 | awk -F '[ ,]' '{printf \"%s%s\", $3, $5}' | sed s/Discharging// | sed s/Unknown// | sed s/Full// | sed s/Charging/+/"
-    t))
-
 
 (defun current-frame ()
   (stumpwm::tile-group-current-frame (current-group)))
@@ -68,7 +63,8 @@
     string-upcase
     (intern <> (find-package :keyword))))
 
-(defparameter *host* (keywordize (run-shell-command "hostname" t)))
+(defparameter *host* (keywordize (machine-instance)))
+
 
 (defmacro ehostcase (&body clauses)
   `(ecase *host* ,@clauses))
@@ -450,6 +446,9 @@
 
 
 ;;;; Clipboard/Data Generation ------------------------------------------------
+(load-module "clipboard-history")
+(clipboard-history:start-clipboard-manager)
+
 (defcommand generate-random-uuid () ()
   (run-shell-command "uuidgen | tr -d '\\n' | ~/src/dotfiles/bin/pbcopy")
   (message "Copied random UUID to clipboard."))
@@ -573,6 +572,8 @@
   ("H-V" "vlc"))
 
 (define-top-keys ;; clipboard
+  ("H-c" "show-clipboard-history")
+  ("H-C" "clear-clipboard-history")
   ("H-u" "generate-random-uuid")
   ("H-U" "bee-movie-script")
   ("M-H-u" "urlize-jira-issue")
@@ -700,35 +701,49 @@
 
 
 ;;;; Modeline -----------------------------------------------------------------
+(load-module "battery-portable")
+(load-module "cpu")
+(load-module "hostname")
+(load-module "mem")
+
 (defun ensure-mode-line ()
   (when (not (stumpwm::head-mode-line (current-head)))
     (toggle-mode-line (current-screen) (current-head))))
 
+
 (defun configure-modeline ()
   (setf
     *time-modeline-string*
     "%a %b %e %H:%M"
 
+    cpu::*cpu-usage-modeline-fmt*
+    "^[~A~3D%^]"
+
+    cpu::*cpu-modeline-fmt*
+    "[%c] [%t] [%f]"
+
+    mem::*mem-modeline-fmt*
+    "%b"
+
     *screen-mode-line-format*
     (append
-      (list "[^B%n^b] %W^>")
+      (list "[^B%n^b@%h] %W^>")
 
       #+todo-some-day (list ;; "(V "
                             ;; ;; '(:eval (volume))
                             ;; ")"
                             " ")
 
+      ;; battery and brightness for laptops
       (hostcase
         ((:mobius :alephnull :papyrifera)
-         '("(B "
-           (:eval (princ-to-string (battery)))
-           ")"
+         '("(B %B)"
            " (BR "
            (:eval (princ-to-string (brightness)))
            "%)")))
 
-      ;; time and tray
-      (list " %d %T")))
+      ;; cpu, time, tray
+      (list " (CPU %C) (MEM %M) %d %T")))
 
   (setf *mode-line-timeout* 10)
   (setf *mode-line-background-color* "#111111")
diff -r 0f6c567726d4 -r 96b9cf7e7a90 vim/vimrc
--- a/vim/vimrc	Tue Aug 24 16:08:56 2021 -0400
+++ b/vim/vimrc	Fri Sep 03 12:53:26 2021 -0400
@@ -2187,6 +2187,33 @@
 let delimitMate_expand_cr = 1
 
 " }}}
+" Firenvim {{{
+"
+let g:firenvim_config = { 
+    \ 'globalSettings': {
+        \ 'takeover': 'never',
+    \  },
+    \ 'localSettings': {
+        \ '.*': {
+            \ 'takeover': 'never',
+        \ },
+    \ }
+\ }
+
+if exists('g:started_by_firenvim')
+  set laststatus=0
+  set guifont=Ubuntu\ Mono:h10
+else
+  set laststatus=2
+endif
+
+augroup ft_fugitive
+    au!
+
+    au BufEnter github.com_*.txt set filetype=markdown
+augroup END
+
+" }}}
 " Fugitive {{{
 
 nnoremap <leader>gd :Gdiff<cr>