Update

[dotfiles.git] / .zshrc

diff --git a/.zshrc b/.zshrc
old mode 100755 (executable)
new mode 100644 (file)
index bb71096..595c26b
--- a/.zshrc
+++ b/.zshrc
@@ -35,19 +35,19 @@ export LANG=en_US.UTF-8
 
 # Various editors and fix aliases with sudo
 export EDITOR=nvim
 
 # Various editors and fix aliases with sudo
 export EDITOR=nvim

+export COLORTERM=1 CLICOLOR=1
+export JCOLOR=1

 bindkey '^E' edit-command-line
 alias code='code-oss'
 alias sudo='sudo '
 bindkey '^E' edit-command-line
 alias code='code-oss'
 alias sudo='sudo '

-alias icat="kitty +kitten icat"

 alias fuzz="fzf --preview 'bat --style=numbers,changes --color=always --line-range :500 {}' --preview-window=right:66%"
 alias sort='LC_ALL=C sort'
 alias fuzz="fzf --preview 'bat --style=numbers,changes --color=always --line-range :500 {}' --preview-window=right:66%"
 alias sort='LC_ALL=C sort'

-# https://reviews.freebsd.org/D30545
-alias diff='LC_ALL=C TZ=UTC diff --color=auto'
+alias diff='LC_ALL=C TZ=UTC diff'

 alias ls='ls --color=auto -F'
 alias ls='ls --color=auto -F'

+alias diffstat='diffstat -C'

 export BAT_THEME="Nord"
 
 # Setup LSCOLORS, LS_COLORS and completion
 export BAT_THEME="Nord"
 
 # Setup LSCOLORS, LS_COLORS and completion

-# https://reviews.freebsd.org/D30547

 # https://git.cameronkatri.com/opendircolors
 test -r ~/.nord_colors && eval $(opendircolors ~/.nord_colors)
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
 # https://git.cameronkatri.com/opendircolors
 test -r ~/.nord_colors && eval $(opendircolors ~/.nord_colors)
 zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}


@@ -65,18 +65,12 @@ setxkbmap -option compose:rctrl
 
 export GPG_TTY=$(tty)
 
 
 export GPG_TTY=$(tty)
 

-export GOPATH=$HOME/Documents/go
-
-# Completion for kitty
-kitty + complete setup zsh | source /dev/stdin
-

 export LESS='-FiMRx2$z-4$Dd+c$Du+g'
 
 export LESS='-FiMRx2$z-4$Dd+c$Du+g'
 

-# https://reviews.freebsd.org/D30341
-if ! mount -t fusefs --libxo=json | \
-jq -e '.mount.mounted[] | select(.node == "/usr/home/cameron/Documents/smbnetfs")' >/dev/null; then
-       smbnetfs $HOME/Documents/smbnetfs
-fi
+#if ! mount -t fusefs --libxo=json | \
+#jq -e '.mount.mounted[] | select(.node == "/usr/home/cameron/Documents/smbnetfs")' >/dev/null; then
+#      smbnetfs $HOME/Documents/smbnetfs
+#fi

 
 source ~/.crossenv.zsh
 
 
 source ~/.crossenv.zsh
 


@@ -94,11 +88,4 @@ fi
 
 export CVS_RSH=ssh
 
 
 export CVS_RSH=ssh
 

-alias dotconfig='git --git-dir=$HOME/Documents/dotfiles --work-tree=$HOME'
-
-# Set PATH after everthing else.
-export PATH="$GOPATH/bin:$PATH"
-export PATH="/usr/local/llvm12/bin:$PATH"
-export PATH="/usr/local/libexec/apple/bin:$PATH"
-export PATH="$HOME/.local/bin:/usr/local/libexec/ccache:/opt/limd/bin:$PATH"
-typeset -U path
+alias dotgit='git --git-dir=$HOME/Documents/dotfiles --work-tree=$HOME'