aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--config/i3/config2
-rw-r--r--config/shell/aliases (renamed from config/shell/alias)0
-rw-r--r--config/shell/funcs (renamed from config/shell/func)0
-rw-r--r--config/zsh/.zshrc (renamed from config/zsh/zshrc)6
-rw-r--r--zprofile24
6 files changed, 14 insertions, 20 deletions
diff --git a/README b/README
index 78e8f94..a9ad39e 100644
--- a/README
+++ b/README
@@ -76,5 +76,5 @@ fzf: fuzzy finder
Donate
------
-If you have found my setup interesting feel free to donate.
+If you found my setup interesting, feel free to donate.
https://ryo.nopwd.lol/pub/donate.html
diff --git a/config/i3/config b/config/i3/config
index 46146e2..cabb700 100644
--- a/config/i3/config
+++ b/config/i3/config
@@ -24,7 +24,7 @@ bindsym $mod+Ctrl+s --release exec scshot.sh a
exec --no-startup-id alacritty
exec --no-startup-id nm-applet
-exec --no-startup-id alacritty -n dropdown -e tmux new -s drop
+exec --no-startup-id alacritty -n dropdown
# =======================================
diff --git a/config/shell/alias b/config/shell/aliases
index 0b6287a..0b6287a 100644
--- a/config/shell/alias
+++ b/config/shell/aliases
diff --git a/config/shell/func b/config/shell/funcs
index 7788689..7788689 100644
--- a/config/shell/func
+++ b/config/shell/funcs
diff --git a/config/zsh/zshrc b/config/zsh/.zshrc
index 230a150..e9ed25f 100644
--- a/config/zsh/zshrc
+++ b/config/zsh/.zshrc
@@ -1,4 +1,4 @@
-# Ryo's zsh config
+# Ryo zsh config
# https://ryo.nopwd.lol
#
# literally Luke's config
@@ -19,8 +19,8 @@ HISTFILE="$XDG_CACHE_HOME/zsh/history"
setopt inc_append_history
# load aliases and functions if existent
-source $HOME/.config/shell/aliasrc
-source $HOME/.config/shell/funcrc
+source $HOME/.config/shell/aliases
+source $HOME/.config/shell/funcs
# basic auto/tab complete
autoload -U compinit
diff --git a/zprofile b/zprofile
index 26d6d04..c1099ad 100644
--- a/zprofile
+++ b/zprofile
@@ -1,6 +1,6 @@
#!/usr/bin/env dash
-# Ryo's zsh profile
+# Ryo zsh profile
# https://ryo.nopwd.lol
# version: alpha
#
@@ -8,20 +8,18 @@
# https://github.com/lukesmithxyz/voidrice
-# Add all directories in `~/.local/bin` to $PATH
-export PATH="$PATH:$(find ~/.local/bin -type d | paste -sd ':' -)"
-
-unsetopt PROMPT_SP 2>/dev/null
-
-# Default programs:
+# default programs:
export EDITOR="nvim"
export TERMINAL="st"
export BROWSER="firefox"
+export PAGER=less
+export MANPAGER='nvim +Man!'
-# ~/ Clean-up:
+# ~/ clean-up:
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CACHE_HOME="$HOME/.local/cache"
+export PATH=$HOME/.local/bin:$PATH
export XINITRC="$XDG_CONFIG_HOME/x11/xinitrc"
export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config"
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
@@ -37,7 +35,7 @@ export MBSYNCRC="$XDG_CONFIG_HOME/mbsync/config"
export SQLITE_HISTORY="$XDG_DATA_HOME/sqlite_history"
export NODE_PATH="$XDG_DATA_HOME/node_modules"
-# Other program settings:
+# other program settings:
export FZF_DEFAULT_OPTS="--layout=reverse --height 40%"
export LESS="R"
export LESS_TERMCAP_mb="$(printf '%b' '')"
@@ -50,15 +48,11 @@ export LESS_TERMCAP_ue="$(printf '%b' '')"
export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null"
export MOZ_USE_XINPUT2=1
export _JAVA_AWT_WM_NONREPARENTING=1
-export MANPAGER='nvim +Man!'
-export PAGER=less
export WINEDEBUG="fixme-all"
export C_INCLUDE_PATH=$HOME/.local/include
export LD_LIBRARY_PATH=$HOME/.local/lib
export LIBRARY_PATH=$HOME/.local/lib
export MANPATH=$XDG_DATA_HOME/man:
-# Run startx only in tty1
-if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" = 1 ]; then
- startx
-fi
+# run startx only in tty1
+[ "$(tty)" = "/dev/tty1" ] && startx