Merge branch 'main' of github.com:ivabus/ivabus-dotfiles

README.md

@@ -8,7 +8,7 @@ Features:
 - alacritty config (solarized dark, 60x20, JetBrains Mono)
 - Jetbrains Mono installation (macOS or Linux)
 - macOS-specific configuration ([Homebrew](https://brew.sh), git gpg fixing, alacritty and JetBrains Mono installation)
-- sway configs (sway + waybar) (fzf required)
+
 During the installation you can configure git by embedded configurator:
 
  - user.name
@@ -23,15 +23,3 @@ sh -c "$(curl -fsSL https://ivabus.dev/dotfiles)"
 ### Upgrading dotfiles
 
 Just run `upgrade_dotfiles` in your shell. Script will `git pull`, then relink old dotfiles, link new if needed and upgrade oh-my-zsh.
-
-### Screenshot
-
-![screen](https://user-images.githubusercontent.com/71599788/182587818-f04271c5-51f2-4275-84b6-98d71c8e5584.png)
-
-## Dependencies
-
-- sway
-- zsh
-- git
-- pcmanfm-qt
-- fzf

configs/nvim.vim

@@ -3,7 +3,7 @@ set showmatch
 set hlsearch
 set incsearch
 set autoindent
-set noexpandtab
+set expandtab
 set tabstop=4
 set shiftwidth=4
 set number

configs/zshrc

@@ -7,3 +7,6 @@ plugins=(git zsh-syntax-highlighting)
 alias upgrade_dotfiles="sh $HOME/.dotfiles/tools/upgrade.sh"
 
 source $ZSH/oh-my-zsh.sh
+
+alias vi="nvim"
+alias vim="nvim"