colorscheme, telescope

12 files changed, 211 insertions, 105 deletions

diff --git a/lua/Snippets/luasniphelpers.lua b/lua/Snippets/luasniphelpers.lua
index 5aa3e44..26726ed 100644
--- a/lua/Snippets/luasniphelpers.lua
+++ b/lua/Snippets/luasniphelpers.lua
@@ -1,9 +1,9 @@
-local M = {}
-
 local ls = require("luasnip")
 local sn = ls.snippet_node
 local i = ls.insert_node
 
-M.line_begin = require("luasnip.extras.expand_conditions").line_begin
+helper = {}
+
+helper.line_begin = require("luasnip.extras.expand_conditions").line_begin
 
-return M
+return helper
diff --git a/lua/Snippets/luasniphelperslatex.lua b/lua/Snippets/luasniphelperslatex.lua
index a31e714..e0571cf 100644
--- a/lua/Snippets/luasniphelperslatex.lua
+++ b/lua/Snippets/luasniphelperslatex.lua
@@ -1,26 +1,20 @@
-local M = {}
+tex = {}
 
-M.in_mathzone = function()
-  return vim.fn['vimtex#syntax#in_mathzone']() == 1
+tex.in_mathzone = function()
+	return vim.fn['vimtex#syntax#in_mathzone']() == 1
 end
-M.in_text = function()
-  return not tex_utils.in_mathzone()
-end
-M.in_comment = function()
-  return vim.fn['vimtex#syntax#in_comment']() == 1
-end
-M.in_env = function(name)
-    local is_inside = vim.fn['vimtex#env#is_inside'](name)
-    return (is_inside[1] > 0 and is_inside[2] > 0)
-end
-M.in_equation = function()
-    return tex_utils.in_env('equation')
+
+tex.in_comment = function()
+	return vim.fn['vimtex#syntax#in_comment']() == 1
 end
-M.in_itemize = function()
-    return tex_utils.in_env('itemize')
+
+tex.in_env = function(name)
+	local is_inside = vim.fn['vimtex#env#is_inside'](name)
+	return (is_inside[1] > 0 and is_inside[2] > 0)
 end
-M.in_tikz = function()
-    return tex_utils.in_env('tikzpicture')
+
+tex.in_enumerate = function()
+	return tex.in_env('enumerate')
 end
 
