Major Update to ZSH config, also pruning Bash
This commit is contained in:
parent
d6ad4a9392
commit
8c4fd15de1
6 changed files with 42 additions and 140 deletions
|
@ -1,10 +0,0 @@
|
|||
# Load login settings and environment variables
|
||||
if [[ -f ~/.profile ]]; then
|
||||
source ~/.profile
|
||||
fi
|
||||
|
||||
# Load interactive settings
|
||||
if [[ -f ~/.bashrc ]]; then
|
||||
source ~/.bashrc
|
||||
fi
|
||||
|
101
.bashrc
101
.bashrc
|
@ -1,101 +0,0 @@
|
|||
##################################
|
||||
## Check for Interactivy Shell ##
|
||||
##################################
|
||||
case $- in
|
||||
*i*) ;;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
##################################
|
||||
## OSTree System ##
|
||||
##################################
|
||||
if mount | grep -q 'ostree'; then
|
||||
export HOME="/var/home/$(whoami)"
|
||||
is_ostree=1
|
||||
alias docker=podman
|
||||
fi
|
||||
|
||||
##################################
|
||||
## Toolbox ##
|
||||
##################################
|
||||
if [[ -e "/run/.toolboxenv" ]]; then
|
||||
export TOOLBX_TOOLBOX_NAME=$(grep '^name=' /run/.containerenv | cut -d '=' -f 2 | tr -d '"')
|
||||
fi
|
||||
|
||||
##################################
|
||||
## Oh My Bash ##
|
||||
##################################
|
||||
export OSH="$HOME/.config/oh-my-bash"
|
||||
OSH_CUSTOM="$HOME/.config/oh-my-bash-custom"
|
||||
OSH_THEME="agnoster-modded" #powerbash10k, lambda
|
||||
DEFAULT_USER=$(whoami)
|
||||
ENABLE_CORRECTION=true
|
||||
OMB_USE_SUDO=true
|
||||
|
||||
completions=(
|
||||
git
|
||||
composer
|
||||
ssh
|
||||
)
|
||||
|
||||
aliases=(
|
||||
general
|
||||
)
|
||||
|
||||
plugins=(
|
||||
git
|
||||
bashmarks
|
||||
)
|
||||
source "$OSH"/oh-my-bash.sh
|
||||
|
||||
##################################
|
||||
## Application Envs ##
|
||||
##################################
|
||||
export PATH=$PATH:"$HOME/.local/bin"
|
||||
|
||||
# NPM
|
||||
export npm_config_cache="$HOME/.cache/npm"
|
||||
export npm_config_prefix="$HOME/.local/share/npm"
|
||||
export npm_config_userconfig="$HOME/.config/npmrc"
|
||||
|
||||
# Volta
|
||||
export VOLTA_HOME="$HOME/.local/share/volta"
|
||||
export PATH="$VOLTA_HOME/bin:$PATH"
|
||||
|
||||
# Podman as Docker on Immutable Distros
|
||||
if [[ -n "$is_ostree" ]]; then
|
||||
export DOCKER_HOST=unix:///run/user/1000/podman/podman.sock
|
||||
fi
|
||||
|
||||
# Go
|
||||
export GOPATH=~/.local/share/go
|
||||
export GOBIN=~/.local/bin/go
|
||||
|
||||
# ROCM
|
||||
export HSA_OVERRIDE_GFX_VERSION=10.3.0 # RX 6650 XT
|
||||
|
||||
# Just
|
||||
export JUST_UNSTABLE=1
|
||||
|
||||
##################################
|
||||
## Git ##
|
||||
##################################
|
||||
case "$HOSTNAME" in
|
||||
Snoweuph-Kinoite)key=A494330694B208EF;;
|
||||
fedorabook-pro)key=CFB8E8CF1F0BA9FA2A1840CA0021ADF278B2F49B;;
|
||||
esac
|
||||
alias git="git -c user.signingKey='$key'"
|
||||
|
||||
##################################
|
||||
## Aliases ##
|
||||
##################################
|
||||
alias edit-nvim-conf="nvim ~/.config/nvim"
|
||||
alias edit-bash-conf="nvim ~/.bashrc"
|
||||
alias todo="nvim ~/Documents/Notes/Todo.md"
|
||||
|
||||
alias nano="nvim"
|
||||
alias neofetch="fastfetch"
|
||||
|
||||
|
||||
# Added by app (https://github.com/hkdb/app) installation
|
||||
source /home/snoweuph/.config/app/.app_profile
|
|
@ -4,6 +4,7 @@ switch-to-activity-10eae782-cee3-42c7-b63f-6cfa29a432f4=none,none,Switch to acti
|
|||
switch-to-activity-c9029e69-ec79-4399-8d82-a2b36f65b1d5=none,none,Switch to activity "Default"
|
||||
|
||||
[KDE Keyboard Layout Switcher]
|
||||
Switch keyboard layout to English (UK, extended, Windows)=none,none,Switch keyboard layout to English (UK\\, extended\\, Windows)
|
||||
Switch to Last-Used Keyboard Layout=Meta+Alt+L,Meta+Alt+L,Switch to Last-Used Keyboard Layout
|
||||
Switch to Next Keyboard Layout=Meta+Alt+K,Meta+Alt+K,Switch to Next Keyboard Layout
|
||||
_k_friendly_name=Keyboard Layout Switcher
|
||||
|
@ -32,7 +33,7 @@ mute=Volume Mute,Volume Mute,Mute
|
|||
[ksmserver]
|
||||
Halt Without Confirmation=none,,Shut Down Without Confirmation
|
||||
Lock Session=Screensaver,Meta+L\tScreensaver,Lock Session
|
||||
Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Prompt
|
||||
Log Out=Ctrl+Alt+Del,Ctrl+Alt+Del,Show Logout Screen
|
||||
Log Out Without Confirmation=none,,Log Out Without Confirmation
|
||||
LogOut=none,,Log Out
|
||||
Reboot=none,,Reboot
|
||||
|
@ -110,7 +111,7 @@ KrohnkiteToggleFloat=Meta+F,none,Krohnkite: Toggle Float
|
|||
KrohnkiteTreeColumnLayout=none,none,Krohnkite: Tree Column Layout
|
||||
KrohnkitegrowWidth=none,none,Krohnkite: Grow Width
|
||||
Move Tablet to Next Output=none,none,Move the tablet to the next output
|
||||
MoveMouseToCenter=none,Meta+F6,Move Mouse to Center
|
||||
MoveMouseToCenter=none,Meta+F6,Move Mouse to Centre
|
||||
MoveMouseToFocus=none,Meta+F5,Move Mouse to Focus
|
||||
MoveZoomDown=none,none,Move Zoomed Area Downwards
|
||||
MoveZoomLeft=none,none,Move Zoomed Area to Left
|
||||
|
@ -201,12 +202,12 @@ Window Fullscreen=none,,Make Window Fullscreen
|
|||
Window Grow Horizontal=none,,Expand Window Horizontally
|
||||
Window Grow Vertical=none,,Expand Window Vertically
|
||||
Window Lower=none,,Lower Window
|
||||
Window Maximize=none,Meta+PgUp,Maximize Window
|
||||
Window Maximize Horizontal=none,,Maximize Window Horizontally
|
||||
Window Maximize Vertical=none,,Maximize Window Vertically
|
||||
Window Minimize=none,Meta+PgDown,Minimize Window
|
||||
Window Maximize=none,Meta+PgUp,Maximise Window
|
||||
Window Maximize Horizontal=none,,Maximise Window Horizontally
|
||||
Window Maximize Vertical=none,,Maximise Window Vertically
|
||||
Window Minimize=none,Meta+PgDown,Minimise Window
|
||||
Window Move=none,,Move Window
|
||||
Window Move Center=none,,Move Window to the Center
|
||||
Window Move Center=none,,Move Window to the Centre
|
||||
Window No Border=none,,Toggle Window Titlebar and Frame
|
||||
Window On All Desktops=none,,Keep Window on All Desktops
|
||||
Window One Desktop Down=none,Meta+Ctrl+Shift+Down,Window One Desktop Down
|
||||
|
@ -296,7 +297,7 @@ PowerOff=Power Off,Power Off,Power Off
|
|||
Sleep=Sleep,Sleep,Suspend
|
||||
Toggle Keyboard Backlight=Keyboard Light On/Off,Keyboard Light On/Off,Toggle Keyboard Backlight
|
||||
Turn Off Screen=none,none,Turn Off Screen
|
||||
_k_friendly_name=KDE Power Management System
|
||||
_k_friendly_name=Power Management
|
||||
powerProfile=Battery\tMeta+B,Battery\tMeta+B,Switch Power Profile
|
||||
|
||||
[plasmashell]
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit d594d6f447b0a3fba0d70317fb44e0eccda369fe
|
||||
Subproject commit 1c7e44a33846fef60ebe8fe4b3569492ecede897
|
|
@ -11,8 +11,8 @@
|
|||
autoCorrect = prompt
|
||||
|
||||
[core]
|
||||
editor = nvim
|
||||
#pager = /usr/share/git-core/contrib/diff-highlight | less
|
||||
editor = nvim
|
||||
pager = delta
|
||||
commentChar = ";"
|
||||
|
||||
[diff]
|
||||
|
@ -27,6 +27,3 @@
|
|||
fl = push --force-with-lease
|
||||
prune-branches = "!git fetch -p && git branch -vv | grep ': gone]' | awk '{print $1}' | xargs -r git branch -d"
|
||||
show-last-commit = diff HEAD^
|
||||
|
||||
[interactive]
|
||||
diffFilter = /usr/share/git-core/contrib/diff-highlight
|
||||
|
|
45
.zshrc
45
.zshrc
|
@ -5,18 +5,11 @@ ZINIT_HOME="${XDG_DATA_HOME:-${HOME}/.local/share}/zinit/zinit.git"
|
|||
[ ! -d $ZINIT_HOME/.git ] && git clone https://github.com/zdharma-continuum/zinit.git "$ZINIT_HOME"
|
||||
source "${ZINIT_HOME}/zinit.zsh"
|
||||
|
||||
# Plugins
|
||||
# Core Plugins
|
||||
zinit snippet OMZP::command-not-found
|
||||
zinit snippet OMZP::colored-man-pages
|
||||
zinit light zsh-users/zsh-autosuggestions
|
||||
zinit light zdharma-continuum/fast-syntax-highlighting
|
||||
zinit light zsh-users/zsh-completions
|
||||
zinit snippet OMZP::git
|
||||
|
||||
# Comp
|
||||
zinit cdclear -q
|
||||
autoload -Uz compinit
|
||||
compinit
|
||||
zinit cdreplay -q
|
||||
zinit cdlist
|
||||
|
||||
# Oh My Posh
|
||||
#########################################################
|
||||
|
@ -41,16 +34,22 @@ bindkey '\e[1;5C' forward-word
|
|||
bindkey '\e[1;5D' backward-word
|
||||
WORDCHARS="_-" # Define These Characters as Part of "Words"
|
||||
|
||||
# Git
|
||||
# Application Envs
|
||||
#########################################################
|
||||
|
||||
# Git
|
||||
zinit snippet OMZP::git
|
||||
|
||||
case "$HOSTNAME" in
|
||||
snoweuph-desktop)key=31EDB2BA02AD438859B996654014606F050AEF63;;
|
||||
fedorabook-pro)key=CFB8E8CF1F0BA9FA2A1840CA0021ADF278B2F49B;;
|
||||
esac
|
||||
alias git="git -c user.signingKey='$key'"
|
||||
|
||||
# Application Envs
|
||||
#########################################################
|
||||
# Containerization
|
||||
zinit snippet OMZP::docker-compose
|
||||
zinit snippet OMZP::podman
|
||||
zinit snippet OMZP::toolbox
|
||||
|
||||
# NPM
|
||||
export npm_config_cache="$HOME/.cache/npm"
|
||||
|
@ -59,25 +58,41 @@ export npm_config_userconfig="$HOME/.config/npmrc"
|
|||
|
||||
# Volta
|
||||
export VOLTA_HOME="$HOME/.local/share/volta"
|
||||
zinit snippet OMZP::volta
|
||||
|
||||
# Go
|
||||
export GOPATH=~/.local/share/go
|
||||
export GOBIN=$GOPATH/bin
|
||||
|
||||
# Rust
|
||||
export CARGO_HOME=$HOME/.local/share/cargo
|
||||
export RUSTUP_HOME=$HOME/.local/share/rustup
|
||||
zinit snippet OMZP::rust
|
||||
|
||||
# Php
|
||||
zinit snippet OMZP::composer
|
||||
zinit snippet OMZP::symfony6
|
||||
|
||||
# ROCM
|
||||
export HSA_OVERRIDE_GFX_VERSION=10.3.0 # RX 6650 XT
|
||||
|
||||
# Just
|
||||
export JUST_UNSTABLE=1
|
||||
|
||||
# Nix
|
||||
if [ ! -e $HOME/.nix-profile/etc/profile.d/nix.sh ]; then
|
||||
curl -L https://nixos.org/nix/install | sh
|
||||
fi
|
||||
. $HOME/.nix-profile/etc/profile.d/nix.sh
|
||||
|
||||
# PATH
|
||||
export PATH=$PATH:$VOLTA_HOME/bin:$GOBIN
|
||||
export PATH=$PATH:$VOLTA_HOME/bin:$GOBIN:$CARGO_HOME/bin
|
||||
|
||||
# Aliases
|
||||
#########################################################
|
||||
alias edit-nvim-conf="nvim ~/.config/nvim"
|
||||
alias edit-zsh-conf="nvim ~/.zshrc"
|
||||
alias todo="nvim ~/Documents/Notes/Todo.md"
|
||||
|
||||
alias hist="eval \$(cat $HISTFILE | fzf)"
|
||||
alias nano="nvim"
|
||||
alias neofetch="fastfetch"
|
||||
|
|
Loading…
Reference in a new issue