# HG changeset patch # User Steve Losh # Date 1537965931 14400 # Node ID d26513c09bd962b8c8e3eccd6d04cc1dc90619b3 # Parent 9990bd90c76d78494c39c565ce573211c91a1024# Parent db021fb01b7f4ef39ac24bf722ad23687098c6a4 Merge. diff -r 9990bd90c76d -r d26513c09bd9 .hgsub --- a/.hgsub Wed Sep 26 08:45:22 2018 -0400 +++ b/.hgsub Wed Sep 26 08:45:31 2018 -0400 @@ -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 diff -r 9990bd90c76d -r d26513c09bd9 .hgsubstate --- a/.hgsubstate Wed Sep 26 08:45:22 2018 -0400 +++ b/.hgsubstate Wed Sep 26 08:45:31 2018 -0400 @@ -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 diff -r 9990bd90c76d -r d26513c09bd9 eqclient.ini --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/eqclient.ini Wed Sep 26 08:45:31 2018 -0400 @@ -0,0 +1,545 @@ +[Defaults] +WindowedMode=TRUE +Sound=TRUE +TextureQuality=1 +VertexShaders=TRUE +20PixelShaders=TRUE +14PixelShaders=TRUE +1xPixelShaders=TRUE +MultiPassLighting=FALSE +UseLitBatches=TRUE +InspectOthers=FALSE +Log=FALSE +AttackOnAssist=FALSE +ShowInspectMessage=TRUE +LockWindows=FALSE +InvWinLabels=TRUE +HidePlayerWin=FALSE +HidePartyWin=FALSE +HideTargetWin=FALSE +HideSpellsWin=FALSE +HideBuffWin=FALSE +HideHotboxWin=FALSE +HideChatWin=FALSE +HideMainMenuWin=FALSE +ChatLineSpacing=0 +ShowDynamicLights=TRUE +ChatFontSize=3 +ShowNamesLevel=4 +VideoMode=0 +MousePointerSpeedMod=0 +ShowSpellEffects=1 +CombatMusic=TRUE +MixAhead=8 +ServerFilter=0 +TrackPlayers=TRUE +TrackSortType=NORMAL +TrackFilterType=0 +DefaultLanguage=0 +ShowGrass=TRUE +UseArrowCamera=FALSE +NetStat=TRUE +DoProperTinting=FALSE +Sound44k=0 +SpeakerType=0 +UISkin=Default +AtlasSkin=Default +LoadSocialAnimations=TRUE +UseLuclinVahShirMale=TRUE +UseLuclinVahShirFemale=TRUE +UseLuclinElementals=TRUE +DefaultChannel=8 +LastCharSel=4 +SystemInfoDelay=0 +ShowCreationHelp=FALSE +WindowedModeXOffset=0 +WindowedModeYOffset=0 +Music=0 +SoundVolume=7 +Gamma=20 +SpellParticleOpacity=0.570000 +EnvironmentParticleOpacity=1.000000 +ActorParticleOpacity=1.000000 +ShowAlarmWindow=false +SendSystemInfo=0 +AllLuclinPcModelsOff=FALSE +UseLuclinHumanMale=TRUE +UseLuclinHumanFemale=TRUE +UseLuclinBarbarianMale=TRUE +UseLuclinBarbarianFemale=TRUE +UseLuclinEruditeMale=TRUE +UseLuclinEruditeFemale=TRUE +UseLuclinWoodElfMale=TRUE +UseLuclinWoodElfFemale=TRUE +UseLuclinHighElfMale=TRUE +UseLuclinHighElfFemale=TRUE +UseLuclinDarkElfMale=TRUE +UseLuclinDarkElfFemale=TRUE +UseLuclinHalfElfMale=TRUE +UseLuclinHalfElfFemale=TRUE +UseLuclinDwarfMale=TRUE +UseLuclinDwarfFemale=TRUE +UseLuclinTrollMale=TRUE +UseLuclinTrollFemale=TRUE +UseLuclinOgreMale=TRUE +UseLuclinOgreFemale=TRUE +UseLuclinHalflingMale=TRUE +UseLuclinHalflingFemale=TRUE +UseLuclinGnomeMale=TRUE +UseLuclinGnomeFemale=TRUE +UseLuclinIksarMale=TRUE +UseLuclinIksarFemale=TRUE +LoadVeliousArmorsWithLuclin=FALSE +SpellParticleDensity=0.250000 +SpellParticleNearClipPlane=2.000000 +SpellParticleCastFilter=24 +EnvironmentParticleDensity=1.000000 +EnvironmentParticleNearClipPlane=2.000000 +EnvironmentParticleCastFilter=24 +ActorParticleDensity=1.000000 +ActorParticleNearClipPlane=2.000000 +ActorParticleCastFilter=24 +Shadows=1 +EnvSounds=0 +LeftClickTargetHelp=0 +ScreenshotNumber=1 +[HitsMode] +MyHitsMode=1 +MyHitsAlwaysDraw=0 +MyHitsX=4 +MyHitsY=60 +MyHitsCount=3 +MyHitsFontSize=1 +MyHitsShowHeader=1 +MyHitsShowBG=0 +MyHitsBGWidth=330 +OtherHitsMeMode=1 +OtherHitsMeAlwaysDraw=0 +OtherHitsMeX=4 +OtherHitsMeY=112 +OtherHitsMeCount=3 +OtherHitsMeFontSize=1 +OtherHitsMeShowHeader=1 +OtherHitsMeShowBG=0 +OtherHitsMeBGWidth=330 +OtherHitsOtherMode=1 +OtherHitsOtherAlwaysDraw=0 +OtherHitsOtherX=4 +OtherHitsOtherY=164 +OtherHitsOtherCount=3 +OtherHitsOtherFontSize=1 +OtherHitsOtherShowHeader=1 +OtherHitsOtherShowBG=0 +OtherHitsOtherBGWidth=330 +[TextColors] +User_1_Red=255 +User_1_Green=255 +User_1_Blue=255 +User_2_Red=255 +User_2_Green=132 +User_2_Blue=255 +User_3_Red=0 +User_3_Green=255 +User_3_Blue=255 +User_4_Red=40 +User_4_Green=240 +User_4_Blue=40 +User_5_Red=0 +User_5_Green=159 +User_5_Blue=0 +User_6_Red=79 +User_6_Green=162 +User_6_Blue=96 +User_7_Red=255 +User_7_Green=0 +User_7_Blue=0 +User_8_Red=90 +User_8_Green=90 +User_8_Blue=255 +User_9_Red=255 +User_9_Green=159 +User_9_Blue=255 +User_10_Red=255 +User_10_Green=255 +User_10_Blue=255 +User_11_Red=255 +User_11_Green=0 +User_11_Blue=0 +User_12_Red=255 +User_12_Green=255 +User_12_Blue=255 +User_13_Red=255 +User_13_Green=255 +User_13_Blue=255 +User_14_Red=255 +User_14_Green=255 +User_14_Blue=0 +User_15_Red=146 +User_15_Green=142 +User_15_Blue=255 +User_16_Red=255 +User_16_Green=255 +User_16_Blue=255 +User_17_Red=255 +User_17_Green=255 +User_17_Blue=255 +User_18_Red=255 +User_18_Green=255 +User_18_Blue=255 +User_19_Red=255 +User_19_Green=255 +User_19_Blue=255 +User_20_Red=240 +User_20_Green=240 +User_20_Blue=0 +User_21_Red=240 +User_21_Green=240 +User_21_Blue=0 +User_22_Red=255 +User_22_Green=255 +User_22_Blue=255 +User_23_Red=255 +User_23_Green=255 +User_23_Blue=255 +User_24_Red=255 +User_24_Green=255 +User_24_Blue=255 +User_25_Red=255 +User_25_Green=255 +User_25_Blue=255 +User_26_Red=255 +User_26_Green=119 +User_26_Blue=162 +User_27_Red=255 +User_27_Green=255 +User_27_Blue=255 +User_28_Red=89 +User_28_Green=176 +User_28_Blue=255 +User_29_Red=255 +User_29_Green=0 +User_29_Blue=209 +User_30_Red=0 +User_30_Green=140 +User_30_Blue=0 +User_31_Red=90 +User_31_Green=90 +User_31_Blue=255 +User_32_Red=255 +User_32_Green=0 +User_32_Blue=0 +User_33_Red=255 +User_33_Green=179 +User_33_Blue=255 +User_34_Red=255 +User_34_Green=0 +User_34_Blue=0 +User_35_Red=215 +User_35_Green=154 +User_35_Blue=66 +User_36_Red=110 +User_36_Green=143 +User_36_Blue=176 +User_37_Red=110 +User_37_Green=143 +User_37_Blue=176 +User_38_Red=110 +User_38_Green=143 +User_38_Blue=176 +User_39_Red=110 +User_39_Green=143 +User_39_Blue=176 +User_40_Red=110 +User_40_Green=143 +User_40_Blue=176 +User_41_Red=110 +User_41_Green=143 +User_41_Blue=176 +User_42_Red=110 +User_42_Green=143 +User_42_Blue=176 +User_43_Red=110 +User_43_Green=143 +User_43_Blue=176 +User_44_Red=110 +User_44_Green=143 +User_44_Blue=176 +User_45_Red=110 +User_45_Green=143 +User_45_Blue=176 +User_46_Red=255 +User_46_Green=255 +User_46_Blue=255 +User_47_Red=255 +User_47_Green=255 +User_47_Blue=255 +User_48_Red=255 +User_48_Green=0 +User_48_Blue=0 +User_49_Red=255 +User_49_Green=0 +User_49_Blue=0 +User_50_Red=255 +User_50_Green=0 +User_50_Blue=0 +User_51_Red=255 +User_51_Green=0 +User_51_Blue=0 +User_52_Red=255 +User_52_Green=255 +User_52_Blue=255 +User_53_Red=255 +User_53_Green=255 +User_53_Blue=255 +User_54_Red=255 +User_54_Green=255 +User_54_Blue=255 +User_55_Red=255 +User_55_Green=255 +User_55_Blue=255 +User_56_Red=255 +User_56_Green=255 +User_56_Blue=255 +User_57_Red=255 +User_57_Green=255 +User_57_Blue=255 +User_58_Red=255 +User_58_Green=255 +User_58_Blue=255 +User_59_Red=255 +User_59_Green=255 +User_59_Blue=255 +User_60_Red=215 +User_60_Green=154 +User_60_Blue=66 +User_61_Red=215 +User_61_Green=154 +User_61_Blue=66 +User_62_Red=215 +User_62_Green=154 +User_62_Blue=66 +User_63_Red=215 +User_63_Green=154 +User_63_Blue=66 +User_64_Red=215 +User_64_Green=154 +User_64_Blue=66 +User_65_Red=215 +User_65_Green=154 +User_65_Blue=66 +User_66_Red=215 +User_66_Green=154 +User_66_Blue=66 +User_67_Red=215 +User_67_Green=154 +User_67_Blue=66 +User_68_Red=215 +User_68_Green=154 +User_68_Blue=66 +User_69_Red=215 +User_69_Green=154 +User_69_Blue=66 +User_70_Red=255 +User_70_Green=255 +User_70_Blue=0 +User_71_Red=255 +User_71_Green=0 +User_71_Blue=255 +User_72_Red=0 +User_72_Green=200 +User_72_Blue=200 +User_73_Red=255 +User_73_Green=255 +User_73_Blue=255 +User_74_Red=255 +User_74_Green=255 +User_74_Blue=255 +User_75_Red=0 +User_75_Green=255 +User_75_Blue=255 +User_76_Red=255 +User_76_Green=0 +User_76_Blue=0 +User_77_Red=255 +User_77_Green=255 +User_77_Blue=255 +User_78_Red=90 +User_78_Green=90 +User_78_Blue=255 +User_79_Red=173 +User_79_Green=255 +User_79_Blue=0 +User_80_Red=255 +User_80_Green=255 +User_80_Blue=0 +User_81_Red=255 +User_81_Green=255 +User_81_Blue=255 +User_82_Red=255 +User_82_Green=255 +User_82_Blue=255 +User_83_Red=255 +User_83_Green=255 +User_83_Blue=255 +User_84_Red=255 +User_84_Green=255 +User_84_Blue=255 +User_85_Red=255 +User_85_Green=255 +User_85_Blue=255 +User_86_Red=255 +User_86_Green=155 +User_86_Blue=155 +[Options] +IgnoreFile1=1 +Camera1-Distance=200.000000 +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=82.000000 +Camera2-DirHeading=277.000000 +Camera2-Heading=0.000000 +Camera2-Pitch=0.000000 +Camera2-Height=18.000000 +Camera2-Zoom=90.000000 +Camera2-Change=1 +Realism=4 +ClipPlane=20 +FogScale=4.000000 +MaxFPS=100 +LODBias=10 +MouseSensitivity=5 +ShadowClipPlane=99 +Channel08=0 +Channel07=0 +BadWord=1 +PetAttacks=0 +PetMisses=1 +Anonymous=0 +Trade=2 +GuildInvites=1 +Sky=2 +ParticleDensity=3 +LoD=1 +SameResolution=1 +PCNames=1 +NPCNames=1 +InverseMouse=0 +LookSpring=0 +MouseActive=1 +Destroy=0 +AANoConfirm=0 +pointMerchantNoConfirm=0 +MouseWheelZoom=1 +MouseRightHanded=1 +LoadScreenMode=1 +Channel00=1 +Channel01=1 +Channel02=1 +Channel03=1 +Channel04=1 +Channel05=1 +PCSpells=0 +NPCSpells=0 +BardSongs=0 +CriticalSpells=0 +CriticalMelee=0 +SpellDamage=0 +Channel06=1 +Channel09=1 +HideDamageShield=0 +DotDamage=0 +FocusEffects=0 +PetSpells=0 +HealOverTimeSpells=0 +ItemSpeech=0 +Strikethrough=0 +Stun=0 +SwarmPetDeath=0 +Ignore00= +Ignore01= +Ignore02= +Ignore03= +Ignore04= +Ignore05= +Ignore06= +Ignore07= +Ignore08= +Ignore09= +Ignore10= +Ignore11= +Ignore12= +Ignore13= +Ignore14= +Ignore15= +Ignore16= +Ignore17= +Ignore18= +Ignore19= +Friend00= +Friend01= +Friend02= +Friend03= +Friend04= +Friend05= +Friend06= +Friend07= +Friend08= +Friend09= +Friend10= +Friend11= +Friend12= +Friend13= +Friend14= +Friend15= +Friend16= +Friend17= +Friend18= +Friend19= +Show3dTargetIndicator=1 +ActorClipPlane=99 +[VideoMode] +WindowedWidth=2600 +WindowedHeight=1380 +Width=1280 +Height=720 +FullscreenBitsPerPixel=32 +FullscreenRefreshRate=0 +[News] +LastRead=00000000 +Automatic=0 +[KeyMaps] +KEYMAPPING_FORWARD_1=17 +KEYMAPPING_BACK_1=31 +KEYMAPPING_RIGHT_1=32 +KEYMAPPING_LEFT_1=18 +KEYMAPPING_DUCK_1=33 +KEYMAPPING_TARGETNPC_1=0 +KEYMAPPING_CONSIDER_1=46 +KEYMAPPING_CAST1_1=59 +KEYMAPPING_CAST2_1=60 +KEYMAPPING_CAST3_1=61 +KEYMAPPING_CAST4_1=62 +KEYMAPPING_CAST5_1=63 +KEYMAPPING_CAST6_1=64 +KEYMAPPING_CAST7_1=65 +KEYMAPPING_CAST8_1=66 +KEYMAPPING_TARGETME_1=1073741883 +KEYMAPPING_PARTY1_1=1073741884 +KEYMAPPING_PARTY2_1=1073741885 +KEYMAPPING_PARTY3_1=1073741886 +KEYMAPPING_PARTY4_1=1073741887 +KEYMAPPING_PARTY5_1=1073741888 +KEYMAPPING_TARGETPC_1=1073741889 +KEYMAPPING_AUTORUN_1=43 +KEYMAPPING_SIT_STAND_2=44 +KEYMAPPING_SIT_STAND_1=44 +KEYMAPPING_TARGETNPC_2=0 +KEYMAPPING_CYCLENPCTARGETS_1=30 +KEYMAPPING_OPEN_INV_BAGS_1=1073741847 +KEYMAPPING_NETSTAT_2=181 +KEYMAPPING_HOT1_7_2=45 +KEYMAPPING_HOT1_8_2=41 diff -r 9990bd90c76d -r d26513c09bd9 stumpwmrc --- a/stumpwmrc Wed Sep 26 08:45:22 2018 -0400 +++ b/stumpwmrc Wed Sep 26 08:45:31 2018 -0400 @@ -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,