feat(nvim): migrate to lazyvim

.gitignore

@@ -11,4 +11,4 @@ config/nvim/plugged
 config/nvim/plugin/packer_compiled.lua
 
 # fish
-config/fish/fish_variables
+config/fish/fish_variables

.gitmodules

@@ -1,26 +1,4 @@
-[submodule "modules/dotbot"]
-path = modules/dotbot
-url = https://github.com/anishathalye/dotbot.git
-ignore = dirty
 [submodule "modules/zgen"]
 path = modules/zgen
 url = https://github.com/tarjoilija/zgen.git
 ignore = dirty
-[submodule "modules/asdf"]
-path = modules/asdf
-url = https://github.com/asdf-vm/asdf.git
-ignore = dirty
-[submodule "modules/oh-my-zsh"]
-path = modules/oh-my-zsh
-url = https://github.com/ohmyzsh/ohmyzsh.git
-ignore = dirty
-[submodule "modules/dotbot-asdf"]
-path = modules/dotbot-asdf
-url = https://github.com/sobolevn/dotbot-asdf.git
-[submodule "modules/dotbot-brewfile"]
-path = modules/dotbot-brewfile
-url = https://github.com/sobolevn/dotbot-brewfile.git
-[submodule "modules/nvchad"]
-	path = modules/nvchad
-	url = https://github.com/NvChad/NvChad.git
-	branch = v2.0

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017 Dmitry Fisenko
+Copyright (c) 2023 Dmitry Fisenko
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,19 +1,10 @@
-.PHONY: install brew brew-restore
+.PHONY: install brew
 
-# Run dotbot install script
 install:
-	./install
+	./scripts/install.sh
 
-# Save snapshot of all Homebrew packages to macos/brewfile
 brew:
-	brew bundle dump -f --file=config/os/macos/brewfile
-	brew bundle --force cleanup --file=config/os/macos/brewfile
-
-# Restore Homebrew packages
-brew-restore:
-	curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install | ruby
 	brew update
 	brew upgrade
-	brew install mas
-	brew bundle install --file=config/os/macos/brewfile
+	brew bundle install --file=brew/brewfile
 	brew cleanup

README.md

@@ -6,33 +6,37 @@
 
 **Warning**: Don’t blindly use my settings unless you know what that entails. Use at your own risk!
 
-## Vim setup
+## Neovim setup
 
