summaryrefslogtreecommitdiffstats
path: root/zsh
diff options
context:
space:
mode:
Diffstat (limited to 'zsh')
-rw-r--r--zsh/.zprofile2
-rw-r--r--zsh/.zshrc23
-rw-r--r--zsh/.zshrc.local22
3 files changed, 24 insertions, 23 deletions
diff --git a/zsh/.zprofile b/zsh/.zprofile
index 65f92a6..f64674a 100644
--- a/zsh/.zprofile
+++ b/zsh/.zprofile
@@ -1,4 +1,4 @@
-# [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
+[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx
diff --git a/zsh/.zshrc b/zsh/.zshrc
new file mode 100644
index 0000000..ec92298
--- /dev/null
+++ b/zsh/.zshrc
@@ -0,0 +1,23 @@
+# Base16 Shell
+#BASE16_SCHEME="thewildhunt"
+#BASE16_SHELL="$HOME/.theme/base16-$BASE16_SCHEME.dark.sh"
+#[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
+
+PATH="$HOME/.local/bin:$PATH"
+#PATH="`ruby -e 'print Gem.user_dir'`/bin:$PATH"
+PATH="/opt/android-sdk/platform-tools:$PATH"
+#source ~/.profile
+
+# take
+function take() {
+ mkdir -p $1
+ cd $1
+}
+
+function y() {
+ cd ~/music
+ youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 $1
+}
+
+#eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) ; export GPG_AGENT_INFO SSH_AUTH_SOCK
+
diff --git a/zsh/.zshrc.local b/zsh/.zshrc.local
deleted file mode 100644
index 11ce4cc..0000000
--- a/zsh/.zshrc.local
+++ /dev/null
@@ -1,22 +0,0 @@
-# Base16 Shell
-BASE16_SCHEME="thewildhunt"
-BASE16_SHELL="$HOME/.theme/base16-$BASE16_SCHEME.dark.sh"
-[[ -s $BASE16_SHELL ]] && . $BASE16_SHELL
-
-PATH="$HOME/.local/bin:$PATH"
-PATH="`ruby -e 'print Gem.user_dir'`/bin:$PATH"
-PATH="/opt/android-sdk/platform-tools:$PATH"
-
-# take
-function take() {
- mkdir -p $1
- cd $1
-}
-
-function y() {
- cd ~/music
- youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 $1
-}
-
-eval $(/usr/bin/gnome-keyring-daemon --start --components=gpg,pkcs11,secrets,ssh) ; export GPG_AGENT_INFO SSH_AUTH_SOCK
-