summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.zsh_aliases5
-rw-r--r--.zsh_taskwarrior2
-rw-r--r--.zsh_zinit30
-rw-r--r--.zshrc19
4 files changed, 49 insertions, 7 deletions
diff --git a/.zsh_aliases b/.zsh_aliases
index 73bbead..e353f7d 100644
--- a/.zsh_aliases
+++ b/.zsh_aliases
@@ -52,6 +52,11 @@ alias dreamdiary='vim ~/Data/henksfiles/workinprogress/Dokumente/diary/dreams_$(
alias positivediary='vim ~/Data/henksfiles/workinprogress/Dokumente/diary/positive_$(date +%F).otl'
alias dramalog='e Data/henksfiles/workinprogress/Dokumente/Beziehung/dramalog.otl'
+#alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+function alert() {
+ notify-send --urgency=low -i ${(%):-%(?.terminal.error)} ${history[$HISTCMD]%[;&|][[:space:]]##alert}
+}
+
alias datesortimages='exiftool "-Directory<DateTimeOriginal" -d 00_test_sorted/%Y/%m/%d -r'
alias ta='task'
diff --git a/.zsh_taskwarrior b/.zsh_taskwarrior
index c579511..ea9104e 100644
--- a/.zsh_taskwarrior
+++ b/.zsh_taskwarrior
@@ -31,4 +31,4 @@ autoload colors && colors
# zstyle ':completion:*:*:task:*:values' list-colors "=(#b) #([^-]#)*=$color[cyan]=$color[bold];$color[red]"
# zstyle ':completion:*:*:task:*:commands' list-colors "=(#b) #([^-]#)*=$color[cyan]=$color[yellow]"
-### END task auto-completion ### \ No newline at end of file
+### END task auto-completion ###
diff --git a/.zsh_zinit b/.zsh_zinit
new file mode 100644
index 0000000..a4bdd1d
--- /dev/null
+++ b/.zsh_zinit
@@ -0,0 +1,30 @@
+source ~/Data/public/software/zinit/zinit.zsh
+
+zinit ice wait'!0'
+zinit load 'https://github.com/willghatch/zsh-saneopt'
+
+zinit ice wait'!0'
+zinit load 'https://github.com/joel-porquet/zsh-dircolors-solarized'
+
+# zinit load 'https://github.com/MikeDacre/tmux-zsh-vim-titles'
+
+# zinit ice wait'!0'
+zinit load 'https://github.com/nojhan/liquidprompt'
+
+zinit ice wait'!0'
+zinit load 'https://github.com/laurenkt/zsh-vimto'
+
+zinit ice wait'!0'
+zinit load 'https://github.com/MichaelAquilina/zsh-you-should-use'
+
+# zinit load 'https://github.com/desyncr/auto-ls'
+
+zinit ice wait'!0'
+zinit load 'https://github.com/zsh-users/zsh-completions'
+
+zinit ice wait'!0'
+zinit load "https://github.com/greymd/tmux-xpanes"
+
+zinit ice wait'!0'
+zinit load 'https://github.com/zsh-users/zsh-syntax-highlighting'
+
diff --git a/.zshrc b/.zshrc
index badf71c..afa4948 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,16 +1,17 @@
-source /usr/share/zsh-antigen/antigen.zsh
-antigen init ~/.zsh_antigen
+# zmodload zsh/zprof
+
+source ~/.zsh_zinit
source /usr/share/autojump/autojump.sh
autoload -Uz vcs_info
+autoload -Uz edit-command-line
-source ~/.zsh_comprc
source ~/.zsh_taskwarrior
source ~/.zsh_functions
source ~/.zsh_functions_media
-source ~/.zsh_functions_taskwarrior
+#source ~/.zsh_functions_taskwarrior
source ~/.zsh_aliases
source ~/.zsh_local
@@ -20,7 +21,7 @@ source ~/.env_*
#zle -N zle-line-init
#zle -N zle-keymap-select
-#zle -N edit-command-line
+zle -N edit-command-line
export HISTFILE=~/.zsh_history
export HISTSIZE=1000000000
@@ -84,8 +85,14 @@ export YSU_MODE=ALL
export tzvt_set_tmux_window_status=true
export PATH=${PATH}:/usr/local/sbin:/sbin:/usr/sbin
-#bindkey -v
+
+bindkey -M vicmd '^X^E' edit-command-line
+bindkey -M viins '^X^E' edit-command-line
+
#task awaiting
+source ~/.zsh_comprc
+
cat ~/.motd
+# zprof