From be3d47070d5db4c5c08c0ffd13bea79191e80dfe Mon Sep 17 00:00:00 2001
From: Phantop <phantop@tuta.io>
Date: Fri, 27 May 2022 14:05:57 -0400
Subject: [PATCH] nvim: switch to lua config

---
 bin/setup     |  4 ++--
 nvim/init.lua | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 nvim/init.vim | 42 ------------------------------------------
 3 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100755 nvim/init.lua
 delete mode 100755 nvim/init.vim

diff --git a/bin/setup b/bin/setup
index 8f07dbe..c3f2b93 100755
--- a/bin/setup
+++ b/bin/setup
@@ -21,6 +21,7 @@ ln -s ~/.config/gtk-3.0/gtkrc ~/.gtkrc-2.0
 
 wget https://github.com/dracula/kitty/raw/master/dracula.conf -P ~/.config/kitty
 wget https://github.com/dracula/rofi/raw/master/theme/config2.rasi -P ~/.config/rofi
+wget https://github.com/savq/paq-nvim/raw/master/lua/paq.lua -P ~/.config/nvim/lua
 wget https://source.netsurf-browser.org/netsurf.git/plain/resources/adblock.css\
     https://nitter.it/css/themes/dracula.css -P ~/.config/qutebrowser
 un(){ F=$(mktemp); mkdir -p "$2"; curl https://api.github.com/repos/"$1"/releases |\
@@ -39,8 +40,7 @@ g g p:appdwarf ~/.appdwarf
 g g p:solus-stuff ~/.solus
 g g p:phantop.github.io ~/.site
 g g p:haiku-icons ~/.local/share/icons/Haiku
-g g h:junegunn/vim-plug ~/.config/nvim/autoload
-nvim +PlugUpdate +q +q
+nvim +PaqInstall +q
 
 parallel gsettings set org.gnome.desktop.interface {}-theme Haiku ::: cursor icon
 gsettings set org.gnome.desktop.interface gtk-theme Ant-Dracula
diff --git a/nvim/init.lua b/nvim/init.lua
new file mode 100755
index 0000000..bb006d6
--- /dev/null
+++ b/nvim/init.lua
@@ -0,0 +1,49 @@
+require "paq" {
+    'ackyshake/vimcompletesme';
+    'ctrlpvim/ctrlp.vim';
+    'dense-analysis/ale';
+    'dracula/vim';
+    'easymotion/vim-easymotion';
+    'godlygeek/tabular';
+    'lervag/vimtex';
+    'lewis6991/gitsigns.nvim';
+    'lukas-reineke/indent-blankline.nvim';
+    'luukvbaal/nnn.nvim';
+    'RobertAudi/fish.vim';
+    'tpope/vim-commentary';
+    'tpope/vim-sensible';
+    'tpope/vim-surround';
+    'vim-airline/vim-airline';
+}
+require("nnn").setup()
+require("gitsigns").setup()
+
+vim.opt.background = "dark"
+vim.opt.clipboard = "unnamedplus"
+vim.opt.colorcolumn = "85"
+vim.opt.mouse = "a"
+vim.opt.shiftwidth = 4
+vim.opt.textwidth = 0
+vim.opt.wrapmargin = 0
+
+vim.opt.cursorline = true
+vim.opt.expandtab = true
+vim.opt.ignorecase = true
+vim.opt.linebreak = true
+vim.opt.number = true
+vim.opt.smartcase = true
+vim.opt.smartindent = true
+vim.opt.termguicolors = true
+vim.opt.wrap = false
+
+vim.keymap.set('', '<F7>', 'mzgg=G`z')
+vim.keymap.set('', 'r', '"_d')
+
+vim.cmd [[
+autocmd FileType * se tw=0
+colorscheme dracula
+command Q q!
+filetype plugin indent on
+syntax enable
+PaqClean
+]]
diff --git a/nvim/init.vim b/nvim/init.vim
deleted file mode 100755
index 213ab90..0000000
--- a/nvim/init.vim
+++ /dev/null
@@ -1,42 +0,0 @@
-call plug#begin('~/.local/share/nvim/plugged')
-Plug 'ackyshake/vimcompletesme'
-Plug 'airblade/vim-gitgutter'
-Plug 'ctrlpvim/ctrlp.vim'
-Plug 'dense-analysis/ale'
-Plug 'dracula/vim'
-Plug 'easymotion/vim-easymotion'
-Plug 'godlygeek/tabular'
-Plug 'lervag/vimtex'
-Plug 'lukas-reineke/indent-blankline.nvim'
-Plug 'RobertAudi/fish.vim'
-Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-sensible'
-Plug 'tpope/vim-surround'
-Plug 'vim-airline/vim-airline'
-call plug#end()
-
-se background=dark
-se clipboard=unnamedplus
-se colorcolumn=85
-se cursorline
-se expandtab
-se formatoptions+=j
-se ignorecase
-se linebreak
-se mouse=a
-se nowrap
-se number
-se shiftwidth=4
-se smartcase
-se smartindent
-se termguicolors
-se textwidth=0
-se wrapmargin=0
-
-autocmd FileType * se tw=0
-colorscheme dracula
-command Q q!
-filetype plugin indent on
-syntax enable
-map <F7> mzgg=G`z
-map r "_d