dots

commit fced49319565feea22764108ac37a9402e688679
parent 7dda5c428082f7044958cb6cd655c69e1a762f7b
Author: Matthew Carlson <matt@mcarlson.xyz>
Date:   Sat, 17 Jul 2021 03:32:21 -0400

switched from startx to sx; vim has clipboard support; shell cleanup

Diffstat:
M
.config/mksh/mkshrc
 | 
26
+++++++++++++++++++++++++-
M
.config/sh/aliasrc
 | 
2
+-
M
.config/sh/profile
 | 
7
+++----
A
.config/sx/sxrc
 | 
7
+++++++
M
.config/vim/vimrc
 | 
6
++++--
D
.config/x/xinitrc
 | 
7
-------
M
.config/x/xprofile
 | 
6
++++--
A
.local/share/wp
 | 
2
++

8 files changed, 46 insertions(+), 17 deletions(-)
diff --git a/.config/mksh/mkshrc b/.config/mksh/mkshrc
@@ -2,7 +2,31 @@
 #
 # mkshrc
 
-export PS1=$'\033[1;34m${PWD} $ \033[0;37m'
+# tput
+COL0="$(tput setaf 0)"
+COL1="$(tput setaf 1)"
+COL2="$(tput setaf 2)"
+COL3="$(tput setaf 3)"
+COL4="$(tput setaf 4)"
+COL5="$(tput setaf 5)"
+COL6="$(tput setaf 6)"
+COL7="$(tput setaf 7)"
+COL8="$(tput setaf 8)"
+COL9="$(tput setaf 9)"
+COL10="$(tput setaf 10)"
+COL11="$(tput setaf 11)"
+COL12="$(tput setaf 12)"
+COL13="$(tput setaf 13)"
+COL14="$(tput setaf 14)"
+COL15="$(tput setaf 15)"
+BOLD="$(tput bold)"
+NORMAL="$(tput sgr0)"
+
+# prompt
+export PS1=$'${BOLD}${COL4}$(pwd) $ ${NORMAL}${COL7}'
+
+# gpg tty
+export GPG_TTY=$(tty)
 
 # aliasrc
 [ -f "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/aliasrc" ] && . "${XDG_CONFIG_HOME:-${HOME}/.config}/sh/aliasrc"
diff --git a/.config/sh/aliasrc b/.config/sh/aliasrc
@@ -59,7 +59,7 @@ alias \
      gstl='git stash list'         \
      gstp='git stash pop'
 
-# dotfiles
+# dots
 alias dots="/usr/bin/git --git-dir=${HOME}/.dots/ --work-tree=${HOME}"
 
 # youtube
diff --git a/.config/sh/profile b/.config/sh/profile
@@ -22,7 +22,7 @@ export TERMINAL='st'
 export FILE_VIEWER='shfm'
 export EDITOR='vim'
 export MUSIC_PLAYER='cmus'
-export MAIL_CLIENT='mutt'
+export MAIL_CLIENT='neomutt'
 export MEDIA_PLAYER='mpv'
 export READER='zathura'
 export IMG_VIEWER='feh'
@@ -34,7 +34,6 @@ export XDG_CACHE_HOME="${HOME}/.cache/"
 export XDG_STATE_HOME="${HOME}/.local/state/"
 
 # xdg base directory support
-export XINITRC="${XDG_CONFIG_HOME:-${HOME}/.config}/x/xinitrc"
 export VIMINIT="source ${XDG_CONFIG_HOME:-${HOME}/.config}/vim/vimrc"
 export GNUPGHOME="${XDG_DATA_HOME:-${HOME}/.local/share}/gnupg/"
 export ENV="${XDG_CONFIG_HOME:-${HOME}/.config}/mksh/mkshrc"
@@ -76,5 +75,5 @@ export PASH_TIMEOUT=60
 # clean up
 export LESSHISTFILE=-
 
-# startx
-[ -z "${DISPLAY}" ] && [ "$(tty)" = /dev/tty1 ] && ssh-agent startx "${XINITRC}" &> /dev/null
+# sx
+[ -z "${DISPLAY}" ] && [ "$(tty)" = /dev/tty1 ] && ssh-agent sx
diff --git a/.config/sx/sxrc b/.config/sx/sxrc
@@ -0,0 +1,7 @@
+#!/bin/sh
+#
+# sxrc
+
+. "${XDG_CONFIG_HOME:-${HOME}/.config}/x/xprofile"
+
+"${WM}" >/dev/null 2>&1
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
@@ -62,16 +62,18 @@ syntax on
 
 " useful information to display by default
 set laststatus=2
-set title
 set ruler
 set showcmd
 set cmdheight=1
 
+" get rid of thanks for flying vim
+set notitle
+
 " relative line numbers
 set number relativenumber
 
 " use system clipboard
-set clipboard+=unnamedplus
+set clipboard=unnamedplus
 
 " fix backspace not working in insert mode
 set backspace=indent,eol,start
diff --git a/.config/x/xinitrc b/.config/x/xinitrc
@@ -1,7 +0,0 @@
-#!/bin/sh
-#
-# xinitrc
-
-. "${XDG_CONFIG_HOME:-${HOME}/.config}/x/xprofile"
-
-"${WM}" >/dev/null 2>&1
diff --git a/.config/x/xprofile b/.config/x/xprofile
@@ -1,6 +1,8 @@
 #!/bin/sh
 #
-# xresources
+# xprofile
 
-feh --no-fehbg --bg-scale "${HOME}/pix/wp/out-of-this-world.jpg"
+xrandr --output "DisplayPort-1" --mode "1920x1080" --rate "144" --primary
+xset r rate 250 50
+feh --no-fehbg --bg-scale "${XDG_DATA_HOME:-${HOME}/.local/share}/wp"
 xrdb "${XDG_CONFIG_HOME:-${HOME}/.config}/x/xresources"
diff --git a/.local/share/wp b/.local/share/wp
@@ -0,0 +1 @@
+/home/mc/pix/wp/out-of-this-world.jpg
+\ No newline at end of file