move to fish from zsh
This commit is contained in:
@@ -1,8 +1,5 @@
|
||||
FROM alpine:latest
|
||||
RUN apk --no-cache add git curl
|
||||
RUN sh -c "$(curl -fsLS git.io/chezmoi)" -- init --apply candrewlee14
|
||||
# RUN nvim --headless +'PlugInstall --sync' +qa
|
||||
# RUN nvim --headless -u ~/.config/nvim/coq_init.vim +'PlugInstall --sync' +qa
|
||||
# RUN nvim --headless -u ~/.config/nvim/cmp_init.vim +'PlugInstall --sync' +qa
|
||||
ENTRYPOINT ["/bin/zsh"]
|
||||
ENTRYPOINT ["/bin/fish"]
|
||||
|
||||
|
||||
3
dot_config/private_fish/config.fish
Normal file
3
dot_config/private_fish/config.fish
Normal file
@@ -0,0 +1,3 @@
|
||||
if status is-interactive
|
||||
# Commands to run in interactive sessions can go here
|
||||
end
|
||||
5
dot_config/private_fish/dot_on_install.fish
Normal file
5
dot_config/private_fish/dot_on_install.fish
Normal file
@@ -0,0 +1,5 @@
|
||||
curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher
|
||||
|
||||
fisher install IlanCosman/tide@v6
|
||||
fisher install PatrickF1/fzf.fish
|
||||
fisher install kidonng/zoxide.fish
|
||||
1633
dot_p10k.zsh
1633
dot_p10k.zsh
File diff suppressed because it is too large
Load Diff
135
dot_zshrc
135
dot_zshrc
@@ -1,135 +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:/usr/local/bin:$PATH
|
||||
export PATH=$HOME/.local/bin:$PATH
|
||||
|
||||
# Path to your oh-my-zsh installation.
|
||||
export ZSH="$(echo $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="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 the following line to disable bi-weekly auto-update checks.
|
||||
DISABLE_AUTO_UPDATE="true"
|
||||
|
||||
# Uncomment the following line to automatically update without prompting.
|
||||
# DISABLE_UPDATE_PROMPT="true"
|
||||
|
||||
# Uncomment the following line to change how often to auto-update (in days).
|
||||
# export UPDATE_ZSH_DAYS=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.
|
||||
# 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
|
||||
fzf
|
||||
zsh-autosuggestions
|
||||
zsh-syntax-highlighting
|
||||
zsh-vi-mode
|
||||
)
|
||||
|
||||
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
|
||||
|
||||
export EDITOR="nvim"
|
||||
|
||||
# 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"
|
||||
nvimc() {
|
||||
nvim -u ~/.config/nvim/coc_init.vim $1
|
||||
}
|
||||
nvimq() {
|
||||
nvim -u ~/.config/nvim/coq_init.vim $1
|
||||
}
|
||||
nvimp() {
|
||||
nvim -u ~/.config/nvim/cmp_init.vim $1
|
||||
}
|
||||
|
||||
# Add path to webman (package manager) bin
|
||||
path=("$HOME/.webman/bin" $path)
|
||||
|
||||
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
|
||||
|
||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||
|
||||
[[ -f ~/.antigen.zsh ]] && source ~/.antigen.zsh
|
||||
antigen bundle 'wfxr/forgit'
|
||||
antigen apply
|
||||
|
||||
# Local config
|
||||
[[ -f ~/.zshrc.local ]] && source ~/.zshrc.local
|
||||
|
||||
|
||||
|
||||
@@ -2,19 +2,27 @@
|
||||
echo "Running installation script\n"
|
||||
{{- if eq .osid "linux-alpine" }}
|
||||
apk update
|
||||
apk add zsh tmux perl bash
|
||||
apk add bash fish
|
||||
{{- else if (or (eq .osid "debian") (eq .osid "ubuntu")) }}
|
||||
sudo apt-add-repository ppa:fish-shell/release-3
|
||||
sudo apt update
|
||||
sudo apt install zsh tmux perl bash -y
|
||||
sudo apt install bash fish -y
|
||||
{{- else if eq .osid "darwin" }}
|
||||
brew install neovim zsh tmux perl
|
||||
brew install neovim tmux perl fish
|
||||
{{- end }}
|
||||
|
||||
git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
|
||||
curl -L git.io/antigen > ~/.antigen.zsh
|
||||
chsh -s $(which fish)
|
||||
|
||||
curl https://raw.githubusercontent.com/candrewlee14/webman/main/scripts/install.sh | sh
|
||||
~/.webman/bin/webman group add modern-unix --all || echo "Not all modern-unix packages installed successfully"
|
||||
~/.webman/bin/webman add fzf || echo "Fzf install failed"
|
||||
~/.webman/bin/webman add zellij || echo "zellij install failed"
|
||||
~/.webman/bin/webman add nvim || echo "nvim install failed"
|
||||
|
||||
/usr/bin/env fish ~/.config/fish/.on_install.fish
|
||||
|
||||
git clone https://github.com/AstroNvim/AstroNvim ~/.config/nvim
|
||||
git clone https://github.com/candrewlee14/astronvim_config ~/.config/nvim/lua/user
|
||||
|
||||
nvim --headless +q
|
||||
|
||||
|
||||
Reference in New Issue
Block a user