summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bash_profile1
-rw-r--r--.bashrc77
-rw-r--r--.config/setup-env79
3 files changed, 80 insertions, 77 deletions
diff --git a/.bash_profile b/.bash_profile
index 71d1582..bcbf1bb 100644
--- a/.bash_profile
+++ b/.bash_profile
@@ -1,3 +1,4 @@
+[ -f ~/.config/setup-env ] && source ~/.config/setup-env
[ -z "$XDG_RUNTIME_DIR" ] && export XDG_RUNTIME_DIR="/run/user/$UID"
if [ ! -d "$XDG_RUNTIME_DIR" ]
diff --git a/.bashrc b/.bashrc
index eb4c02f..bb82593 100644
--- a/.bashrc
+++ b/.bashrc
@@ -29,83 +29,6 @@ function goto {
&& pushd "$dst"
}
-export BROWSER="firefox"
-export CC="gcc"
-export EDITOR="nvim"
-export PAGER="less"
-case "$(hostname)" in
- mangobox) export MANPAGER="manpager" ;;
- mango-os) export MANPAGER="nvimpager" ;;
- *) export MANPAGER="less" ;;
-esac
-export TERM="xterm-256color"
-export VISUAL="nvim"
-export MANSECT="3,2,1,8,5,7,4,6,3p,1p,0p"
-export LC_NUMERIC="nl_NL.UTF-8"
-
-export XDG_CACHE_HOME="$HOME/.cache"
-export XDG_CONFIG_DIRS="/etc/xdg"
-export XDG_CONFIG_HOME="$HOME/.config"
-export XDG_DATA_DIRS="/usr/local/share:/usr/share"
-export XDG_DATA_HOME="$HOME/.local/share"
-export XDG_STATE_HOME="$HOME/.local/state"
-
-export XDG_DESKTOP_DIR="$HOME"
-export XDG_DOCUMENTS_DIR="$HOME/doc"
-export XDG_DOWNLOAD_DIR="$HOME/down"
-export XDG_MUSIC_DIR="$HOME/media/mus"
-export XDG_PICTURES_DIR="$HOME/media/img"
-export XDG_PUBLICSHARE_DIR="$HOME"
-export XDG_TEMPLATES_DIR="$HOME"
-export XDG_VIDEOS_DIR="$HOME/media/vid"
-
-xdg-user-dirs-update --set DESKTOP "$XDG_DESKTOP_DIR"
-xdg-user-dirs-update --set DOCUMENTS "$XDG_DOCUMENTS_DIR"
-xdg-user-dirs-update --set DOWNLOAD "$XDG_DOWNLOAD_DIR"
-xdg-user-dirs-update --set MUSIC "$XDG_MUSIC_DIR"
-xdg-user-dirs-update --set PICTURES "$XDG_PICTURES_DIR"
-xdg-user-dirs-update --set PUBLICSHARE "$XDG_PUBLICSHARE_DIR"
-xdg-user-dirs-update --set TEMPLATES "$XDG_TEMPLATES_DIR"
-xdg-user-dirs-update --set VIDEOS "$XDG_VIDEOS_DIR"
-
-export ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl"
-export CARGO_HOME="$XDG_DATA_HOME/cargo"
-export GNUPGHOME="$XDG_DATA_HOME/gnupg"
-export GOPATH="$XDG_DATA_HOME/go"
-export GOROOT="/usr/lib/go"
-export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
-export HISTFILE="$XDG_STATE_HOME/bash/history"
-export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
-export MAILDIR="$HOME/mail"
-export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
-export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
-export NVM_DIR="$XDG_DATA_HOME/nvm"
-export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
-export PYTHONCACHEPREFIX="$XDG_CACHE_HOME/python"
-export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
-export PYTHONUSERBASE="$XDG_DATA_HOME/python"
-export RLWRAP_HOME="$XDG_CACHE_HOME/rlwrap"
-export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-export SQLITE_HISTORY="$XDG_STATE_HOME/sqlite_history"
-export W3M_DIR="$XDG_STATE_HOME/w3m"
-export WGETRC="$XDG_CONFIG_HOME/wgetrc"
-export XCOMPOSECACHE="$XDG_CACHE_HOME/X11/xcompose"
-export XCOMPOSEFILE="$XDG_CONFIG_HOME/X11/xcompose"
-export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=\"$XDG_CONFIG_HOME/java\" -Djavafx.cachedir=\"$XDG_CACHE_HOME/openjfx\""
-
-export REPODIR="$HOME/code"
-export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
-export PATH="$HOME/.local/bin:$HOME/.local/sbin:$XDG_DATA_HOME/qlot/bin:/opt/odin:$GOROOT/bin:$GOPATH/bin:$XDG_DATA_HOME/npm/bin:$PATH"
-
-export CLANGD_FLAGS='-header-insertion=never'
-export GPG_TTY=`tty`
-export GTK_IM_MODULE=xim
-export HISTSIZE=100000
-export LESS='-RF'
-export PRINTER='HP_OfficeJet_8010'
-export QT_IM_MODULE=xim
-export VAULT_2FA='2 Factor Authentication'
-
alias irssi='irssi --config="$XDG_CONFIG_HOME/irssi/config" --home="$XDG_DATA_HOME/irssi"'
alias ..='cd ..'
alias d='git --git-dir="$REPODIR/@me/dotfiles.git" --work-tree="$HOME"'
diff --git a/.config/setup-env b/.config/setup-env
new file mode 100644
index 0000000..094b616
--- /dev/null
+++ b/.config/setup-env
@@ -0,0 +1,79 @@
+#!/bin/sh
+
+export BROWSER="firefox"
+export CC="gcc"
+export EDITOR="nvim"
+export PAGER="less"
+case "$(hostname)" in
+ mangobox) export MANPAGER="manpager" ;;
+ mango-os) export MANPAGER="nvimpager" ;;
+ *) export MANPAGER="less" ;;
+esac
+export TERM="xterm-256color"
+export VISUAL="nvim"
+export MANSECT="3,2,1,8,5,7,4,6,3p,1p,0p"
+export LC_NUMERIC="nl_NL.UTF-8"
+
+export XDG_CACHE_HOME="$HOME/.cache"
+export XDG_CONFIG_DIRS="/etc/xdg"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_DIRS="/usr/local/share:/usr/share"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_STATE_HOME="$HOME/.local/state"
+
+export XDG_DESKTOP_DIR="$HOME"
+export XDG_DOCUMENTS_DIR="$HOME/doc"
+export XDG_DOWNLOAD_DIR="$HOME/down"
+export XDG_MUSIC_DIR="$HOME/media/mus"
+export XDG_PICTURES_DIR="$HOME/media/img"
+export XDG_PUBLICSHARE_DIR="$HOME"
+export XDG_TEMPLATES_DIR="$HOME"
+export XDG_VIDEOS_DIR="$HOME/media/vid"
+
+xdg-user-dirs-update --set DESKTOP "$XDG_DESKTOP_DIR"
+xdg-user-dirs-update --set DOCUMENTS "$XDG_DOCUMENTS_DIR"
+xdg-user-dirs-update --set DOWNLOAD "$XDG_DOWNLOAD_DIR"
+xdg-user-dirs-update --set MUSIC "$XDG_MUSIC_DIR"
+xdg-user-dirs-update --set PICTURES "$XDG_PICTURES_DIR"
+xdg-user-dirs-update --set PUBLICSHARE "$XDG_PUBLICSHARE_DIR"
+xdg-user-dirs-update --set TEMPLATES "$XDG_TEMPLATES_DIR"
+xdg-user-dirs-update --set VIDEOS "$XDG_VIDEOS_DIR"
+
+export ASPELL_CONF="per-conf $XDG_CONFIG_HOME/aspell/aspell.conf; personal $XDG_CONFIG_HOME/aspell/en.pws; repl $XDG_CONFIG_HOME/aspell/en.prepl"
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+export GNUPGHOME="$XDG_DATA_HOME/gnupg"
+export GOPATH="$XDG_DATA_HOME/go"
+export GOROOT="/usr/lib/go"
+export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle"
+export HISTFILE="$XDG_STATE_HOME/bash/history"
+export INPUTRC="$XDG_CONFIG_HOME/readline/inputrc"
+export MAILDIR="$HOME/mail"
+export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history"
+export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc"
+export NVM_DIR="$XDG_DATA_HOME/nvm"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass"
+export PYTHONCACHEPREFIX="$XDG_CACHE_HOME/python"
+export PYTHONSTARTUP="$XDG_CONFIG_HOME/python/startup.py"
+export PYTHONUSERBASE="$XDG_DATA_HOME/python"
+export RLWRAP_HOME="$XDG_CACHE_HOME/rlwrap"
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
+export SQLITE_HISTORY="$XDG_STATE_HOME/sqlite_history"
+export W3M_DIR="$XDG_STATE_HOME/w3m"
+export WGETRC="$XDG_CONFIG_HOME/wgetrc"
+export XCOMPOSECACHE="$XDG_CACHE_HOME/X11/xcompose"
+export XCOMPOSEFILE="$XDG_CONFIG_HOME/X11/xcompose"
+export _JAVA_OPTIONS="-Djava.util.prefs.userRoot=\"$XDG_CONFIG_HOME/java\" -Djavafx.cachedir=\"$XDG_CACHE_HOME/openjfx\""
+
+export REPODIR="$HOME/code"
+export LD_LIBRARY_PATH="/usr/local/lib:$LD_LIBRARY_PATH"
+export PATH="$HOME/.local/bin:$HOME/.local/sbin:$XDG_DATA_HOME/qlot/bin:/opt/odin:$GOROOT/bin:$GOPATH/bin:$XDG_DATA_HOME/npm/bin:$PATH"
+
+export CLANGD_FLAGS='-header-insertion=never'
+export GPG_TTY="$(tty)"
+export GTK_IM_MODULE=xim
+export HISTSIZE=100000
+export LESS='-RF'
+export PRINTER='HP_OfficeJet_8010'
+export QT_IM_MODULE=xim
+export VAULT_2FA='2 Factor Authentication'
+