From e867fcfae509aab72e0efd6a2ca2c251c684154e Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 26 Nov 2019 17:50:41 -0500 Subject: [PATCH] fix for dms --- .profile | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ .xinitrc | 46 ++++++++++------------------------------------ .zprofile | 44 +------------------------------------------- 3 files changed, 60 insertions(+), 79 deletions(-) create mode 100644 .profile mode change 100644 => 120000 .zprofile diff --git a/.profile b/.profile new file mode 100644 index 0000000..e3543d9 --- /dev/null +++ b/.profile @@ -0,0 +1,49 @@ +# Profile file. Runs on login. Environmental variables are set here. + +# Adds `~/.local/bin` to $PATH +export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" + +# Get default LARBS WM from ~/.local/share/larbs/wm +export LARBSWM="$(cat ~/.local/share/larbs/wm 2>/dev/null)" && + [ "$LARBSWM" = "dwm" ] || export LARBSWM="i3" + +# Default programs: +export EDITOR="nvim" +export TERMINAL="st" +export BROWSER="brave" +export READER="zathura" +export FILE="ranger" +export STATUSBAR="${LARBSWM}blocks" + +# ~/ Clean-up: +export NOTMUCH_CONFIG="$HOME/.config/notmuch-config" +export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" +export LESSHISTFILE="-" +export INPUTRC="$HOME/.config/inputrc" +export ZDOTDIR="$HOME/.config/zsh" +export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" + +# Other program settings: +export DICS="/usr/share/stardict/dic/" +export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" +export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" +export LESS=-R +export LESS_TERMCAP_mb="$(printf '%b' '')" +export LESS_TERMCAP_md="$(printf '%b' '')" +export LESS_TERMCAP_me="$(printf '%b' '')" +export LESS_TERMCAP_so="$(printf '%b' '')" +export LESS_TERMCAP_se="$(printf '%b' '')" +export LESS_TERMCAP_us="$(printf '%b' '')" +export LESS_TERMCAP_ue="$(printf '%b' '')" + +mpd >/dev/null 2>&1 & + +[ ! -f ~/.config/shortcutrc ] && shortcuts >/dev/null 2>&1 + +# Start graphical server on tty1 if not already running. +[ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx + +# Switch escape and caps if tty and no passwd required: +sudo -n loadkeys ~/.local/share/larbs/ttymaps.kmap 2>/dev/null + +export LF_ICONS="di=:fi=:ln=:or=:ex=:*.c=:*.cc=:*.clj=:*.coffee=:*.cpp=:*.css=:*.d=:*.dart=:*.erl=:*.exs=:*.fs=:*.go=:*.h=:*.hh=:*.hpp=:*.hs=:*.html=:*.java=:*.jl=:*.js=:*.json=:*.lua=:*.md=:*.php=:*.pl=:*.pro=:*.py=:*.rb=:*.rs=:*.scala=:*.ts=:*.vim=:*.cmd=:*.ps1=:*.sh=:*.bash=:*.zsh=:*.fish=:*.tar=:*.tgz=:*.arc=:*.arj=:*.taz=:*.lha=:*.lz4=:*.lzh=:*.lzma=:*.tlz=:*.txz=:*.tzo=:*.t7z=:*.zip=:*.z=:*.dz=:*.gz=:*.lrz=:*.lz=:*.lzo=:*.xz=:*.zst=:*.tzst=:*.bz2=:*.bz=:*.tbz=:*.tbz2=:*.tz=:*.deb=:*.rpm=:*.jar=:*.war=:*.ear=:*.sar=:*.rar=:*.alz=:*.ace=:*.zoo=:*.cpio=:*.7z=:*.rz=:*.cab=:*.wim=:*.swm=:*.dwm=:*.esd=:*.jpg=:*.jpeg=:*.mjpg=:*.mjpeg=:*.gif=:*.bmp=:*.pbm=:*.pgm=:*.ppm=:*.tga=:*.xbm=:*.xpm=:*.tif=:*.tiff=:*.png=:*.svg=:*.svgz=:*.mng=:*.pcx=:*.mov=:*.mpg=:*.mpeg=:*.m2v=:*.mkv=:*.webm=:*.ogm=:*.mp4=:*.m4v=:*.mp4v=:*.vob=:*.qt=:*.nuv=:*.wmv=:*.asf=:*.rm=:*.rmvb=:*.flc=:*.avi=:*.fli=:*.flv=:*.gl=:*.dl=:*.xcf=:*.xwd=:*.yuv=:*.cgm=:*.emf=:*.ogv=:*.ogx=:*.aac=:*.au=:*.flac=:*.m4a=:*.mid=:*.midi=:*.mka=:*.mp3=:*.mpc=:*.ogg=:*.ra=:*.wav=:*.oga=:*.opus=:*.spx=:*.xspf=:*.pdf=" diff --git a/.xinitrc b/.xinitrc index f28ff04..3a5a220 100644 --- a/.xinitrc +++ b/.xinitrc @@ -2,41 +2,6 @@ # xinitrc runs automatically when you run startx. -guesswm() { - # Here, LARBS decides whether to boot dwm or i3. It will boot what is manually - # set in ~/.local/share/larbs/wm, otherwise it will test to see if dwm is - # installed, in which case it will load dwm. It will assume i3 otherwise. - - LARBSWM="$(cat ~/.local/share/larbs/wm 2>/dev/null)" || - { LARBSWM="$(type dwm >/dev/null 2>&1)" && LARBSWM="dwm" ;} || - { LARBSWM="$(type i3 >/dev/null 2>&1)" && LARBSWM="i3" ;} - - # To be clear, you can run: - # echo dwm > ~/.local/share/larbs/wm - # to set dwm as your default LARBS WM (or echo i3 for i3). - - # Here we start the window manager, whichever it's supposed to be. - # Note that we set the different status bar commands here too. - - case "$LARBSWM" in - dwm) - export FILE="lf" - export STATUSBAR="dwmblocks" - startlarbs() { # The loop is just to enable dwm's "restart" feature (mod+F2). - while :; do - ssh-agent dwm || break - done ;} - ;; - i3) - export FILE="ranger" - export STATUSBAR="i3blocks" - startlarbs() { exec i3 ;} - ;; - *) echo "No valid LARBS window manager detected." ;; - esac ;} - -guesswm - # There are some small but important commands that need to be run when we start # the graphical environment. I keep those commands in ~/.xprofile because that # file is run automatically if someone uses a display manager (login screen) @@ -45,4 +10,13 @@ guesswm [ -f ~/.xprofile ] && . ~/.xprofile -startlarbs +# Your default LARBS WM is determined in your `~/.profile` on login. Here we +# run the proper command to run when the graphical environment starts. + +case "$LARBSWM" in + dwm) while :; do + ssh-agent dwm || break + done ;; + i3) exec i3 ;; + *) echo "No valid LARBS window manager detected." ;; +esac diff --git a/.zprofile b/.zprofile deleted file mode 100644 index 6420806..0000000 --- a/.zprofile +++ /dev/null @@ -1,43 +0,0 @@ -# Profile file. Runs on login. Environmental variables are set here. - -# Adds `~/.local/bin` to $PATH -export PATH="$PATH:$(du "$HOME/.local/bin/" | cut -f2 | tr '\n' ':' | sed 's/:*$//')" - -# Default programs: -export EDITOR="nvim" -export TERMINAL="st" -export BROWSER="brave" -export READER="zathura" - -# ~/ Clean-up: -export NOTMUCH_CONFIG="$HOME/.config/notmuch-config" -export GTK2_RC_FILES="$HOME/.config/gtk-2.0/gtkrc-2.0" -export LESSHISTFILE="-" -export INPUTRC="$HOME/.config/inputrc" -export ZDOTDIR="$HOME/.config/zsh" -export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" - -# Other program settings: -export DICS="/usr/share/stardict/dic/" -export SUDO_ASKPASS="$HOME/.local/bin/dmenupass" -export FZF_DEFAULT_OPTS="--layout=reverse --height 40%" -export LESS=-R -export LESS_TERMCAP_mb="$(printf '%b' '')" -export LESS_TERMCAP_md="$(printf '%b' '')" -export LESS_TERMCAP_me="$(printf '%b' '')" -export LESS_TERMCAP_so="$(printf '%b' '')" -export LESS_TERMCAP_se="$(printf '%b' '')" -export LESS_TERMCAP_us="$(printf '%b' '')" -export LESS_TERMCAP_ue="$(printf '%b' '')" - -mpd >/dev/null 2>&1 & - -[ ! -f ~/.config/shortcutrc ] && shortcuts >/dev/null 2>&1 - -# Start graphical server on tty1 if not already running. -[ "$(tty)" = "/dev/tty1" ] && ! pgrep -x Xorg >/dev/null && exec startx - -# Switch escape and caps if tty and no passwd required: -sudo -n loadkeys ~/.local/share/larbs/ttymaps.kmap 2>/dev/null - -export LF_ICONS="di=:fi=:ln=:or=:ex=:*.c=:*.cc=:*.clj=:*.coffee=:*.cpp=:*.css=:*.d=:*.dart=:*.erl=:*.exs=:*.fs=:*.go=:*.h=:*.hh=:*.hpp=:*.hs=:*.html=:*.java=:*.jl=:*.js=:*.json=:*.lua=:*.md=:*.php=:*.pl=:*.pro=:*.py=:*.rb=:*.rs=:*.scala=:*.ts=:*.vim=:*.cmd=:*.ps1=:*.sh=:*.bash=:*.zsh=:*.fish=:*.tar=:*.tgz=:*.arc=:*.arj=:*.taz=:*.lha=:*.lz4=:*.lzh=:*.lzma=:*.tlz=:*.txz=:*.tzo=:*.t7z=:*.zip=:*.z=:*.dz=:*.gz=:*.lrz=:*.lz=:*.lzo=:*.xz=:*.zst=:*.tzst=:*.bz2=:*.bz=:*.tbz=:*.tbz2=:*.tz=:*.deb=:*.rpm=:*.jar=:*.war=:*.ear=:*.sar=:*.rar=:*.alz=:*.ace=:*.zoo=:*.cpio=:*.7z=:*.rz=:*.cab=:*.wim=:*.swm=:*.dwm=:*.esd=:*.jpg=:*.jpeg=:*.mjpg=:*.mjpeg=:*.gif=:*.bmp=:*.pbm=:*.pgm=:*.ppm=:*.tga=:*.xbm=:*.xpm=:*.tif=:*.tiff=:*.png=:*.svg=:*.svgz=:*.mng=:*.pcx=:*.mov=:*.mpg=:*.mpeg=:*.m2v=:*.mkv=:*.webm=:*.ogm=:*.mp4=:*.m4v=:*.mp4v=:*.vob=:*.qt=:*.nuv=:*.wmv=:*.asf=:*.rm=:*.rmvb=:*.flc=:*.avi=:*.fli=:*.flv=:*.gl=:*.dl=:*.xcf=:*.xwd=:*.yuv=:*.cgm=:*.emf=:*.ogv=:*.ogx=:*.aac=:*.au=:*.flac=:*.m4a=:*.mid=:*.midi=:*.mka=:*.mp3=:*.mpc=:*.ogg=:*.ra=:*.wav=:*.oga=:*.opus=:*.spx=:*.xspf=:*.pdf=" diff --git a/.zprofile b/.zprofile new file mode 120000 index 0000000..aa7da3a --- /dev/null +++ b/.zprofile @@ -0,0 +1 @@ +.profile \ No newline at end of file