From 38b9f02b931d97575b7a27e17e6bcea941b53f05 Mon Sep 17 00:00:00 2001
From: Thomas Schneider <qsx@qsx.re>
Date: Sun, 14 Apr 2019 17:31:42 +0200
Subject: zsh: Some cleanup

---
 dot.zshenv      | 6 ++++--
 dot.zshrc.local | 3 +--
 dot.zshrc.pre   | 2 --
 3 files changed, 5 insertions(+), 6 deletions(-)
 delete mode 100644 dot.zshrc.pre

diff --git a/dot.zshenv b/dot.zshenv
index b39df2f..46d32a3 100644
--- a/dot.zshenv
+++ b/dot.zshenv
@@ -1,7 +1,9 @@
+# -*- shell-script -*-
 export GOPATH=~/.go/
-export LESS="FSRX"
+export LESS="FRX"
 export PATH=${PATH/::/:}
 export GPG_TTY=$(tty)
-export NNTPSERVER="snews://news.cis.dfn.de"
 export EDITOR=emacsclient
 export VISUAL=$EDITOR
+path=( $HOME/.gem/ruby/*/bin(/N) $HOME/.cabal/bin(/N) $HOME/.go/bin(/N) $HOME/.cargo/bin(/N) $HOME/.local/bin(/N) $path /usr/sbin(/N) /usr/local/sbin(/N) /sbin(/N) )
+typeset -xU path
diff --git a/dot.zshrc.local b/dot.zshrc.local
index e8abbb7..a1a4456 100644
--- a/dot.zshrc.local
+++ b/dot.zshrc.local
@@ -2,12 +2,11 @@
 . ~/.zshrc.from_grml
 (( $+commands[bsdtar] )) && alias tar=bsdtar
 (( $+commands[chg] )) && alias hg=chg
+(( $+commands[nvim] )) && alias vim=nvim
 alias g=git
 alias ec="emacsclient -n"
 alias et="emacsclient -t"
 alias hl="highlight -O ansi"
-path=( $HOME/.gem/ruby/*/bin(/N) $HOME/.cabal/bin(/N) $HOME/.go/bin(/N) $HOME/.cargo/bin(/N) $HOME/.local/bin(/N) $path /usr/sbin(/N) /usr/local/sbin(/N) /sbin(/N) )
-typeset -xU path
 zstyle :prompt:grml:left:items:percent pre '
 '
 gpg-connect-agent /bye
diff --git a/dot.zshrc.pre b/dot.zshrc.pre
deleted file mode 100644
index 5fd3e88..0000000
--- a/dot.zshrc.pre
+++ /dev/null
@@ -1,2 +0,0 @@
-export GRML_DISPLAY_BATTERY=1
-export COMMAND_NOT_FOUND=1
-- 
cgit v1.2.3