summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config/openbox/autostart6
-rw-r--r--zshrc11
2 files changed, 9 insertions, 8 deletions
diff --git a/config/openbox/autostart b/config/openbox/autostart
index f61ee76..c7f63b7 100644
--- a/config/openbox/autostart
+++ b/config/openbox/autostart
@@ -10,15 +10,13 @@ xcape -e 'Super_L=Control_L|Shift_L|Alt_L|Super_L|D' &
spacefm --desktop &
xscreensaver -no-splash &
nm-applet &
-$CONFDIR/run-cortile
+$CONFDIR/run-cortile &
+$CONFDIR/ibus-wait &
# fuck your stupid telemetry
cd $HOME/.config/openbox
-xfce4-terminal -x "$CONFDIR/ibus-wait"
-echo "starting ibus"
-$CONFDIR/ibus-wait &
./killniggers.sh &
cd ~
diff --git a/zshrc b/zshrc
index 65e29e3..1cb0850 100644
--- a/zshrc
+++ b/zshrc
@@ -1,7 +1,10 @@
source ~/.lscolors
source ~/.profile
+source <(fzf --zsh)
export PATH=$HOME/bin:/usr/local/bin:$HOME/.cargo/bin:$PATH
+fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
+
export ZSH="$HOME/.oh-my-zsh"
ZSH_THEME="evan"
HYPHEN_INSENSITIVE="true"
@@ -10,13 +13,16 @@ HYPHEN_INSENSITIVE="true"
# zstyle ':omz:update' mode disabled # disable automatic updates
# zstyle ':omz:update' mode auto # update automatically without asking
# zstyle ':omz:update' mode reminder # just remind me to update when it's time
-
plugins=(
git
zsh-syntax-highlighting
zsh-autosuggestions
+ zsh-completions
+ fzf-tab
)
+source $ZSH/oh-my-zsh.sh
+
git_prompt() {
if git rev-parse --git-dir > /dev/null 2>&1; then
local branch=$(git symbolic-ref --short HEAD 2>/dev/null)
@@ -38,13 +44,10 @@ git_prompt() {
setopt PROMPT_SUBST
-source $ZSH/oh-my-zsh.sh
export PS1=$'%m :: %2~$(git_prompt) %B»%b '
-
# User configuration
autoload -Uz compinit && compinit
-autoload -Uz bashcompinit && bashcompinit
alias vim=nvim
alias vi=nvim
alias mpa="mpv --no-video"