ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-03-14 07:04:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

zsh: Update main and lakka zshrc

Browse Source
This commit is contained in:
Ismo Vuorinen
2023-02-27 02:04:41 +02:00
parent b55c1a17ba
commit 66de4b3323
2 changed files with 33 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
host-lakka/zshrc
View File

@@ -1,33 +1,44 @@
PATH=$HOME/.local/bin:$HOME/bin:$HOME/.gem/bin:$HOME/.rvm/bin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH # Lakka zsh configuration.
#
# shellcheck shell=bash
# Explicitely set XDG Folders
export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config"
export XDG_STATE_HOME="$HOME/.local/state"
export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
export PATH="$XDG_BIN_HOME:$HOME/bin:$HOME/.gem/bin:$HOME/.rvm/bin:/usr/local/bin:/usr/sbin:/usr/bin:$PATH"
export LC_ALL=fi_FI.utf8 export LC_ALL=fi_FI.utf8
source $HOME/.local/bin/antigen [[ -f "$XDG_BIN_HOME/antigen.zsh" ]] && source "$XDG_BIN_HOME/antigen.zsh"
antigen use oh-my-zsh # If antigen was loadeded
if command -v antigen &> /dev/null; then
antigen use oh-my-zsh
antigen bundle git hash git 2>/dev/null && antigen bundle git
antigen bundle php hash php 2>/dev/null && antigen bundle php
# antigen bundle rvm
antigen bundle autojump
antigen bundle command-not-found
antigen bundle jreese/zsh-titles
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-completions
antigen bundle unixorn/rvm-plugin
antigen bundle unixorn/autoupdate-antigen.zshplugin
antigen theme oskarkrawczyk/honukai-iterm-zsh honukai antigen bundle autojump
antigen bundle command-not-found
antigen bundle jreese/zsh-titles
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-completions
antigen bundle unixorn/rvm-plugin
antigen bundle unixorn/autoupdate-antigen.zshplugin
antigen apply antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
antigen apply
fi
alias t='tail -f' alias t='tail -f'
alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state' alias logrotate='/usr/sbin/logrotate -s $HOME/logs/state'
alias dn='du -chd1' alias dn='du -chd1'
alias nano='nano -wS -$' alias nano='nano -wS -$'
alias cat=bat
alias gpg=gpg2 alias gpg=gpg2
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting export PATH="$PATH:$HOME/.rvm/bin" # Add RVM to PATH for scripting
[[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" ]] # Load RVM into a shell session *as a function* [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" ]] # Load RVM into a shell session *as a function*
. "/home/users/viir/.acme.sh/acme.sh.env" . "$HOME/.acme.sh/acme.sh.env"

12
zshrc
View File

@@ -15,6 +15,7 @@ export HOMEBREW_NO_ENV_HINTS=1
export XDG_DATA_HOME="$HOME/.local/share" export XDG_DATA_HOME="$HOME/.local/share"
export XDG_CONFIG_HOME="$HOME/.config" export XDG_CONFIG_HOME="$HOME/.config"
export XDG_STATE_HOME="$HOME/.local/state" export XDG_STATE_HOME="$HOME/.local/state"
export XDG_BIN_HOME="$HOME/.local/bin" # this one is custom
if [ command -v brew &> /dev/null ]; then if [ command -v brew &> /dev/null ]; then
BREW_BIN=$(brew --prefix)/bin BREW_BIN=$(brew --prefix)/bin
@@ -40,9 +41,8 @@ if command -v nvim &> /dev/null; then
export EDITOR="nvim" export EDITOR="nvim"
fi fi
LOCAL_BIN="$HOME/.local/bin"
COMPOSER_DIR="$HOME/.composer/vendor/bin" COMPOSER_DIR="$HOME/.composer/vendor/bin"
export PATH="$LOCAL_BIN:$COMPOSER_DIR:$PATH" export PATH="$XDG_BIN_HOME:$COMPOSER_DIR:$PATH"
export NVM_DIR="$HOME/.nvm" export NVM_DIR="$HOME/.nvm"
export NVM_LAZY_LOAD=true export NVM_LAZY_LOAD=true
@@ -68,14 +68,12 @@ x-load-configs
ssh-add -A 2>/dev/null; ssh-add -A 2>/dev/null;
# Try to load antigen, if present # Try to load antigen, if present
[[ -f "$HOME/.local/bin/antigen.zsh" ]] && source "$HOME/.local/bin/antigen.zsh" [[ -f "$XDG_BIN_HOME/antigen.zsh" ]] && source "$XDG_BIN_HOME/antigen.zsh"
# antigen is present # antigen is present
if command -v antigen &> /dev/null; then if command -v antigen &> /dev/null; then
antigen use oh-my-zsh antigen use oh-my-zsh
# antigen theme oskarkrawczyk/honukai-iterm-zsh honukai
antigen bundle ssh-agent antigen bundle ssh-agent
antigen bundle colored-man-pages antigen bundle colored-man-pages
antigen bundle jreese/zsh-titles antigen bundle jreese/zsh-titles
@@ -84,16 +82,14 @@ if command -v antigen &> /dev/null; then
antigen bundle MichaelAquilina/zsh-you-should-use antigen bundle MichaelAquilina/zsh-you-should-use
antigen bundle unixorn/autoupdate-antigen.zshplugin antigen bundle unixorn/autoupdate-antigen.zshplugin
antigen bundle Sparragus/zsh-auto-nvm-use antigen bundle Sparragus/zsh-auto-nvm-use
# antigen bundle git-auto-fetch
hash php 2>/dev/null && antigen bundle php hash php 2>/dev/null && antigen bundle php
hash nvm 2>/dev/null && antigen bundle nvm hash nvm 2>/dev/null && antigen bundle nvm
hash docker 2>/dev/null && antigen bundle docker hash docker 2>/dev/null && antigen bundle docker
# hash ruby 2>/dev/null && antigen bundle ruby # hash ruby 2>/dev/null && antigen bundle ruby
# hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv hash python 2>/dev/null && antigen bundle MichaelAquilina/zsh-autoswitch-virtualenv
hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin hash jq 2>/dev/null && antigen bundle reegnz/jq-zsh-plugin
hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin hash docker-compose 2>/dev/null && antigen bundle sroze/docker-compose-zsh-plugin
# antigen bundle voronkovich/phpcs.plugin.zsh
# Platform dependant bundles # Platform dependant bundles
if [[ $(uname) == 'Linux' ]]; then if [[ $(uname) == 'Linux' ]]; then