-return M
+return tex
diff --git a/lua/Snippets/tex/chemistry.lua b/lua/Snippets/tex/chemistry.lua
index ee73154..a75536f 100644
--- a/lua/Snippets/tex/chemistry.lua
+++ b/lua/Snippets/tex/chemistry.lua
@@ -2,7 +2,7 @@ local tex = require('Snippets.luasniphelperslatex')
 local helper = require('Snippets.luasniphelpers')
 
 return {
-	s({ trig = 'chg', snippetType = 'autosnippet' },
+	s({ trig = 'chmr', snippetType = 'autosnippet' },
 		fmta(
 			'\\ch{ <> ->>[ <> ][ <> ] <> }\\par',
 			{
@@ -14,7 +14,7 @@ return {
 		)
 	),
 
-	s({ trig = 'chs', snippetType = 'autosnippet' },
+	s({ trig = 'chmi', snippetType = 'autosnippet' },
 		fmta(
 			'\\ch{ <> }',
 			{
@@ -22,4 +22,14 @@ return {
 			}
 		)
 	),
+
+	s({ trig = 'chrg', snippetType = 'autosnippet' },
+		fmta(
+			'\\charge{<>}{<>}',
+			{
+				i(1),
+				i(2),
+			}
+		)
+	),
 }
diff --git a/lua/Snippets/tex/enumerate.lua b/lua/Snippets/tex/enumerate.lua
new file mode 100644
index 0000000..7677c9c
--- /dev/null
+++ b/lua/Snippets/tex/enumerate.lua
@@ -0,0 +1,24 @@
+local tex = require('Snippets.luasniphelperslatex')
+local helper = require('Snippets.luasniphelpers')
+
+return {
+
+	s({ trig = 'enu', snippetType = 'autosnippet' },
+		fmta(
+			[[
+\begin{enumerate}
+	\item <>
+\end{enumerate}
+]],
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'ite', snippetType = 'autosnippet' },
+		{ t('\\item') },
+		{ condition = tex.in_enumerate * helper.line_begin }
+	),
+}
diff --git a/lua/Snippets/tex/environments.lua b/lua/Snippets/tex/environments.lua
index f2eb15a..3e8b543 100644
--- a/lua/Snippets/tex/environments.lua
+++ b/lua/Snippets/tex/environments.lua
@@ -19,20 +19,6 @@ return {
 		{ condition = helper.line_begin }
 	),
 
-	s({ trig = 'enu', snippetType = 'autosnippet' },
-		fmta(
-			[[
-\begin{enumerate}
-	\item <>
-\end{enumerate}
-]],
-			{
-				i(1),
-			}
-		),
-		{ condition = helper.line_begin }
-	),
-
 	s({ trig = 'ali', snippetType = 'autosnippet' },
 		fmta(
 			[[
diff --git a/lua/Snippets/tex/figures.lua b/lua/Snippets/tex/figures.lua
index f95d874..4adc1b4 100644
--- a/lua/Snippets/tex/figures.lua
+++ b/lua/Snippets/tex/figures.lua
@@ -9,7 +9,7 @@ return {
 \begin{figure}[h]
 	\centering
 	\chemfig {
-	<>
+		<>
 	}
 	\caption{<>}
 	\label{fig:<>}
diff --git a/lua/Snippets/tex/general.lua b/lua/Snippets/tex/general.lua
index e5514ab..b53f80c 100644
--- a/lua/Snippets/tex/general.lua
+++ b/lua/Snippets/tex/general.lua
@@ -2,39 +2,32 @@ local tex = require('Snippets.luasniphelperslatex')
 local helper = require('Snippets.luasniphelpers')
 
 return {
-s({ trig = 'new', snippetType = 'autosnippet' },
-		{
-			t('\\newpage'),
-		},
-		{ condition = helper.line_begin }
-	),
-	s({ trig = 'sec', snippetType = 'autosnippet' },
+
+	s({ trig = 'vsp', snippetType = 'autosnippet' },
 		fmta(
-			'\\section*{<>}',
+			'\\vspace{<>}',
 			{
 				i(1),
 			}
-		),
-		{ condition = helper.line_begin }
+		)
 	),
-	s({ trig = 'ssec', snippetType = 'autosnippet' },
+
+	s({ trig = 'hsp', snippetType = 'autosnippet' },
 		fmta(
-			'\\subsection*{<>}',
+			'\\hspace{<>}',
 			{
 				i(1),
 			}
-		),
-		{ condition = helper.line_begin }
+		)
 	),
-	s({ trig = 'nsec', snippetType = 'autosnippet' },
-		fmta(
-			'\\newpage\\section*{<>}',
-			{
-				i(1),
-			}
-		),
+
+	s({ trig = 'new', snippetType = 'autosnippet' },
+		{
+			t('\\newpage'),
+		},
 		{ condition = helper.line_begin }
 	),
+
 	s({ trig = 'hh', snippetType = 'autosnippet' },
 		fmta(
 			'\\SI{<>}{<>}',
@@ -44,6 +37,7 @@ s({ trig = 'new', snippetType = 'autosnippet' },
 			}
 		)
 	),
+
 	s({ trig = 'bf', snippetType = 'autosnippet' },
 		fmta(
 			'\\textbf{<>}',
@@ -52,7 +46,8 @@ s({ trig = 'new', snippetType = 'autosnippet' },
 			}
 		)
 	),
-	s({ trig = 'cite', snippetType = 'autosnippet' },
+
+	s({ trig = 'cte', snippetType = 'autosnippet' },
 		fmta(
 			'\\supercite{<>}',
 			{
@@ -60,27 +55,4 @@ s({ trig = 'new', snippetType = 'autosnippet' },
 			}
 		)
 	),
-	s({ trig = 'ite', snippetType = 'autosnippet' },
-		{ t('\\item') },
-		{ condition = helper.line_begin }
-	),
-	s({ trig = 'upa', snippetType = 'autosnippet' },
-		fmta(
-			'\\usepackage{<>}',
-			{
-				i(1),
-			}
-		),
-		{ condition = helper.line_begin }
-	),
-	s({ trig = 'opa', snippetType = 'autosnippet' },
-		fmta(
-			'\\usepackage[<>]{<>}',
-			{
-				i(1),
-				i(2),
-			}
-		),
-		{ condition = helper.line_begin }
-	),
 }
diff --git a/lua/Snippets/tex/praeamble.lua b/lua/Snippets/tex/praeamble.lua
new file mode 100644
index 0000000..e0daa28
--- /dev/null
+++ b/lua/Snippets/tex/praeamble.lua
@@ -0,0 +1,26 @@
+local tex = require('Snippets.luasniphelperslatex')
+local helper = require('Snippets.luasniphelpers')
+
+return {
+
+	s({ trig = 'upa', snippetType = 'autosnippet' },
+		fmta(
+			'\\usepackage{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'opa', snippetType = 'autosnippet' },
+		fmta(
+			'\\usepackage[<>]{<>}',
+			{
+				i(1),
+				i(2),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+}
diff --git a/lua/Snippets/tex/sections.lua b/lua/Snippets/tex/sections.lua
new file mode 100644
index 0000000..432a424
--- /dev/null
+++ b/lua/Snippets/tex/sections.lua
@@ -0,0 +1,65 @@
+local helper = require('Snippets.luasniphelpers')
+local helper = require('Snippets.luasniphelpers')
+
+return {
+
+	s({ trig = 'sec', snippetType = 'autosnippet' },
+		fmta(
+			'\\section{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'nsec', snippetType = 'autosnippet' },
+		fmta(
+			'\\newpage\\section{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'ssec', snippetType = 'autosnippet' },
+		fmta(
+			'\\subsection{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'nssec', snippetType = 'autosnippet' },
+		fmta(
+			'\\newpage\\subsection{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'ssec', snippetType = 'autosnippet' },
+		fmta(
+			'\\newpage\\subsubsection{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+
+	s({ trig = 'nsssec', snippetType = 'autosnippet' },
+		fmta(
+			'\\newpage\\subsubsection{<>}',
+			{
+				i(1),
+			}
+		),
+		{ condition = helper.line_begin }
+	),
+}
diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua
index 1ecb70f..f27094d 100644
--- a/lua/config/keymaps.lua
+++ b/lua/config/keymaps.lua
@@ -6,7 +6,7 @@ return {
 		init = function()
 			vim.keymap.set('v', 'J', ":m '>+1<CR>gv=gv")
 			vim.keymap.set('v', 'K', ":m '<-2<CR>gv=gv")
-			vim.keymap.set('n', '<leader>f', function()
+			vim.keymap.set('n', '<leader>e', function()
 				vim.lsp.buf.format({ timeout_ms = 10000 })
 			end)
 			vim.keymap.set('n', '<leader>w', '<cmd>w<cr>')
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
index f2f5906..737e26e 100644
--- a/lua/plugins/colorscheme.lua
+++ b/lua/plugins/colorscheme.lua
@@ -4,9 +4,31 @@ return {
 		lazy = false,
 		priority = 1000,
 		config = function()
+			vim.opt.background = 'dark'
 			require('monokai-pro').setup({
-				filter = 'octagon',
-				background_clear = {},
+				override = function (c)
+					return {
+						TelescopePromptNormal = { bg = c.base.dimmed3},
+						TelescopePromptBorder = { bg = c.base.dimmed3, fg = c.base.dimmed3 },
+						TelescopeResultsNormal = { bg = c.base.dimmed5},
+						TelescopeResultsBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 },
+						TelescopePreviewNormal = { bg = c.base.dimmed5},
+						TelescopePreviewBorder = { bg = c.base.dimmed5, fg = c.base.dimmed5 },
+
+						TelescopePreviewDirectory = {
+							bg = c.prompt_bg,
+							fg = c.base.white,
+						},
+						TelescopePreviewDate = {
+							bg = c.prompt_bg,
+							fg = c.base.red,
+						},
+						TelescopePreviewHyphen = {
+							bg = c.prompt_bg,
+							fg = c.base.white,
+						},
+					}
+				end,
 			})
 			vim.cmd('colorscheme monokai-pro')
 		end,
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index 0efadfd..c8e1cd1 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -2,10 +2,10 @@ return {
 	{
 		'nvim-telescope/telescope.nvim',
 		keys = {
-			{ '<leader>pf', '<cmd>Telescope find_files<cr>', desc = 'find files' },
-			{ '<leader>pd', '<cmd>Telescope oldfiles<cr>',   desc = 'find oldfiles' },
-			{ '<leader>pg', '<cmd>Telescope live_grep<cr>',  desc = 'grep files' },
-			{ '<leader>pb', '<cmd>Telescope buffers<cr>',    desc = 'find buffers' },
+			{ '<leader>f', function() require('telescope.builtin').find_files() end, desc = 'find files' },
+			{ '<leader>g', function() require('telescope.builtin').live_grep() end, desc = 'find files' },
+			{ '<leader>d', function() require('telescope.builtin').oldfiles() end, desc = 'find oldfiles' },
+			{ '<leader>b', function() require('telescope.builtin').buffers() end, desc = 'find buffers' },
 		},
 		dependencies = {
 			'nvim-lua/plenary.nvim',
@@ -14,34 +14,41 @@ return {
 		},
 		opts = {
 			defaults = {
+				prompt_prefix = "   ",
+				entry_prefix = "  ",
+				selection_caret = "  ",
 				mappings = {
-					n = {
-						['q'] = function(...)
-							return require('telescope.actions').close(...)
-						end,
+					['n'] = {
+						['q'] = function(...) return require('telescope.actions').close(...) end,
+						['l'] = function(...) return require('telescope.actions').select_default(...) end,
 					}
 				},
 				layout_config = {
 					horizontal = {
 						prompt_position = 'top',
-						preview_width = 0.55,
+						preview_width = 0.5,
 						results_width = 0.8,
 					},
-					vertical = {
-						mirror = false,
-					},
-					width = 0.87,
-					height = 0.80,
+					width = 0.8,
+					height = 0.8,
 					preview_cutoff = 120,
+				}
+			},
+			extensions = {
+				file_browser = {
+					mappings = {
+						['n'] = {
+							['h'] = function(...) require('telescope').extensions.file_browser.actions.goto_parent_dir(...) end,
+						},
+					},
 				},
-				borderchars = { "█", " ", "▀", "█", "█", " ", " ", "▀" },
 			},
 		},
 	},
 	{
 		'nvim-telescope/telescope-file-browser.nvim',
 		keys = {
-			{ '<leader>pv', '<cmd>Telescope file_browser path=%:p:h select_buffer=true<cr>', desc = 'file tree' },
+			{ '<leader>v', '<cmd>Telescope file_browser path=%:p:h select_buffer=true<cr>', desc = 'file tree' },
 		},
 		dependencies = {
 			'nvim-telescope/telescope.nvim',