Remove oh-my-zsh from all dotfiles, fix neovim plugins installation

This commit is contained in:
Ivan Bushchik 2023-02-05 12:53:53 +03:00
parent c84e0850cd
commit ab0ba8ba52
No known key found for this signature in database
GPG key ID: 9F6DDABE11A2674D
13 changed files with 32 additions and 74 deletions

1
.gitignore vendored
View file

@ -3,3 +3,4 @@
oh-my-zsh oh-my-zsh
configs/nvim/site/autoload configs/nvim/site/autoload
zsh

View file

@ -3,7 +3,7 @@
Features: Features:
- swaywm (sway, waybar, qt5ct, mako) - swaywm (sway, waybar, qt5ct, mako)
- zshrc ([oh-my-zsh](https://ohmyz.sh) + [zsh-users/zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting)) - zshrc ([zsh-users/zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting))
- [ivabus-zsh-theme](https://github.com/ivabus/ivabus-zsh-theme) - [ivabus-zsh-theme](https://github.com/ivabus/ivabus-zsh-theme)
- neovim config (no plugins) - neovim config (no plugins)
- alacritty config (Solarized Dark, 60x20, JetBrains Mono) - alacritty config (Solarized Dark, 60x20, JetBrains Mono)

View file

@ -6,3 +6,4 @@ export MOZ_ENABLE_WAYLAND=1
export MOZ_DBUS_REMOTE=1 export MOZ_DBUS_REMOTE=1
export QT_QPA_PLATFORMTHEME=qt5ct export QT_QPA_PLATFORMTHEME=qt5ct
export XDG_CURRENT_DESKTOP=Unity export XDG_CURRENT_DESKTOP=Unity
. "$HOME/.cargo/env"

View file

@ -1,42 +1,26 @@
export ZSH="$HOME/.dotfiles/oh-my-zsh" export ZSH="$HOME/.dotfiles/zsh"
export HISTSIZE=10000
export SAVEHIST=10000
setopt HIST_IGNORE_ALL_DUPS
setopt HIST_FIND_NO_DUPS
REPORTTIME=3
ZSH_THEME="ivabus"
ENABLE_CORRECTION="true"
plugins=(git zsh-syntax-highlighting)
# Function to quickly show stats on systemload, usage of filesystems, usage of ram/swap and uptime
stats () {
AVLD=$(cut -d " " -f1-3 /proc/loadavg)
USEDMEM=$(free -h | grep Mem | awk '{print $3 " / " $2}')
USEDSWAP=$(free -h | grep Swap | awk '{ print $3 " / " $2}')
USEDSTRG=$(df / -h | tail -n 1 | awk '{print $3}')
USEDSTRGPERC=$(df / -h | tail -n 1 | awk '{print $5}')
STRG=$(df / -h | tail -n 1 | awk '{print $2}')
USEDSTRGHOME=$(df /home -h | tail -n 1 | awk '{print $3}')
USEDSTRGPERCHOME=$(df /home -h | tail -n 1 | awk '{print $5}')
STRGHOME=$(df /home -h | tail -n 1 | awk '{print $2}')
UPTIME=$(uptime -p)
printf "\e[0;34msystem load:\e[m\t${AVLD}\n"
printf "\e[0;34musage of /:\e[m\t${USEDSTRGPERC}% (${USEDSTRG}/${STRG})\n"
printf "\e[0;34musage of /home:\e[m\t${USEDSTRGPERCHOME}% (${USEDSTRGHOME}/${STRGHOME})\n"
printf "\e[0;34mmemory usage:\e[m\t${USEDMEM}\n"
printf "\e[0;34mswap usage:\e[m\t${USEDSWAP}\n"
printf "\e[0;34muptime:\e[m\t\t${UPTIME}\n"
}
source $ZSH/oh-my-zsh.sh
source $HOME/.profile source $HOME/.profile
export REPORTTIME=10 source $ZSH/themes/ivabus.zsh-theme
source $ZSH/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
alias vi="nvim" alias vi="nvim"
alias vim="nvim" alias vim="nvim"
alias ls="ls --color=always"
alias la="ls -la"
alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh" alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
alias timestamp='date -u +%FT%TZ' alias timestamp='date -u +%FT%TZ'
alias yt-dlp-opus="yt-dlp -f 251 -x" alias yt-dlp-opus="yt-dlp -f 251 -x"
alias ffmpeg_hard="ffmpeg -hwaccel videotoolbox -c:v h264_videotoolbox"
# AsahiLinux useful aliases # AsahiLinux useful aliases
alias reload_net="sudo systemctl restart NetworkManager wpa_supplicant" # iwd" alias reload_net="sudo systemctl restart NetworkManager wpa_supplicant" # iwd"
# Diskutil aliases
alias dadc="diskutil apfs deleteContainer"
add-zsh-hook -Uz chpwd(){ source <(tea -Eds) } #tea alias devff="diskutil eraseVolume free free"

View file

@ -15,30 +15,3 @@ set backupdir=~/.cache/vim
set completeopt=noinsert,menuone,noselect set completeopt=noinsert,menuone,noselect
set cursorline set cursorline
set relativenumber set relativenumber
call plug#begin()
Plug 'catppuccin/nvim', { 'as': 'catppuccin' }
Plug 'neovim/nvim-lspconfig'
Plug 'simrat39/rust-tools.nvim'
Plug 'nvim-lua/plenary.nvim'
Plug 'saecki/crates.nvim', { 'tag': 'v0.3.0' }
Plug 'neovim/nvim-lspconfig'
Plug 'hrsh7th/cmp-nvim-lsp'
Plug 'hrsh7th/cmp-buffer'
Plug 'hrsh7th/cmp-path'
Plug 'hrsh7th/cmp-cmdline'
Plug 'hrsh7th/nvim-cmp'
Plug 'saadparwaiz1/cmp_luasnip'
Plug 'L3MON4D3/LuaSnip'
Plug 'ahmedkhalf/project.nvim'
Plug 'lewis6991/gitsigns.nvim'
Plug 'nvim-neo-tree/neo-tree.nvim'
Plug 'nvim-lua/plenary.nvim'
Plug 'MunifTanjim/nui.nvim'
Plug 'nvim-tree/nvim-web-devicons'
call plug#end()
colorscheme catppuccin-macchiato
lua require('crates').setup()
lua require('gitsigns').setup()
set completeopt=menu,menuone,noselect

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
NC='\033[0m' NC='\033[0m'
Green='\033[1;32m' Green='\033[1;32m'
ARROW="${Green}=>${NC}" ARROW="${Green}=>${NC}"

View file

@ -1,4 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
echo "Setting up git" echo "Setting up git"
read -p "Enter your name for commits: " GITNAME read -p "Enter your name for commits: " GITNAME

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
CURRENTDIR="$(pwd)" CURRENTDIR="$(pwd)"
echo "Welcome to ivabus .dotfiles installer" echo "Welcome to ivabus .dotfiles installer"
@ -15,16 +15,14 @@ then
echo "Aborting." echo "Aborting."
exit 255 exit 255
fi fi
mkdir -p $HOME/.dotfiles/zsh/{plugins,themes}
# install oh-my-zsh and plugins ZSH="$HOME/.dotfiles/zsh"
echo "Installing oh-my-zsh and plugins" echo "Installing zsh theme and plugins"
ZSH="$HOME/.dotfiles/oh-my-zsh" sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended > /dev/null 2>&1 curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.dotfiles/zsh/themes/ivabus.zsh-theme > /dev/null 2>&1
curl -fsSL https://raw.githubusercontent.com/ivabus/ivabus-zsh-theme/master/ivabus.zsh-theme -o $HOME/.dotfiles/oh-my-zsh/custom/themes/ivabus.zsh-theme > /dev/null 2>&1 git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.dotfiles/zsh/plugins/zsh-syntax-highlighting > /dev/null 2>&1
git clone https://github.com/zsh-users/zsh-syntax-highlighting.git $HOME/.dotfiles/oh-my-zsh/custom/plugins/zsh-syntax-highlighting > /dev/null 2>&1
# installing vimplug # installing vimplug
curl -fLo "$HOME/.config/nvim/site/autoload/plug.vim" --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
# installing jetbrains mono # installing jetbrains mono
if [[ $(uname) = "Linux" ]] if [[ $(uname) = "Linux" ]]
then then

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
echo "=> Linking zshrc" echo "=> Linking zshrc"
if [ -f ~/.zshrc ]; then if [ -f ~/.zshrc ]; then
echo "=> Moving old zshrc to ~/.zshrc.old" echo "=> Moving old zshrc to ~/.zshrc.old"

View file

@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
set -e
# configuring mac-only things # configuring mac-only things
# installing homebrew # installing homebrew

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
echo "Reinstalling dotfiles" echo "Reinstalling dotfiles"
echo "To proceed press enter" echo "To proceed press enter"
read A read A

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
# script that (re)links all dotfiles during the installation or upgrade. # script that (re)links all dotfiles during the installation or upgrade.
# do not run manually # do not run manually

View file

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
set -e
# Dotfiles upgrade script that just pulls new dotfiles from repo # Dotfiles upgrade script that just pulls new dotfiles from repo
# oh-my-zsh update included! # oh-my-zsh update included!