From 773774b17f37e3a075aad8025885b32d6ae1583a Mon Sep 17 00:00:00 2001 From: pancakes Date: Wed, 8 May 2024 01:12:14 +1000 Subject: [PATCH] Switch from zsh to fish --- justfile | 24 +++++++++++----- zsh/.zshenv | 5 ---- zsh/.zshrc | 79 ----------------------------------------------------- 3 files changed, 17 insertions(+), 91 deletions(-) delete mode 100644 zsh/.zshenv delete mode 100644 zsh/.zshrc diff --git a/justfile b/justfile index 1d02b47..06713ea 100644 --- a/justfile +++ b/justfile @@ -4,6 +4,11 @@ username := env_var('USER') default: @just --list --justfile {{justfile()}} +# Install fish and plugin manager +install-fish: + sudo pacman -S fish pkgfile + fish -c "curl -sL https://raw.githubusercontent.com/jorgebucaran/fisher/main/functions/fisher.fish | source && fisher install jorgebucaran/fisher" + # Installs the paru AUR helper setup-aur: rustup install stable @@ -43,14 +48,19 @@ setup-river: paru -S --noprovides bemoji lswt river-git swaylock-effects-git wlogout wlopm wlr-randr-git bemoji -# Set ZSH as default shell and install plugins +# Configure fish and plugins setup-shell: - chsh -s /usr/bin/zsh - curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh | sh - git clone https://github.com/hlissner/zsh-autopair ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autopair - git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions - git clone https://github.com/zsh-users/zsh-history-substring-search ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-history-substring-search - git clone https://github.com/zsh-users/zsh-syntax-highlighting ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting + chsh -s /usr/bin/fish + fish -c "set -U fish_greeting" + fish -c "set -U MOZ_ENABLE_WAYLAND 1" + fish -c "set -U MOZ_USE_XINPUT2 1" + fish -c "set -U VISUAL vim" + fish -c "curl -sL https://raw.githubusercontent.com/folke/tokyonight.nvim/main/extras/fish/tokyonight_night.fish | source" + fish -c "fisher install franciscolourenco/done" + fish -c "fisher install jorgebucaran/autopair.fish" + fish -c "fisher install jorgebucaran/hydro" + fish -c "fisher install meaningful-ooo/sponge" + fish -c "fisher install nickeb96/puffer-fish" # Enable and authenticate with Tailscale setup-tailscale: diff --git a/zsh/.zshenv b/zsh/.zshenv deleted file mode 100644 index fdaf05d..0000000 --- a/zsh/.zshenv +++ /dev/null @@ -1,5 +0,0 @@ -export MOZ_ENABLE_WAYLAND=1 -export MOZ_USE_XINPUT2=1 -export RANGER_LOAD_DEFAULT_RC=FALSE -export VISUAL=vim -export XCURSOR_PATH=${XCURSOR_PATH}:~/.local/share/icons diff --git a/zsh/.zshrc b/zsh/.zshrc deleted file mode 100644 index 94b8645..0000000 --- a/zsh/.zshrc +++ /dev/null @@ -1,79 +0,0 @@ -# If you come from bash you might have to change your $PATH. -# export PATH=$HOME/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="gallifrey" - -# 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/ -plugins=(colored-man-pages git python zsh-autopair zsh-autosuggestions zsh-history-substring-search zsh-syntax-highlighting) - -export PYTHON_AUTO_VRUN=true -export PYTHON_VENV_NAME=".venv" - -source $ZSH/oh-my-zsh.sh - -# User configuration -alias ls=eza