From c3e3c3ad0de45ad6e9ec430c56fe757d36d5fcff Mon Sep 17 00:00:00 2001
From: Tyrel Souza <tyrelsouza@gmail.com>
Date: Mon, 2 Jan 2023 16:08:34 -0500
Subject: [PATCH] makefile and fix plugins

---
 Makefile                         |  40 ++++++++++++
 home/config/nvim/lua/plugins.lua | 103 ++++++++++++++-----------------
 2 files changed, 85 insertions(+), 58 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..06a9a50
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,40 @@
+## Setup
+.PHONY: rebuild-macos
+
+## Management
+
+git-add:
+	git add .
+
+update: update-neovim
+
+update-os:
+	sudo nixos-rebuild switch
+
+update-homemanager:
+	home-manager switch
+
+update-neovim:
+	nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
+
+outdated: sync
+	sudo nixos-rebuild dry-build --upgrade
+
+sync:
+	sudo nix-channel --update
+	nix-channel --update
+
+clean:
+	sudo nix-collect-garbage --delete-older-than 7d
+	home-manager expire-generations "-7 days"
+
+sup: # What's new?
+	nix-shell -p nvd --run 'nvd diff $$(ls -dv /nix/var/nix/profiles/system-*-link | tail -2)'
+
+rebuild-macos: git-add
+	./result/sw/bin/darwin-rebuild switch --flake _macos
+
+rebuild-ubuntu: git-add
+	NIX_PATH=nixpkgs=/nix/var/nix/profiles/per-user/tyrel/channels/nixpkgs:/nix/var/nix/profiles/per-user/tyrel/channels
+	nix run ./_ubuntu switch -vv
+	home-manager switch --flake ./_ubuntu
diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua
index 5fe6abe..5350799 100644
--- a/home/config/nvim/lua/plugins.lua
+++ b/home/config/nvim/lua/plugins.lua
@@ -1,66 +1,53 @@
 vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]])
 
 return function(use)
-	local parser_install_dir = vim.fn.stdpath("cache") .. "/treesitters"
-	vim.fn.mkdir(parser_install_dir, "p")
-        -- Prevents reinstall of treesitter plugins every boot
-        vim.opt.runtimepath:append(parser_install_dir)
+  -- Prevents reinstall of treesitter plugins every boot
+  local parser_install_dir = vim.fn.stdpath("cache") .. "/treesitters"
+  vim.fn.mkdir(parser_install_dir, "p")
+  vim.opt.runtimepath:append(parser_install_dir)
 
-	   -- Treesitter is managed by the package config, we just manage configs/deps here
-	   use({ "nvim-treesitter/nvim-treesitter-refactor" })
-       use({ "RRethy/nvim-treesitter-textsubjects" })
+  -- Treesitter is managed by the package config, we just manage configs/deps here
+  use({ "nvim-treesitter/nvim-treesitter-refactor" })
+  use({ "RRethy/nvim-treesitter-textsubjects" })
 
-        require("nvim-treesitter.configs").setup({
-        	-- highlight = { enable = true, disable = { "lua" } },
-        	-- indent = { enable = true },
-        	-- refactor = { highlight_definitions = { enable = true } },
-        	-- incremental_selection = { enable = true },
-        	-- matchup = { enable = true },
-        	-- textsubjects = {
-        	-- 	enable = true,
-        	-- 	prev_selection = ",",
-        	-- 	keymaps = {
-        	-- 		["."] = "textsubjects-smart",
-        	-- 	},
-        	-- },
-            parser_install_dir = parser_install_dir,
-        })
+  require("nvim-treesitter.configs").setup({
+    parser_install_dir = parser_install_dir,
+  })
 
-        use({'atelierbram/vim-colors_atelier-schemes'})
-        use({'robertmeta/nofrils'})
-        use({'vim-test/vim-test'})
-        use({'hashivim/vim-terraform'})
-        use({'rmagatti/auto-session'})
-        use({'rmagatti/session-lens',
-            config = function() require'session-lens'.setup { path_display={'shorten'} } end
-        })
-        use({'ludovicchabant/vim-gutentags'})
-        -- use({'ervandew/supertab'})
-        use({'preservim/nerdtree'})
-        use({'liuchengxu/space-vim-dark'})
-        use({'junegunn/fzf', dir='~/.fzf'})
-        use({'junegunn/fzf.vim'})
-        use({'mhinz/vim-startify'})
-        use({'jeetsukumaran/vim-buffergator'})
-        use({'ap/vim-buftabline'})
-        use({'airblade/vim-gitgutter'})
-        use({'majutsushi/tagbar'})
-        use {
-          'nvim-lualine/lualine.nvim',
-          requires = { 'kyazdani42/nvim-web-devicons', opt = true }
-        }
-        use({
-            'nvim-telescope/telescope.nvim',
-            config = function () require('telescope').setup{ file_ignore_patterns = {"node_modules","./venv/"} } end
-        })
-        use({'thoughtbot/vim-rspec'})
-        use({'voldikss/vim-floaterm'})
-        use({'fatih/vim-go'})
-        use({'whatyouhide/vim-gotham'})
-        use({'nanotech/jellybeans.vim'})
-        use({'sickill/vim-monokai'})
-        use({'tpope/vim-fugitive'})
-        use({'tpope/vim-rhubarb'})
-        use({'gf3/peg.vim'})
+  use({'atelierbram/vim-colors_atelier-schemes'})
+  use({'robertmeta/nofrils'})
+  use({'vim-test/vim-test'})
+  use({'hashivim/vim-terraform'})
+  use({'rmagatti/auto-session'})
+  use({'ludovicchabant/vim-gutentags'})
+  -- use({'ervandew/supertab'})
+  use({'preservim/nerdtree'})
+  use({'liuchengxu/space-vim-dark'})
+  use({'junegunn/fzf', dir='~/.fzf'})
+  use({'junegunn/fzf.vim'})
+  use({'mhinz/vim-startify'})
+  use({'jeetsukumaran/vim-buffergator'})
+  use({'ap/vim-buftabline'})
+  use({'airblade/vim-gitgutter'})
+  use({'majutsushi/tagbar'})
+  use {
+    'nvim-lualine/lualine.nvim',
+    requires = { 'kyazdani42/nvim-web-devicons', opt = true }
+  }
+  use({'voldikss/vim-floaterm'})
+  use({'fatih/vim-go'})
+  use({'whatyouhide/vim-gotham'})
+  use({'nanotech/jellybeans.vim'})
+  use({'sickill/vim-monokai'})
+  use({'tpope/vim-fugitive'})
+  use({'tpope/vim-rhubarb'})
+  use({'gf3/peg.vim'})
+  use({'nvim-lua/plenary.nvim'})
+
+
+  use({
+    'nvim-telescope/telescope.nvim',
+    config = function () require('telescope').setup{ file_ignore_patterns = {"node_modules","./venv/"} } end
+  })
 
 end