diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | basics/.config/less/history | 0 | ||||
| -rw-r--r-- | basics/.config/newsboat/urls | 2 | ||||
| -rw-r--r-- | basics/.config/npm/npmrc | 4 | ||||
| -rw-r--r-- | basics/.config/wget/wgetrc | 1 | ||||
| -rw-r--r-- | meta/basic_deps | 2 | ||||
| -rwxr-xr-x | x/.config/X11/Xresources | 2 | ||||
| -rwxr-xr-x | x/.config/X11/xprofile | 1 | ||||
| -rwxr-xr-x | x/.xinitrc | 2 | ||||
| -rwxr-xr-x | zsh/.config/zsh/.zprofile | 41 | ||||
| -rw-r--r-- | zsh/.zshenv | 59 |
11 files changed, 71 insertions, 46 deletions
@@ -40,7 +40,8 @@ nvim: curl -fLo nvim/.config/nvim/autoload/plug.vim --create-dirs \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim stow -t ~ $@ -zsh: zplug + +zsh: basics zplug stow -t ~ $@ zplug: diff --git a/basics/.config/less/history b/basics/.config/less/history new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/basics/.config/less/history diff --git a/basics/.config/newsboat/urls b/basics/.config/newsboat/urls new file mode 100644 index 0000000..134c73c --- /dev/null +++ b/basics/.config/newsboat/urls @@ -0,0 +1,2 @@ +https://www.archlinux.org/feeds/news/ +https://www.archlinux.org/feeds/planet/ diff --git a/basics/.config/npm/npmrc b/basics/.config/npm/npmrc new file mode 100644 index 0000000..fc84b78 --- /dev/null +++ b/basics/.config/npm/npmrc @@ -0,0 +1,4 @@ +prefix=${XDG_DATA_HOME}/npm +cache=${XDG_CACHE_HOME}/npm +tmp=${XDG_RUNTIME_DIR}/npm +init-module=${XDG_CONFIG_HOME}/npm/config/npm-init.js diff --git a/basics/.config/wget/wgetrc b/basics/.config/wget/wgetrc new file mode 100644 index 0000000..228a8ec --- /dev/null +++ b/basics/.config/wget/wgetrc @@ -0,0 +1 @@ +hsts-file = /home/peter/.cache/wget-hsts diff --git a/meta/basic_deps b/meta/basic_deps index 4121dca..bfaeeba 100644 --- a/meta/basic_deps +++ b/meta/basic_deps @@ -1,10 +1,10 @@ acpi alacritty -alacritty-terminfo dunst emacs kitty libnotify +newsboat otf-fira-code otf-fira-mono otf-fira-sans diff --git a/x/.config/X11/Xresources b/x/.config/X11/Xresources index 5b0defc..68f3911 100755 --- a/x/.config/X11/Xresources +++ b/x/.config/X11/Xresources @@ -10,4 +10,4 @@ #include "gruvbox-dark.xresources" *.alpha: 0.8 -*.font: monospace:size=12 +*.font: monospace:size=8 diff --git a/x/.config/X11/xprofile b/x/.config/X11/xprofile index 214a253..273230f 100755 --- a/x/.config/X11/xprofile +++ b/x/.config/X11/xprofile @@ -2,6 +2,7 @@ # set keyboard setxkbmap -layout us,us -variant ,dvp -option grp:shifts_toggle +setxkbmap -option caps:swapescape xset r rate 300 50 # set wallpaper @@ -1,6 +1,6 @@ #!/bin/sh -xprofile=${XDG_CONFIG_HOME}/X/xprofile +xprofile=${XDG_CONFIG_HOME}/X11/xprofile [ -f $xprofile ] && . $xprofile #exec startxfce4 diff --git a/zsh/.config/zsh/.zprofile b/zsh/.config/zsh/.zprofile index 6a40089..f4374d4 100755 --- a/zsh/.config/zsh/.zprofile +++ b/zsh/.config/zsh/.zprofile @@ -8,9 +8,6 @@ source /etc/zsh/zprofile #export TERM=xterm-256color #export EDITOR="emacsclient -c" -export EDITOR="nvim" - -export DEFAULT_USER=peter export QT_QPA_PLATFORMTHEME=qt5ct export QT_AUTO_SCREEN_SCALE_FACTOR=0 @@ -18,44 +15,6 @@ export QT_SCALE_FACTOR=0 export MTP_NO_PROBE="1" -export XDG_CONFIG_HOME="$HOME/.config" - -[ -d "$HOME/.local/bin" ] && \ - export PATH="$HOME/.local/bin:$PATH" -[ -d "$HOME/.bin" ] && \ - export PATH="$HOME/.bin:$PATH" -[ -d "$HOME/bin" ] && \ - export PATH="$HOME/bin:$PATH" - -# Android SDK -if [ -d "$HOME/.local/share/android-sdk" ]; then - export ANDROID_HOME="$HOME/.local/share/android-sdk" - export PATH="$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools/bin:$PATH" -fi - -# Go -if type "go" > /dev/null; then - export PATH="$HOME/go/bin:$PATH" - export GOPATH=$(go env GOPATH) -fi - -# Rust -if type "rustc" > /dev/null; then - export PATH="$HOME/.cargo/bin:$PATH" - export RUST_SRC_PATH="$(rustc --print sysroot)/lib/rustlib/src/rust/src" -fi - -# Node -if type "npm" > /dev/null; then - export PATH="$HOME/.node_modules/bin:$PATH" - export npm_config_prefix=~/.node_modules -fi - -# Ruby -if type "ruby" > /dev/null; then - export PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" -fi - # fzf if type "fzf" > /dev/null && type "rg" > /dev/null; then export FZF_DEFAULT_COMMAND="rg --hidden --follow --ignore-vcs --files --iglob '!.git'" diff --git a/zsh/.zshenv b/zsh/.zshenv index 55d2d67..7a0a963 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -1,5 +1,62 @@ +export EDITOR="nvim" + +export DEFAULT_USER=peter + + export XDG_CONFIG_HOME="$HOME/.config" export XDG_CACHE_HOME="$HOME/.cache" export XDG_DATA_HOME="$HOME/.local/share" -export ZDOTDIR="${XDG_CONFIG_HOME}/zsh" +export ZDOTDIR="$XDG_CONFIG_HOME/zsh" + +extra_paths="" + +# RUST XDG_DIR +export RUSTUP_HOME="$XDG_DATA_HOME/rustup" +export CARGO_HOME="$XDG_DATA_HOME/cargo" +extra_paths="$CARGO_HOME/bin:$extra_paths" + +# GOPATH +export GOPATH="$XDG_DATA_HOME/go" +extra_paths="$extra_paths:$GOPATH/bin" + +# Ruby +export GEM_HOME="$XDG_DATA_HOME/gem" +export GEM_SPEC_CACHE="$XDG_CACHE_HOME/gem" +export BUNDLE_USER_CONFIG="$XDG_CONFIG_HOME/bundle" +export BUNDLE_USER_CACHE="$XDG_CACHE_HOME/bundle" +export BUNDLE_USER_PLUGIN="$XDG_DATA_HOME/bundle" +extra_paths="$extra_paths:$GEM_HOME/bin" + +# Node & NPM +export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" +export npm_config_prefix="$XDG_DATA_HOME/node" +export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" +extra_paths="$extra_paths:$npm_config_prefix/bin" + +# Docker +export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker" +export MACHINE_STORAGE_PATH="$XDG_DATA_HOME/docker-machine" + +# Other +export CCACHE_CONFIGPATH="$XDG_CONFIG_HOME/ccache.conf" +export CCACHE_DIR="$XDG_CACHE_HOME/ccache" +export GRADLE_USER_HOME="$XDG_DATA_HOME/gradle" +export GTK_RC_FILES="$XDG_CONFIG_HOME/gtk-1.0/gtkrc" +export GTK2_RC_FILES="$XDG_CONFIG_HOME/gkt-2.0/gtkrc" +export LESSKEY="$XDG_CONFIG_HOME/less/lesskey" +export LESSHISTFILE="$XDG_CACHE_HOME/less/history" +export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch/notmuchrc" +export NMBGIT="$XDG_DATA_HOME/notmuch/nmbug" +export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass" +export WINEPREFIX="$XDG_DATA_HOME/wineprefixes/default" +export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" + +[ -d "$HOME/bin" ] && \ + PATH="$HOME/bin:$PATH" +[ -d "$HOME/.bin" ] && \ + PATH="$HOME/.bin:$PATH" +[ -d "$HOME/.local/bin" ] && \ + PATH="$HOME/.local/bin:$PATH" +export PATH="$extra_paths:$PATH" + |