Merge branch 'master' of https://github.com/msp301/vimrc

ansible/playbook.yml

@@ -14,6 +14,7 @@
             become_user: root
             package: name={{ item }} state=latest
             with_items:
+                - "{{ bat_package }}"
                 - "{{ build_essential_package }}"
                 - "{{ cmake_package }}"
                 - "{{ curl_package }}"
@@ -41,23 +42,10 @@
 
           - name: Symlink Neovim config
             file:
-                    src={{ repo_dir }}/init.vim
-                    dest=~/.config/nvim/init.vim
+                    src={{ repo_dir }}/nvim
+                    dest=~/.config/nvim
                     state=link
-
-          - name: Create vim-plug directory
-            file: path=~/.local/share/nvim/site/autoload state=directory
-
-          - name: Install vim-plug
-            copy:
-                    src={{ repo_dir }}/vim-plug/plug.vim
-                    dest=~/.local/share/nvim/site/autoload/plug.vim
-
-          - name: Install Neovim plugins
-            command: nvim --headless +PlugInstall +qall
-
-          - name: Install Neovim plugins
-            command: nvim --headless +MasonUpdate +qall
+                    force=yes
 
           - name: Create Vim backup directory
             file: path=~/.vim-backupsdir state=directory

ansible/vars/Archlinux.yml

@@ -3,6 +3,7 @@
 #
 # Arch Linux / Manjaro package names
 #
+bat_package: "bat"
 build_essential_package: "base-devel"
 cmake_package: "cmake"
 curl_package: "curl"

ansible/vars/Debian.yml

@@ -3,6 +3,7 @@
 #
 # Debian package names
 #
+bat_package: "bat"
 build_essential_package: "build-essential"
 cmake_package: "cmake"
 curl_package: "curl"

nvim/lua/general.lua

@@ -41,8 +41,8 @@ opt.scrolloff = 8
 -- Provide access to system clipboard
 opt.clipboard = "unnamedplus"
 
-opt.backupdir = "~/.vim-backupsdir"
-opt.dir = "~/.vim-swapdir"
+opt.backupdir = { vim.fn.expand("~/.vim-backupsdir") }
+opt.dir = { vim.fn.expand("~/.vim-swapdir") }
 
 -- Search Settings
 opt.incsearch = true

setup.ps1

@@ -53,6 +53,7 @@ Symlink "$PSScriptRoot\nvim" "$env:LOCALAPPDATA\nvim";
 Symlink "$PSScriptRoot\ideavimrc" "$env:USERPROFILE\.ideavimrc"
 
 ChocoInstall "7zip" "7z"
+ChocoInstall "bat"
 ChocoInstall "curl"
 ChocoInstall "fd"
 ChocoInstall "fzf"
@@ -69,5 +70,7 @@ ChocoInstall "pwsh"
 ChocoInstall "ripgrep" "rg"
 ChocoInstall "zig"
 
+git config --global push.autoSetupRemote true
+
 Write-Host "Done"