merged: falcon

diff --git a/.zshenv b/.zshenv
index 0cd360553f08634cdd934241c0cfb4c9866572ac..228621110965a7bcb2ddc5f6d421817f6b6e0bc3 100644 (file)
--- a/.zshenv
+++ b/.zshenv
@@ -25,7 +25,7 @@ export CONFIG="$XDG_CONFIG_HOME"
 export LANG=en_US.UTF-8
 
 # path variables
-export PATH="$PATH:$HOME/.local/bin:$REPOS/script:$REPOS/ruby:$XDG_DATA_HOME/cargo/bin:."
+export PATH="$PATH:$HOME/.local/bin:$REPOS/script:$REPOS/ruby:."
 export CDPATH=".:$HOME:$HOME/$REPOS:$HOME/$XDG_CONFIG_HOME:/"
 
 # language variables
@@ -33,14 +33,13 @@ export GOPATH="$XDG_DATA_HOME/go"
 export PERL_LOCAL_LIB_ROOT="$XDG_DATA_HOME/perl5"
 export CARGO_HOME="$XDG_DATA_HOME/cargo"
 export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
-
-# terminal setting:
-# [[ -n $TMUX ]] && export TERM=tmux-256color || export TERM=alacritty
+export PATH="$PATH:$XDG_DATA_HOME/cargo/bin"
+export PATH="$PATH:$XDG_DATA_HOME/gem/ruby/3.0.0/bin"
 
 # preferred programs
-export PAGER='less'
+export PAGER='/usr/bin/less'
 export LESS='-R --use-color -Dd+r$Du+b'
-export MANPAGER='less -R --use-color -Dd+r -Du+b'
+export MANPAGER='/usr/bin/less -R --use-color -Dd+r -Du+b'
 export EDITOR="/usr/bin/nvim"
 export DIFFPROG="/usr/bin/nvim -d"
 export VISUAL="/usr/bin/nvim"

diff --git a/include/functions.zsh b/include/functions.zsh
index 5e6a6ffb2711eb42fb793bc8836f64357e42304c..efc4c827e5ae59dc2cd8e32c56f3b0daebf76734 100644 (file)
--- a/include/functions.zsh
+++ b/include/functions.zsh
@@ -5,12 +5,6 @@ f() {
     find . | grep "$1";
 }
 
-# wrapper around cd for easier navigation + always show files in dir
-# cd() {
-#     z $1
-#     la
-# }
-
 # smart remove
 rem() {
     if [ ! -d "$HOME/.trash" ]; then mkdir "$HOME/.trash"; fi