--- a/.hgsub Mon Sep 03 15:06:34 2018 +0000
+++ b/.hgsub Wed Sep 26 12:45:02 2018 +0000
@@ -33,6 +33,7 @@
vim/bundle/surround = [git]https://github.com/tpope/vim-surround
vim/bundle/swig = [git]https://github.com/vim-scripts/SWIG-syntax
vim/bundle/targets = [git]https://github.com/wellle/targets.vim
+vim/bundle/vim-go = [git]https://github.com/fatih/vim-go
vim/bundle/vimtex = [git]https://github.com/lervag/vimtex
vim/bundle/vitality = [hg]https://bitbucket.org/sjl/vitality.vim
vim/bundle/vlime = [git]https://github.com/sjl/vlime
--- a/.hgsubstate Mon Sep 03 15:06:34 2018 +0000
+++ b/.hgsubstate Wed Sep 26 12:45:02 2018 +0000
@@ -33,6 +33,7 @@
aa1f120ad3a29c27cc41d581cda3751c59343cce vim/bundle/surround
19c3d966440b6cfe8d74251881a48e961ddb8648 vim/bundle/swig
f6f2d6618a321f5b0065586a7bc934325fec81ab vim/bundle/targets
+40ffc87ba3eabf299c50ace52be39c1573d0976a vim/bundle/vim-go
5d5c71044880443035e07009497962feacb56b20 vim/bundle/vimtex
bf3fd7f67e730f93765bd3c1cfcdb18fd4043521 vim/bundle/vitality
e11566f89afdb7745bd2c1f17c2cd4daf4bbcab9 vim/bundle/vlime
--- a/eqclient.ini Mon Sep 03 15:06:34 2018 +0000
+++ b/eqclient.ini Wed Sep 26 12:45:02 2018 +0000
@@ -216,9 +216,9 @@
User_28_Red=89
User_28_Green=176
User_28_Blue=255
-User_29_Red=240
-User_29_Green=240
-User_29_Blue=0
+User_29_Red=255
+User_29_Green=0
+User_29_Blue=209
User_30_Red=0
User_30_Green=140
User_30_Blue=0
@@ -366,7 +366,7 @@
User_78_Red=90
User_78_Green=90
User_78_Blue=255
-User_79_Red=255
+User_79_Red=173
User_79_Green=255
User_79_Blue=0
User_80_Red=255
@@ -393,14 +393,14 @@
[Options]
IgnoreFile1=1
Camera1-Distance=200.000000
-Camera1-DirHeading=176.930283
+Camera1-DirHeading=233.153778
Camera1-Heading=0.000000
Camera1-Pitch=0.000000
Camera1-Height=5.000000
Camera1-Zoom=90.000000
Camera1-Change=1
-Camera2-Distance=104.500000
-Camera2-DirHeading=265.670715
+Camera2-Distance=82.000000
+Camera2-DirHeading=277.000000
Camera2-Heading=0.000000
Camera2-Pitch=0.000000
Camera2-Height=18.000000
@@ -502,7 +502,7 @@
Show3dTargetIndicator=1
ActorClipPlane=99
[VideoMode]
-WindowedWidth=2650
+WindowedWidth=2600
WindowedHeight=1380
Width=1280
Height=720
@@ -542,4 +542,4 @@
KEYMAPPING_OPEN_INV_BAGS_1=1073741847
KEYMAPPING_NETSTAT_2=181
KEYMAPPING_HOT1_7_2=45
-KEYMAPPING_HOT1_8_2=0
+KEYMAPPING_HOT1_8_2=41
--- a/stumpwmrc Mon Sep 03 15:06:34 2018 +0000
+++ b/stumpwmrc Wed Sep 26 12:45:02 2018 +0000
@@ -136,7 +136,7 @@
(rotate-brightness -1))
-;;;; Commands -----------------------------------------------------------------
+;;;; Miscellaneous ------------------------------------------------------------
(defcommand sane-hsplit () ()
(hsplit)
(move-focus :right))
@@ -214,6 +214,12 @@
(defcommand kill-and-remove () ()
(run-commands "kill" "remove"))
+(defcommand sleep-machine ()
+ ()
+ (hostcase
+ (:mobius (run-shell-command "systemctl suspend"))
+ (t (message "Not sleeping this machine for safety.."))))
+
;;;; Applications -------------------------------------------------------------
(defcommand spotify () ()
@@ -230,21 +236,37 @@
;;;; EQ Timers ----------------------------------------------------------------
-(defcommand pop-timer (minutes seconds)
+(defparameter *pop-timer-minutes* nil)
+(defparameter *pop-timer-seconds* nil)
+
+(defun pop-timer ()
+ (if (or (null *pop-timer-minutes*)
+ (null *pop-timer-seconds*))
+ (message "Pop timer is not configured.")
+ (progn
+ (message "Setting pop timer for ~D:~2,'0D."
+ *pop-timer-minutes* *pop-timer-seconds*)
+ (let* ((warning-time 30)
+ (total-time (+ (* *pop-timer-minutes* 60) *pop-timer-seconds*))
+ (initial-time (- total-time warning-time)))
+ (sb-thread:make-thread
+ (lambda ()
+ (if (plusp initial-time)
+ (progn (sleep initial-time)
+ (speak "Pop soon.")
+ (sleep warning-time))
+ (sleep total-time))
+ (speak "Pop!"))
+ :name "Pop Timer")))))
+
+(defcommand run-pop-timer () ()
+ (pop-timer))
+
+(defcommand set-pop-timer (minutes seconds)
((:number "Minutes: ")
(:number "Seconds: "))
- (message "Setting pop timer for ~D:~2,'0D." minutes seconds)
- (let* ((total-time (+ (* minutes 60) seconds))
- (initial-time (- total-time 60)))
- (sb-thread:make-thread
- (lambda ()
- (if (plusp initial-time)
- (progn (sleep initial-time)
- (speak "Pop in one minute.")
- (sleep 60))
- (sleep total-time))
- (speak "Pop!"))
- :name "Pop Timer")))
+ (setf *pop-timer-minutes* minutes
+ *pop-timer-seconds* seconds))
;;;; Key Mapping --------------------------------------------------------------
@@ -313,10 +335,11 @@
("H-F3" "exec amixer -q sset Master 5%+"))
(define-top-keys ;; timers
- ("s-F9" "pop-timer 6 40"))
+ ("s-F9" "run-pop-timer")
+ ("s-F10" "set-pop-timer"))
(define-top-keys ;; stump
- ("H-F9" "exec systemctl suspend")
+ ("H-F9" "sleep-machine")
("H-F10" "exec keysettings")
("Pause" "exec st") ; jesus christ
("H-F11" "toggle-current-mode-line")
@@ -331,6 +354,8 @@
("(Firefox|Google-chrome)"
("s-1" . "C-S-Tab")
("s-2" . "C-Tab")
+ ("C-a" . "Home")
+ ("C-e" . "End")
;; I always try to hit ctrl-d to kill a browser window because I'm so used
;; to terminal windows, and it ends up bookmarking the damn page. In the
;; interest of not having a random collection of bookmarks grow over time,