From da36fbfc3a4b872e2b7ee6e87beef2422e9c99ce Mon Sep 17 00:00:00 2001 From: hanez Date: Wed, 23 Jul 2025 00:14:57 +0200 Subject: [PATCH] zsh --- .zsh/exports.sh | 23 +++++++ .zsh/functions.d/aliases.sh | 30 +++++++++ .zsh/oh-my-zsh.sh | 56 +++++++++++++++ .zshrc | 131 +++++------------------------------- 4 files changed, 126 insertions(+), 114 deletions(-) create mode 100644 .zsh/exports.sh create mode 100644 .zsh/functions.d/aliases.sh create mode 100644 .zsh/oh-my-zsh.sh diff --git a/.zsh/exports.sh b/.zsh/exports.sh new file mode 100644 index 00000000..db13912e --- /dev/null +++ b/.zsh/exports.sh @@ -0,0 +1,23 @@ +# Java Stuff +#export JAVA_HOME=/usr/lib/jvm/java-8-openjdk + +# Android / Kivy Development Stuff +export ANDROID_HOME=$HOME/android/sdk +export ANDROIDSDK="$HOME/android/sdk" +export ANDROID_SDK_ROOT="$HOME/android/sdk" +#export ANDROIDNDK="/opt/android-ndk" +#export ANDROIDAPI="27" +#export ANDROIDNDKVER="r16b" +export CHROME_EXECUTABLE=/usr/bin/google-chrome-stable + +# Export the $EDITOR and $TERMINAL +export BROWSER=/usr/bin/firefox +export EDITOR=/usr/bin/vim +export TERMINAL='/usr/bin/uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange -fa "Source Code Pro" -fs 14' + +# Fix to make JAVA applications behave more friendly in awesome. Still many JAVA apps +# suck in awesome. PyCharm works perfect, Arduino does not! +export _JAVA_AWT_WM_NONREPARENTING=1 + +export XDG_RUNTIME_DIR=/run/user/1000 + diff --git a/.zsh/functions.d/aliases.sh b/.zsh/functions.d/aliases.sh new file mode 100644 index 00000000..49da586d --- /dev/null +++ b/.zsh/functions.d/aliases.sh @@ -0,0 +1,30 @@ +alias ..='cd ..' +alias ...='cd ../..' +alias ....='cd ../../..' +alias .....='cd ../../../..' + +alias c='clear' + +alias gita='git add' +alias gitc='git commit' +alias gitd='git diff' +alias gitp='git push' +alias gitpp='git pull' +alias gits='git status' + +alias kubectl="minikube kubectl --" + +alias l='ls --color' +alias ls='ls --color' +alias lsa='ls -a --color' +alias ll='ls --color -l' +alias lla='ls -la --color' +alias llh='ls -lh --color' +alias llah='ls -lah --color' + +alias n='nnn -diUxe' + +alias vi=vim + +alias xterm=$TERMINAL + diff --git a/.zsh/oh-my-zsh.sh b/.zsh/oh-my-zsh.sh new file mode 100644 index 00000000..ea157b31 --- /dev/null +++ b/.zsh/oh-my-zsh.sh @@ -0,0 +1,56 @@ +# Path to the oh-my-zsh installation. +export ZSH=~/.zsh/oh-my-zsh + +# Set name of the theme to load. +# Look in ~/.oh-my-zsh/themes/ +# Optionally, if you set this to "random", it'll load a random theme each +# time that oh-my-zsh is loaded. +ZSH_THEME="hanez" + +# Uncomment the following line to use case-sensitive completion. +# CASE_SENSITIVE="true" + +# Uncomment the following line to use hyphen-insensitive completion. Case +# sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + +# Uncomment the following line to disable bi-weekly auto-update checks. +DISABLE_AUTO_UPDATE="true" + +# Uncomment the following line to change how often to auto-update (in days). +# export UPDATE_ZSH_DAYS=13 + +# Uncomment the following line to disable colors in ls. +# DISABLE_LS_COLORS="true" + +# Uncomment the following line to disable auto-setting terminal title. +# DISABLE_AUTO_TITLE="true" + +# Uncomment the following line to enable command auto-correction. +# ENABLE_CORRECTION="true" + +# Uncomment the following line to display red dots whilst waiting for completion. +# COMPLETION_WAITING_DOTS="true" + +# Uncomment the following line if you want to disable marking untracked files +# under VCS as dirty. This makes repository status check for large repositories +# much, much faster. +# DISABLE_UNTRACKED_FILES_DIRTY="true" + +# Uncomment the following line if you want to change the command execution time +# stamp shown in the history command output. +# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# HIST_STAMPS="mm/dd/yyyy" + +# Would you like to use another custom folder than $ZSH/custom? +# ZSH_CUSTOM=/path/to/new-custom-folder + +# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ +# Example format: plugins=(rails git textmate ruby lighthouse) +# Add wisely, as too many plugins slow down shell startup. +plugins=(colored-man-pages) + +# Load oh-my-zsh stuff +source $ZSH/oh-my-zsh.sh + diff --git a/.zshrc b/.zshrc index a20834ab..65f956ca 100644 --- a/.zshrc +++ b/.zshrc @@ -1,117 +1,19 @@ -# Source some global/public stuff -source ~/.env - -# Source some private stuff -source ~/.penv - -# Java Stuff -#export JAVA_HOME=/usr/lib/jvm/java-8-openjdk - -# Android / Kivy Development Stuff -export ANDROID_HOME=$HOME/android/sdk -export ANDROIDSDK="$HOME/android/sdk" -export ANDROID_SDK_ROOT="$HOME/android/sdk" -#export ANDROIDNDK="/opt/android-ndk" -#export ANDROIDAPI="27" -#export ANDROIDNDKVER="r16b" -export CHROME_EXECUTABLE=/usr/bin/google-chrome-stable - - -# Export the $EDITOR and $TERMINAL -export BROWSER=/usr/bin/firefox -export EDITOR=/usr/bin/vim -export TERMINAL='/usr/bin/uxterm -bg black -fg grey -sb -leftbar -si -bc -cr orange -fa "Source Code Pro" -fs 14' - -# Fix to make JAVA applications behave more friendly in awesome. Still many JAVA apps -# suck in awesome. PyCharm works perfect, Arduino does not! -export _JAVA_AWT_WM_NONREPARENTING=1 - -export XDG_RUNTIME_DIR=/run/user/1000 - -# Path to your oh-my-zsh installation. -export ZSH=~/.zsh/oh-my-zsh - -# Set name of the theme to load. -# Look in ~/.oh-my-zsh/themes/ -# Optionally, if you set this to "random", it'll load a random theme each -# time that oh-my-zsh is loaded. -ZSH_THEME="hanez" - -# Uncomment the following line to use case-sensitive completion. -# CASE_SENSITIVE="true" - -# Uncomment the following line to use hyphen-insensitive completion. Case -# sensitive completion must be off. _ and - will be interchangeable. -# HYPHEN_INSENSITIVE="true" - -# Uncomment the following line to disable bi-weekly auto-update checks. -DISABLE_AUTO_UPDATE="true" - -# Uncomment the following line to change how often to auto-update (in days). -# export UPDATE_ZSH_DAYS=13 - -# Uncomment the following line to disable colors in ls. -# DISABLE_LS_COLORS="true" - -# Uncomment the following line to disable auto-setting terminal title. -# DISABLE_AUTO_TITLE="true" - -# Uncomment the following line to enable command auto-correction. -# ENABLE_CORRECTION="true" - -# Uncomment the following line to display red dots whilst waiting for completion. -# COMPLETION_WAITING_DOTS="true" - -# Uncomment the following line if you want to disable marking untracked files -# under VCS as dirty. This makes repository status check for large repositories -# much, much faster. -# DISABLE_UNTRACKED_FILES_DIRTY="true" - -# Uncomment the following line if you want to change the command execution time -# stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" -# HIST_STAMPS="mm/dd/yyyy" - -# Would you like to use another custom folder than $ZSH/custom? -# ZSH_CUSTOM=/path/to/new-custom-folder - -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) -# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ -# Example format: plugins=(rails git textmate ruby lighthouse) -# Add wisely, as too many plugins slow down shell startup. -plugins=(colored-man-pages) - # History settings HISTSIZE=100000 SAVEHIST=100000 HISTFILE=~/.zsh_history -# Load oh-my-zsh stuff -source $ZSH/oh-my-zsh.sh +# Source some global/public stuff +source ~/.env -# Some aliases -alias ..='cd ..' -alias ...='cd ../..' -alias ....='cd ../../..' -alias .....='cd ../../../..' -alias c='clear' -alias gita='git add' -alias gitc='git commit' -alias gitd='git diff' -alias gitp='git push' -alias gitpp='git pull' -alias gits='git status' -alias kubectl="minikube kubectl --" -alias l='ls --color' -alias ls='ls --color' -alias lsa='ls -a --color' -alias ll='ls --color -l' -alias lla='ls -la --color' -alias llh='ls -lh --color' -alias llah='ls -lah --color' -alias n='nnn -diUxe' -alias vi=vim -alias xterm=$TERMINAL +# Source some private stuff or custom things that are different on my systems +source ~/.penv + +# Do some exports! +source ~/.zsh/exports.sh + +# Load Oh-my-Zsh +source ~/.zsh/oh-my-zsh.sh # I use xterm and this sets a nice title with hostname and cwd in it. case $TERM in @@ -129,14 +31,15 @@ case $TERM in ;; esac -if [ -f /usr/bin/shellpic ]; then - if [ -f ~/images/tux.png ]; then - /usr/bin/shellpic --shell24 --scale-x 50 ~/images/tux.png - fi -fi +# Obsolete? +#if [ -f /usr/bin/shellpic ]; then +# if [ -f ~/images/tux.png ]; then +# /usr/bin/shellpic --shell24 --scale-x 50 ~/images/tux.png +# fi +#fi +# Obsolete? #source /usr/share/zsh-theme-powerlevel10k/powerlevel10k.zsh-theme - # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. #[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh