# HG changeset patch
# User Steve Losh <steve@stevelosh.com>
# Date 1571431819 14400
# Node ID e3f46c421f0eaa78d6bcd33d5aaa89a7e2aa5991
# Parent  6554a615d45974107d929c9c661a5eaf61437489# Parent  9af48fd636c117d62626448545416fae92f36c40
Merge.

diff -r 6554a615d459 -r e3f46c421f0e pulse/daemon.conf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/pulse/daemon.conf	Fri Oct 18 16:50:19 2019 -0400
@@ -0,0 +1,1 @@
+flat-volumes=no
diff -r 6554a615d459 -r e3f46c421f0e skeletal_bashrc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/skeletal_bashrc	Fri Oct 18 16:50:19 2019 -0400
@@ -0,0 +1,46 @@
+if [ -f /etc/bashrc ]; then
+        . /etc/bashrc
+fi
+
+eval "$(dircolors -b ~/.dircolors)"
+
+D=$'\e[37m'
+PINK=$'\e[35m'
+GREEN=$'\e[32m'
+ORANGE=$'\e[33m'
+
+export PS1='\n${PINK}\u ${D}at ${ORANGE}\h ${D}in ${GREEN}\w${D}\n$ '
+
+alias nvim=vim
+alias ..="cd .."
+alias ...="cd ../.."
+alias ....="cd ../../.."
+alias g=git
+alias h=hg
+
+alias l1="tree --dirsfirst -ChFL 1"
+alias l2="tree --dirsfirst -ChFL 2"
+alias l3="tree --dirsfirst -ChFL 3"
+alias l4="tree --dirsfirst -ChFL 4"
+alias l5="tree --dirsfirst -ChFL 5"
+alias ll1="tree --dirsfirst -ChFupDaL 1"
+alias ll2="tree --dirsfirst -ChFupDaL 2"
+alias ll3="tree --dirsfirst -ChFupDaL 3"
+alias ll4="tree --dirsfirst -ChFupDaL 4"
+alias ll5="tree --dirsfirst -ChFupDaL 5"
+
+alias l=l1
+alias ll=ll1
+
+export PAGER=less
+
+shopt -s histappend
+HISTFILESIZE=100000
+HISTSIZE=100000
+HISTCONTROL=ignoreboth
+shopt -s cmdhist
+
+PROMPT_COMMAND='history -a'
+
+PATH=$PATH:$HOME/.local/bin:$HOME/bin
+export PATH
diff -r 6554a615d459 -r e3f46c421f0e stumpwmrc
--- a/stumpwmrc	Fri Oct 18 16:50:02 2019 -0400
+++ b/stumpwmrc	Fri Oct 18 16:50:19 2019 -0400
@@ -491,6 +491,11 @@
   ("H-K" "move-window up")
   ("H-L" "move-window right")
 
+  ("H-1" "gmove 1")
+  ("H-2" "gmove 2")
+  ("H-3" "gmove 3")
+  ("H-4" "gmove 4")
+
   ("C-H-H" "exchange-direction left")
   ("C-H-J" "exchange-direction down")
   ("C-H-K" "exchange-direction up")
diff -r 6554a615d459 -r e3f46c421f0e vim/vimrc
--- a/vim/vimrc	Fri Oct 18 16:50:02 2019 -0400
+++ b/vim/vimrc	Fri Oct 18 16:50:19 2019 -0400
@@ -1692,7 +1692,7 @@
     au Filetype markdown nnoremap <buffer> <localleader>3 mzI###<space><esc>`zllll
     au Filetype markdown nnoremap <buffer> <localleader>4 mzI####<space><esc>`zlllll
 
-    au Filetype markdown inoremap <buffer> <c-cr> <cr><esc>mz? *\*?e<cr>"zy0:noh<cr>`z"zpA* <esc>a
+    au Filetype markdown inoremap <buffer> <c-cr> <cr><esc>mz?^ *\*?e<cr>"zy0:noh<cr>`z"zpA* <esc>a
     au Filetype markdown inoremap <buffer> <s-tab> <esc>mz0xx`za
     au Filetype markdown inoremap <buffer> <c-tab> <esc>mzI  <esc>`zlla
 augroup END