surround

alacritty/.config/alacritty/alacritty.yml

@@ -1,5 +1,5 @@
 window:
-  opacity: 0.9
+  opacity: 0.85
 
 font:
   size: 12

nvim/.config/nvim/after/plugin/surround.lua

@@ -0,0 +1 @@
+require('mini.surround').setup()

nvim/.config/nvim/init.lua

@@ -18,8 +18,8 @@ require("clint") -- loads lua/clint/init.lua
 require('dap-python').setup('~/.virtualenvs/debugpy/bin/python')
 
 vim.opt.termguicolors = true
-vim.cmd.colorscheme 'kanagawa'
+vim.cmd.colorscheme 'ayu'
--- vim.cmd("highlight Normal guibg=none")
+vim.cmd("highlight Normal guibg=none")
--- vim.cmd("highlight NonText guibg=none")
+vim.cmd("highlight NonText guibg=none")
--- vim.cmd("highlight Normal ctermbg=none")
+vim.cmd("highlight Normal ctermbg=none")
--- vim.cmd("highlight NonText ctermbg=none")
+vim.cmd("highlight NonText ctermbg=none")

nvim/.config/nvim/lua/plugins/init.lua

@@ -15,7 +15,8 @@ return {
 	{ 'saadparwaiz1/cmp_luasnip' },
 
 	-- Linter
-	{ 'jose-elias-alvarez/null-ls.nvim',
+	{
+		'jose-elias-alvarez/null-ls.nvim',
 		config = function()
 			local nls = require("null-ls")
 			nls.setup({
@@ -28,7 +29,7 @@ return {
 
 	-- Debugging
 	{ 'mfussenegger/nvim-dap' },
-	{ 'rcarriga/nvim-dap-ui', config = true },
+	{ 'rcarriga/nvim-dap-ui',            config = true },
 	{ "mfussenegger/nvim-dap-python" },
 	{ "theHamsta/nvim-dap-virtual-text", config = true },
 
@@ -54,18 +55,24 @@ return {
 
 	-- Git
 	{ 'kdheepak/lazygit.nvim' },
-	{ 'lewis6991/gitsigns.nvim', config = {
+	{
-		signs = {
+		'lewis6991/gitsigns.nvim',
-			add          = { hl = 'GitSignsAdd', text = '+', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
+		config = {
-			change       = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
+			signs = {
-			delete       = { hl = 'GitSignsDelete', text = '-', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
+				add          = { hl = 'GitSignsAdd', text = '+', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
-			topdelete    = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr', linehl = 'GitSignsDeleteLn' },
+				change       = { hl = 'GitSignsChange', text = '│', numhl = 'GitSignsChangeNr',
-			changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr', linehl = 'GitSignsChangeLn' },
+					linehl = 'GitSignsChangeLn' },
-			untracked    = { hl = 'GitSignsAdd', text = '┆', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
+				delete       = { hl = 'GitSignsDelete', text = '-', numhl = 'GitSignsDeleteNr',
-		},
+					linehl = 'GitSignsDeleteLn' },
-		current_line_blame = true,
+				topdelete    = { hl = 'GitSignsDelete', text = '‾', numhl = 'GitSignsDeleteNr',
-		show_deleted = true,
+					linehl = 'GitSignsDeleteLn' },
-	}
+				changedelete = { hl = 'GitSignsChange', text = '~', numhl = 'GitSignsChangeNr',
+					linehl = 'GitSignsChangeLn' },
+				untracked    = { hl = 'GitSignsAdd', text = '┆', numhl = 'GitSignsAddNr', linehl = 'GitSignsAddLn' },
+			},
+			current_line_blame = true,
+			show_deleted = true,
+		}
 	},
 
 	-- Sessions
@@ -74,8 +81,9 @@ return {
 	-- SuperTab
 	{ 'ervandew/supertab' },
 
-	-- Vim-surround
+	-- Surround
-	{ 'tpope/vim-surround' },
+	-- { 'tpope/vim-surround' },
+	{ 'echasnovski/mini.surround',                 version = '*' },
 
 	-- Slime, for tmux repl-ing
 	{ 'jpalardy/vim-slime' },
@@ -83,17 +91,17 @@ return {
 	-- Telescope, fuzzy finding
 	{ 'nvim-lua/plenary.nvim' },
 	{ 'nvim-telescope/telescope.nvim' },
-	{ 'nvim-telescope/telescope-fzf-native.nvim', build = 'make' },
+	{ 'nvim-telescope/telescope-fzf-native.nvim',  build = 'make' },
 	{ "nvim-telescope/telescope-file-browser.nvim" },
 
 	-- Treesitter
-	{ 'nvim-treesitter/nvim-treesitter', build = ':TSUpdate' },
+	{ 'nvim-treesitter/nvim-treesitter',           build = ':TSUpdate' },
 
 	-- Registry history
 	{
 		"AckslD/nvim-neoclip.lua",
 		dependencies = {
-			{ 'kkharji/sqlite.lua', module = 'sqlite' },
+			{ 'kkharji/sqlite.lua',           module = 'sqlite' },
 			{ 'nvim-telescope/telescope.nvim' },
 		},
 		config = {
@@ -103,10 +111,10 @@ return {
 	},
 
 	-- Auto pairs
-	{ "windwp/nvim-autopairs", config = true }, -- See `config` under https://github.com/folke/lazy.nvim#-plugin-spec
+	{ "windwp/nvim-autopairs",     config = true }, -- See `config` under https://github.com/folke/lazy.nvim#-plugin-spec
 
 	-- Comment / uncomment
-	{ "numToStr/Comment.nvim", config = true },
+	{ "numToStr/Comment.nvim",     config = true },
 
 	-- Git Repo Telescope
 	{ 'cljoly/telescope-repo.nvim' },
@@ -129,14 +137,16 @@ return {
 	},
 
 	-- Object Explorer
-	{ 'simrat39/symbols-outline.nvim',
+	{
+		'simrat39/symbols-outline.nvim',
 		config = {
 			auto_preview = true,
 		}
 	},
 
 	-- Terminal
-	{ 'akinsho/toggleterm.nvim',
+	{
+		'akinsho/toggleterm.nvim',
 		version = "*",
 		config = {
 			open_mapping = [[<c-\>]],
@@ -162,7 +172,8 @@ return {
 	{ 'nvim-tree/nvim-web-devicons' },
 
 	-- Indent lines
-	{ "lukas-reineke/indent-blankline.nvim",
+	{
+		"lukas-reineke/indent-blankline.nvim",
 		config =
 		{
 			show_end_of_line = true,
@@ -173,7 +184,8 @@ return {
 	},
 
 	-- Cursor line
-	{ 'yamatsum/nvim-cursorline',
+	{
+		'yamatsum/nvim-cursorline',
 		config =
 		{
 			cursorline = {