Merge branches 'upstream-custom' and 'zshfish' into dev
This commit is contained in:
commit
12a4ccbc13
6
.install/fish.sh
Normal file
6
.install/fish.sh
Normal file
@ -0,0 +1,6 @@
|
||||
# ------------------------------------------------------
|
||||
# install fish
|
||||
# ------------------------------------------------------
|
||||
packagesPacman=("fish");
|
||||
packagesYay=();
|
||||
source .install/install-packages.sh
|
||||
@ -14,6 +14,14 @@ _showRestoreOptions() {
|
||||
restorelist+="~/dotfiles/.bashrc "
|
||||
selectedlist+="~/dotfiles/.bashrc,"
|
||||
fi
|
||||
if [ -f ~/dotfiles/.zshrc ]; then
|
||||
restorelist+="~/dotfiles/.zshrc "
|
||||
selectedlist+="~/dotfiles/.zshrc,"
|
||||
fi
|
||||
if [ -f ~/dotfiles/.p10k.zsh ]; then
|
||||
restorelist+="~/dotfiles/.p10k.zsh "
|
||||
selectedlist+="~/dotfiles/.p10k.zsh,"
|
||||
fi
|
||||
if [ -d ~/dotfiles/.settings ]; then
|
||||
restorelist+="~/dotfiles/.settings "
|
||||
selectedlist+="~/dotfiles/.settings,"
|
||||
|
||||
19
.install/zsh.sh
Normal file
19
.install/zsh.sh
Normal file
@ -0,0 +1,19 @@
|
||||
# ------------------------------------------------------
|
||||
# install zsh and zinit
|
||||
# ------------------------------------------------------
|
||||
packagesPacman=("zsh");
|
||||
|
||||
echo "Please select the zsh plugin manager:"
|
||||
zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit")
|
||||
if [ ${zsh_manager}=="oh my zsh" ]; then
|
||||
source .install/install-packages.sh
|
||||
RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
|
||||
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
||||
git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
|
||||
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~
|
||||
else
|
||||
packagesYay=("zinit");
|
||||
source .install/install-packages.sh
|
||||
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~
|
||||
fi
|
||||
_installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~
|
||||
26
.install/zshfish.sh
Normal file
26
.install/zshfish.sh
Normal file
@ -0,0 +1,26 @@
|
||||
# ------------------------------------------------------
|
||||
# Select additional shell
|
||||
# ------------------------------------------------------
|
||||
echo -e "${GREEN}"
|
||||
figlet "Zsh Fish"
|
||||
echo -e "${NONE}"
|
||||
echo "Please select if you want to install zsh or fish."
|
||||
echo
|
||||
zshfish=$(gum choose --no-limit --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "zsh" "fish")
|
||||
|
||||
if [ -z "${zshfish}" ] ;then
|
||||
echo ":: No shell selected. Keep using bash."
|
||||
else
|
||||
echo "Please select your default shell."
|
||||
echo
|
||||
shell=$(echo "bash\n$zshfish" | gum choose --limit=1 -cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) ")
|
||||
sudo chsh -s $(which $shell) $(whoami)
|
||||
if [[ $zshfish == *"zsh"* ]]; then
|
||||
echo ":: zsh selected"
|
||||
source .install/zsh.sh
|
||||
fi
|
||||
if [[ $zshfish == *"fish"* ]]; then
|
||||
echo ":: fish selected"
|
||||
source .install/fish.sh
|
||||
fi
|
||||
fi
|
||||
128
.zshrc
128
.zshrc
@ -1,128 +0,0 @@
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
# If you come from bash you might have to change your $PATH.
|
||||
export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
# Set name of the theme to load --- if set to "random", it will
|
||||
# load a random theme each time oh-my-zsh is loaded, in which case,
|
||||
# to know which specific one was loaded, run: echo $RANDOM_THEME
|
||||
# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
|
||||
# ZSH_THEME="robbyrussell"
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
|
||||
# Set list of themes to pick from when loading at random
|
||||
# Setting this variable when ZSH_THEME=random will cause zsh to load
|
||||
# a theme from this variable instead of looking in $ZSH/themes/
|
||||
# If set to an empty array, this variable will have no effect.
|
||||
# ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
|
||||
|
||||
# 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 one of the following lines to change the auto-update behavior
|
||||
# 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
|
||||
|
||||
# Uncomment the following line to change how often to auto-update (in days).
|
||||
# zstyle ':omz:update' frequency 13
|
||||
|
||||
# Uncomment the following line if pasting URLs and other text is messed up.
|
||||
# DISABLE_MAGIC_FUNCTIONS="true"
|
||||
|
||||
# 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.
|
||||
# You can also set it to another string to have that shown instead of the default red dots.
|
||||
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
|
||||
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
|
||||
# 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.
|
||||
# You can set one of the optional three formats:
|
||||
# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
|
||||
# or set a custom format using the strftime function format specifications,
|
||||
# see 'man strftime' for details.
|
||||
# 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?
|
||||
# Standard plugins can be found in $ZSH/plugins/
|
||||
# Custom plugins may be added to $ZSH_CUSTOM/plugins/
|
||||
# Example format: plugins=(rails git textmate ruby lighthouse)
|
||||
# Add wisely, as too many plugins slow down shell startup.
|
||||
plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# User configuration
|
||||
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
# You may need to manually set your language environment
|
||||
# export LANG=en_US.UTF-8
|
||||
|
||||
# Preferred editor for local and remote sessions
|
||||
# if [[ -n $SSH_CONNECTION ]]; then
|
||||
# export EDITOR='vim'
|
||||
# else
|
||||
# export EDITOR='mvim'
|
||||
# fi
|
||||
|
||||
# Compilation flags
|
||||
# export ARCHFLAGS="-arch x86_64"
|
||||
|
||||
# Set personal aliases, overriding those provided by oh-my-zsh libs,
|
||||
# plugins, and themes. Aliases can be placed here, though oh-my-zsh
|
||||
# users are encouraged to define aliases within the ZSH_CUSTOM folder.
|
||||
# For a full list of active aliases, run `alias`.
|
||||
#
|
||||
# Example aliases
|
||||
# alias zshconfig="mate ~/.zshrc"
|
||||
# alias ohmyzsh="mate ~/.oh-my-zsh"
|
||||
|
||||
alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
|
||||
alias wakemac="wakeonlan 18:C0:4D:8D:56:0E"
|
||||
alias ls="eza --icons=auto"
|
||||
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
|
||||
alias bat="bat --paging=never"
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
eval $(thefuck --alias)
|
||||
eval "$(fzf --zsh)"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# PYWAL
|
||||
# -----------------------------------------------------
|
||||
cat ~/.cache/wal/sequences
|
||||
|
||||
export EDITOR=nvim
|
||||
80
.zshrc_ohmyzsh
Normal file
80
.zshrc_ohmyzsh
Normal file
@ -0,0 +1,80 @@
|
||||
# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
|
||||
# Initialization code that may require console input (password prompts, [y/n]
|
||||
# confirmations, etc.) must go above this block; everything else may go below.
|
||||
if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
|
||||
source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
|
||||
fi
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Oh my zsh settings
|
||||
# -----------------------------------------------------
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$HOME/.oh-my-zsh"
|
||||
|
||||
# ZSH_THEME="robbyrussell"
|
||||
ZSH_THEME="powerlevel10k/powerlevel10k"
|
||||
|
||||
# Uncomment the following line to use hyphen-insensitive completion.
|
||||
# Case-sensitive completion must be off. _ and - will be interchangeable.
|
||||
# HYPHEN_INSENSITIVE="true"
|
||||
|
||||
zstyle ':omz:update' mode auto
|
||||
|
||||
# Uncomment the following line to display red dots whilst waiting for completion.
|
||||
# You can also set it to another string to have that shown instead of the default red dots.
|
||||
# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
|
||||
# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
|
||||
COMPLETION_WAITING_DOTS="true"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Plugins
|
||||
# -----------------------------------------------------
|
||||
plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
|
||||
|
||||
source $ZSH/oh-my-zsh.sh
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Variables
|
||||
# -----------------------------------------------------
|
||||
export PATH=$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||
# export MANPATH="/usr/local/man:$MANPATH"
|
||||
|
||||
export LANG=en_US.UTF-8
|
||||
|
||||
export EDITOR='vim'
|
||||
|
||||
export MAKEFLAGS='-j$(nproc)'
|
||||
export CFLAGS='-march=native -O2 -pipe'
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Alias
|
||||
# -----------------------------------------------------
|
||||
alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
|
||||
alias wakemac="wakeonlan 18:C0:4D:8D:56:0E"
|
||||
alias ls="eza --icons=auto"
|
||||
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
|
||||
alias bat="bat --paging=never"
|
||||
# fix ssh if in kitty
|
||||
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# evals
|
||||
# -----------------------------------------------------
|
||||
eval $(thefuck --alias)
|
||||
eval "$(fzf --zsh)"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# PYWAL
|
||||
# -----------------------------------------------------
|
||||
cat ~/.cache/wal/sequences
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Custom
|
||||
# -----------------------------------------------------
|
||||
[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
|
||||
|
||||
# -----------------------------------------------------
|
||||
# miscs
|
||||
# -----------------------------------------------------
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
62
.zshrc_zinit
Normal file
62
.zshrc_zinit
Normal file
@ -0,0 +1,62 @@
|
||||
# ---------------------------------------------------
|
||||
# Zinit and plugins
|
||||
# ---------------------------------------------------
|
||||
source /usr/share/zinit/zinit.zsh
|
||||
|
||||
# Load powerlevel10k theme
|
||||
zinit ice depth"1" # git clone depth
|
||||
zinit light romkatv/powerlevel10k
|
||||
|
||||
# Load plugins
|
||||
zinit light zsh-users/zsh-autosuggestions
|
||||
zinit light zdharma-continuum/fast-syntax-highlighting
|
||||
# oh-my-zsh plugins
|
||||
zi snippet OMZL::git.zsh
|
||||
zi snippet OMZP::git
|
||||
zi snippet OMZP::sudo
|
||||
zi snippet OMZP::colored-man-pages
|
||||
zi snippet OMZP::eza
|
||||
zi snippet OMZP::z
|
||||
# others
|
||||
zplugin ice as"program" pick"bin/git-dsf"
|
||||
zplugin light zdharma-continuum/zsh-diff-so-fancy
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Variables
|
||||
# ----------------------------------------------------
|
||||
export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
||||
export EDITOR=vim
|
||||
|
||||
# ----------------------------------------------------
|
||||
# Alias
|
||||
# ----------------------------------------------------
|
||||
alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
|
||||
alias wakemac="wakeonlan 18:C0:4D:8D:56:0E"
|
||||
alias eza="eza --icons=auto"
|
||||
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
|
||||
alias bat="bat --paging=never"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# evals
|
||||
# -----------------------------------------------------
|
||||
eval $(thefuck --alias)
|
||||
eval "$(fzf --zsh)"
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Miscs
|
||||
# -----------------------------------------------------
|
||||
# fix ssh if in kitty
|
||||
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
# -----------------------------------------------------
|
||||
# PYWAL
|
||||
# -----------------------------------------------------
|
||||
cat ~/.cache/wal/sequences
|
||||
|
||||
# -----------------------------------------------------
|
||||
# Custom
|
||||
# -----------------------------------------------------
|
||||
[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
|
||||
@ -9,7 +9,7 @@ $mainMod = SUPER
|
||||
# Applications
|
||||
bind = $mainMod, RETURN, exec, ~/dotfiles/.settings/terminal.sh
|
||||
bind = $mainMod, B, exec, ~/dotfiles/.settings/browser.sh
|
||||
bind = $mainMod, period, exec, emote
|
||||
bind = $mainMod SHIFT, E, exec, emote
|
||||
|
||||
# Windows
|
||||
bind = $mainMod, Q, killactive
|
||||
@ -35,15 +35,18 @@ bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh
|
||||
bind = $mainMod CTRL, Q, exec, wlogout
|
||||
bind = $mainMod SHIFT, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh
|
||||
bind = $mainMod CTRL, W, exec, ~/dotfiles/hypr/scripts/wallpaper.sh select
|
||||
bind = $mainMod CTRL, RETURN, exec, rofi -show drun -replace -i
|
||||
bind = $mainMod, SPACE, exec, rofi -show drun -replace -i
|
||||
bind = $mainMod CTRL, H, exec, ~/dotfiles/hypr/scripts/keybindings.sh
|
||||
bind = $mainMod SHIFT, B, exec, ~/dotfiles/waybar/launch.sh
|
||||
bind = $mainMod CTRL, B, exec, ~/dotfiles/waybar/toggle.sh
|
||||
bind = $mainMod SHIFT, R, exec, ~/dotfiles/hypr/scripts/loadconfig.sh
|
||||
bind = $mainMod CTRL, F, exec, ~/dotfiles/scripts/filemanager.sh
|
||||
bind = $mainMod CTRL, C, exec, ~/dotfiles/scripts/cliphist.sh
|
||||
bind = $mainMod, V, exec, ~/dotfiles/scripts/cliphist.sh
|
||||
bind = $mainMod CTRL, T, exec, ~/dotfiles/waybar/themeswitcher.sh
|
||||
bind = $mainMod CTRL, S, exec, ~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
|
||||
bind = $mainMod CTRL, P, exec, hyprpicker -a
|
||||
bind = $mainMod SHIFT, S, exec, ~/dotfiles/hypr/scripts/hyprshade.sh
|
||||
bind = $mainMod ALT, G, exec, ~/dotfiles/hypr/scripts/gamemode.sh
|
||||
|
||||
# Workspaces
|
||||
bind = $mainMod, 1, workspace, 1
|
||||
|
||||
@ -78,6 +78,7 @@ fi
|
||||
if [[ $profile == *"Qtile"* ]]; then
|
||||
source .install/qtile-dotfiles.sh
|
||||
fi
|
||||
source .install/zshfish.sh
|
||||
source .install/settings.sh
|
||||
source .install/apps.sh
|
||||
source .install/gtk.sh
|
||||
|
||||
Loading…
Reference in New Issue
Block a user