-Requires [Neovim](https://neovim.io/) (>= 0.8)
+### Requirements
 
-- [NvChad](https://github.com/NvChad/NvChad) - Blazing fast Neovim config providing solid defaults and a beautiful UI
+- Neovim >= **0.9.0** (needs to be built with **LuaJIT**)
+- Git >= **2.19.0** (for partial clones support)
+- [LazyVim](https://www.lazyvim.org/)
+- a [Nerd Font](https://www.nerdfonts.com/)(v3.0 or greater) **_(optional, but needed to display some icons)_**
   - [JetBrains Nerd Font](https://www.nerdfonts.com/font-downloads)
+- [lazygit](https://github.com/jesseduffield/lazygit) **_(optional)_**
+  - **live grep**: [ripgrep](https://github.com/BurntSushi/ripgrep)
+  - **find files**: [fd](https://github.com/sharkdp/fd)
+- [Solarized Osaka](https://github.com/craftzdog/solarized-osaka.nvim)
 
 ## Shell setup (macOS)
 
-- [Dotbot](https://github.com/anishathalye/dotbot) - a tool that bootstraps dotfiles
-- [Oh My Zsh](https://github.com/robbyrussell/oh-my-zsh) - framework for managing `zsh` configuration
-- [Powerlevel10k](https://github.com/romkatv/powerlevel10k) - theme
-  - [Meslo Nerd Font](https://github.com/romkatv/powerlevel10k#meslo-nerd-font-patched-for-powerlevel10k) Meslo Nerd Font patched for Powerlevel10k
+- [Homebrew](https://brew.sh)
 
-### Installation
+## Installation
 
 ```bash
 git clone [email protected]:fisenkodv/dotfiles.git .dotfiles --recursive
 cd .dotfiles
 make install
 ```
 
-### Inspired By
+## Inspired By
 
 - https://github.com/denolfe/dotfiles
 - https://github.com/craftzdog/dotfiles-public
 
 ## License
 
-MIT
+[MIT](LICENSE)

config/os/macos/brewfile → brew/brewfile

@@ -1,24 +1,25 @@
 brew "bat"
+brew "eza"
+brew "fd"
+brew "fish"
 brew "fzf"
+brew "git-quick-stats"
+brew "git-standup"
 brew "htop"
-brew "neovim"
+brew "jq"
+brew "lazygit"
+brew "mtr"
 brew "ncdu"
-brew "pidof"
-brew "tree"
-brew "tldr"
-brew "wget"
+brew "neovim"
 brew "nmap"
+brew "peco"
+brew "pidof"
 brew "pipenv"
 brew "pyenv"
 brew "ripgrep"
-brew "eza"
+brew "starship"
 brew "tig"
-brew "jq"
-brew "peco"
+brew "tldr"
 brew "tmux"
-brew "mtr"
-brew "starship"
-brew "fish"
-brew "git-delta"
-brew "git-quick-stats"
-brew "git-standup"
+brew "tree"
+brew "wget"

config/fish/aliases/git.aliases.fish

@@ -1,27 +1,14 @@
-alias gst "git status"
-alias gau "git add -u"
+alias gaa "git add --all"
 alias gbd "git branch -D"
-alias gbm "git branch --merged"
-alias gbmv "git branch -m"
-alias gbnm "git branch --no-merged"
-alias gbu "git branch -u"
 alias gbv "git for-each-ref --sort=-committerdate refs/heads/ --format='%(HEAD) %(color:yellow)%(refname:short)%(color:reset) - %(color:red)%(objectname:short)%(color:reset) - %(contents:subject) (%(color:green)%(committerdate:relative)%(color:reset))'"
 alias gbvv "git branch -vv"
-alias gcane "git commit --amend --no-edit"
-alias gcof "git checkout -f"
-alias gct "git checkout -t"
+alias gcb "git checkout -b"
 alias gdc "git diff --cached"
-alias gdlast "git diff HEAD~1..HEAD"
 alias gh "git hist"
 alias gl "git l3"
 alias glast "git log -1 HEAD"
-alias gpdel "git push --delete"
+alias gp "git pull"
 alias gpl "git pull"
-alias gstu "git status -uno"
-
-alias gswm 'git switch $(git_main_branch)'
-
-alias gundo "git reset HEAD~1"
-alias guns "git reset HEAD --"
-
+alias gst "git status"
 alias gstl "git stash list --pretty=format:'%C(blue)%gd%C(reset): %<(100,trunc)%s %C(green)(%cr)%C(reset)'"
+alias gundo "git reset HEAD~1"

config/fish/aliases/shell.aliases.fish

@@ -39,6 +39,3 @@ else
   alias tr2 'tree -L 2 -C'
   alias tr3 'tree -L 3 -C'
 end
-
-alias to_lower="tr '[:upper:]' '[:lower:]'"
-alias to_upper="tr '[:lower:]' '[:upper:]'"

config/fish/config.fish

@@ -10,8 +10,3 @@ end
 
 # starship
 starship init fish | source
-
-# Automatically "Warpify"
-if status is-interactive
-  printf '\eP$f{"hook": "SourcedRcFileForWarp", "value": { "shell": "fish"}}\x9c'
-end

config/iterm2/com.googlecode.iterm2.plist

@@ -899,9 +899,9 @@
 			<key>Blinking Cursor</key>
 			<true/>
 			<key>Blur</key>
-			<false/>
+			<true/>
 			<key>Blur Radius</key>
-			<real>10.409748742935506</real>
+			<real>10.158369088680189</real>
 			<key>Bold Color</key>
 			<dict>
 				<key>Blue Component</key>
@@ -1509,7 +1509,7 @@
 			<key>Title Components</key>
 			<integer>160</integer>
 			<key>Transparency</key>
-			<real>0.0</real>
+			<real>0.050590093085106383</real>
 			<key>Unicode Normalization</key>
 			<integer>0</integer>
 			<key>Unicode Version</key>