From 739f2d43f4674fceb19fb4562a9a0b13023ebf0a Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Wed, 3 Aug 2022 19:08:40 +0300 Subject: [PATCH 1/2] Remove sway configs and add aliases for vi and vim in zshrc --- README.md | 14 +------------- configs/zshrc | 3 +++ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index a8eedd4..5a58953 100644 --- a/README.md +++ b/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 diff --git a/configs/zshrc b/configs/zshrc index ef79b9b..85f992f 100644 --- a/configs/zshrc +++ b/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" From 7e9815cb66efcb069f81efb265e07ec486bb11d2 Mon Sep 17 00:00:00 2001 From: Ivan Bushchik Date: Wed, 3 Aug 2022 19:12:12 +0300 Subject: [PATCH 2/2] replace tabs with spaces :( --- configs/nvim.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/nvim.vim b/configs/nvim.vim index 29f1506..0154710 100644 --- a/configs/nvim.vim +++ b/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