Compare commits
	
		
			4 Commits
		
	
	
		
			424255161d
			...
			4c0d7806f5
		
	
	| Author | SHA1 | Date | 
|---|---|---|
| 
							
							
								
								 | 
						4c0d7806f5 | |
| 
							
							
								
								 | 
						ce9e0bee40 | |
| 
							
							
								
								 | 
						c830f956be | |
| 
							
							
								
								 | 
						a227d79da4 | 
| 
						 | 
					@ -9,10 +9,12 @@ local function map(mode, lhs, rhs, opts)
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
map("i", "jk", "<esc>") -- remap escape
 | 
					map("i", "jk", "<esc>") -- remap escape
 | 
				
			||||||
map("n", "<leader>n", ":Neotree toggle<cr>") --open Nerdtree
 | 
					-- map("n", "<leader>n", ":Neotree toggle<cr>") --open Nerdtree
 | 
				
			||||||
 | 
					
 | 
				
			||||||
map("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
 | 
					map("n", "<left>", '<cmd>echo "Use h to move!!"<CR>')
 | 
				
			||||||
map("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')
 | 
					map("n", "<right>", '<cmd>echo "Use l to move!!"<CR>')
 | 
				
			||||||
map("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
 | 
					map("n", "<up>", '<cmd>echo "Use k to move!!"<CR>')
 | 
				
			||||||
map("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
 | 
					map("n", "<down>", '<cmd>echo "Use j to move!!"<CR>')
 | 
				
			||||||
map("n", "<leader>z", ":ZenMode<cr>") --open ZenMode (distraction-free)
 | 
					map("n", "<leader>z", ":ZenMode<cr>") --open ZenMode (distraction-free)
 | 
				
			||||||
 | 
					map("n", "<leader>l", ":LazyGit<cr>") -- open LazyGit
 | 
				
			||||||
 | 
					map("n", "<leader>f", ":lua MiniFiles.open()<cr>")
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -41,4 +41,6 @@ vim.opt.scrolloff = 10
 | 
				
			||||||
 | 
					
 | 
				
			||||||
vim.opt.foldmethod = "expr"
 | 
					vim.opt.foldmethod = "expr"
 | 
				
			||||||
vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 | 
					vim.opt.foldexpr = "v:lua.vim.treesitter.foldexpr()"
 | 
				
			||||||
vim.opt.foldtext = "v:lua.vim.treesitter.foldtext()"
 | 
					vim.o.foldtext = ""
 | 
				
			||||||
 | 
					vim.o.fillchars = "fold: "
 | 
				
			||||||
 | 
					vim.o.foldenable = false
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -18,5 +18,6 @@ return { -- Collection of various small independent plugins/modules
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		-- ... and there is more!
 | 
							-- ... and there is more!
 | 
				
			||||||
		--  Check out: https://github.com/echasnovski/mini.nvim
 | 
							--  Check out: https://github.com/echasnovski/mini.nvim
 | 
				
			||||||
 | 
							require("mini.files").setup()
 | 
				
			||||||
	end,
 | 
						end,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,23 +1,23 @@
 | 
				
			||||||
return {
 | 
					return {
 | 
				
			||||||
	{
 | 
						{
 | 
				
			||||||
		"nvim-neo-tree/neo-tree.nvim",
 | 
							-- "nvim-neo-tree/neo-tree.nvim",
 | 
				
			||||||
		branch = "v3.x",
 | 
							-- branch = "v3.x",
 | 
				
			||||||
		dependencies = {
 | 
							-- dependencies = {
 | 
				
			||||||
			"nvim-lua/plenary.nvim",
 | 
							-- 	"nvim-lua/plenary.nvim",
 | 
				
			||||||
			"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
 | 
							-- 	"nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
 | 
				
			||||||
			"MunifTanjim/nui.nvim",
 | 
							-- 	"MunifTanjim/nui.nvim",
 | 
				
			||||||
			-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
 | 
							-- 	-- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information
 | 
				
			||||||
		},
 | 
							-- },
 | 
				
			||||||
		init = function()
 | 
							-- init = function()
 | 
				
			||||||
			require("neo-tree").setup({
 | 
							-- 	require("neo-tree").setup({
 | 
				
			||||||
				filesystem = {
 | 
							-- 		filesystem = {
 | 
				
			||||||
					filtered_items = {
 | 
							-- 			filtered_items = {
 | 
				
			||||||
						visible = true, -- This is what you want: If you set this to `true`, all "hide" just mean "dimmed out"
 | 
							-- 				visible = true, -- This is what you want: If you set this to `true`, all "hide" just mean "dimmed out"
 | 
				
			||||||
						hide_dotfiles = false,
 | 
							-- 				hide_dotfiles = false,
 | 
				
			||||||
						hide_gitignored = true,
 | 
							-- 				hide_gitignored = true,
 | 
				
			||||||
					},
 | 
							-- 			},
 | 
				
			||||||
				},
 | 
							-- 		},
 | 
				
			||||||
			})
 | 
							-- 	})
 | 
				
			||||||
		end,
 | 
							-- end,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -4,78 +4,78 @@ return {
 | 
				
			||||||
		name = "rose-pine",
 | 
							name = "rose-pine",
 | 
				
			||||||
		priority = 1000,
 | 
							priority = 1000,
 | 
				
			||||||
		init = function()
 | 
							init = function()
 | 
				
			||||||
require("rose-pine").setup({
 | 
								require("rose-pine").setup({
 | 
				
			||||||
    variant = "auto", -- auto, main, moon, or dawn
 | 
									variant = "auto", -- auto, main, moon, or dawn
 | 
				
			||||||
    dark_variant = "main", -- main, moon, or dawn
 | 
									dark_variant = "main", -- main, moon, or dawn
 | 
				
			||||||
    dim_inactive_windows = false,
 | 
									dim_inactive_windows = false,
 | 
				
			||||||
    extend_background_behind_borders = true,
 | 
									extend_background_behind_borders = true,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    enable = {
 | 
									enable = {
 | 
				
			||||||
        terminal = true,
 | 
										terminal = true,
 | 
				
			||||||
        legacy_highlights = true, -- Improve compatibility for previous versions of Neovim
 | 
										legacy_highlights = true, -- Improve compatibility for previous versions of Neovim
 | 
				
			||||||
        migrations = true, -- Handle deprecated options automatically
 | 
										migrations = true, -- Handle deprecated options automatically
 | 
				
			||||||
    },
 | 
									},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    styles = {
 | 
									styles = {
 | 
				
			||||||
        bold = true,
 | 
										bold = true,
 | 
				
			||||||
        italic = true,
 | 
										italic = true,
 | 
				
			||||||
        transparency = false,
 | 
										transparency = false,
 | 
				
			||||||
    },
 | 
									},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    groups = {
 | 
									groups = {
 | 
				
			||||||
        border = "muted",
 | 
										border = "muted",
 | 
				
			||||||
        link = "iris",
 | 
										link = "iris",
 | 
				
			||||||
        panel = "surface",
 | 
										panel = "surface",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        error = "love",
 | 
										error = "love",
 | 
				
			||||||
        hint = "iris",
 | 
										hint = "iris",
 | 
				
			||||||
        info = "foam",
 | 
										info = "foam",
 | 
				
			||||||
        note = "pine",
 | 
										note = "pine",
 | 
				
			||||||
        todo = "rose",
 | 
										todo = "rose",
 | 
				
			||||||
        warn = "gold",
 | 
										warn = "gold",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        git_add = "foam",
 | 
										git_add = "foam",
 | 
				
			||||||
        git_change = "rose",
 | 
										git_change = "rose",
 | 
				
			||||||
        git_delete = "love",
 | 
										git_delete = "love",
 | 
				
			||||||
        git_dirty = "rose",
 | 
										git_dirty = "rose",
 | 
				
			||||||
        git_ignore = "muted",
 | 
										git_ignore = "muted",
 | 
				
			||||||
        git_merge = "iris",
 | 
										git_merge = "iris",
 | 
				
			||||||
        git_rename = "pine",
 | 
										git_rename = "pine",
 | 
				
			||||||
        git_stage = "iris",
 | 
										git_stage = "iris",
 | 
				
			||||||
        git_text = "rose",
 | 
										git_text = "rose",
 | 
				
			||||||
        git_untracked = "subtle",
 | 
										git_untracked = "subtle",
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        h1 = "iris",
 | 
										h1 = "iris",
 | 
				
			||||||
        h2 = "foam",
 | 
										h2 = "foam",
 | 
				
			||||||
        h3 = "rose",
 | 
										h3 = "rose",
 | 
				
			||||||
        h4 = "gold",
 | 
										h4 = "gold",
 | 
				
			||||||
        h5 = "pine",
 | 
										h5 = "pine",
 | 
				
			||||||
        h6 = "foam",
 | 
										h6 = "foam",
 | 
				
			||||||
    },
 | 
									},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    highlight_groups = {
 | 
									highlight_groups = {
 | 
				
			||||||
        -- Comment = { fg = "foam" },
 | 
										-- Comment = { fg = "foam" },
 | 
				
			||||||
        -- VertSplit = { fg = "muted", bg = "muted" },
 | 
										-- VertSplit = { fg = "muted", bg = "muted" },
 | 
				
			||||||
	Folded = { fg = "muted", bg = "rose" }
 | 
										Folded = { fg = "foam", bg = "highlight_med" },
 | 
				
			||||||
    },
 | 
									},
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    before_highlight = function(group, highlight, palette)
 | 
									before_highlight = function(group, highlight, palette)
 | 
				
			||||||
        -- Disable all undercurls
 | 
										-- Disable all undercurls
 | 
				
			||||||
        -- if highlight.undercurl then
 | 
										-- if highlight.undercurl then
 | 
				
			||||||
        --     highlight.undercurl = false
 | 
										--     highlight.undercurl = false
 | 
				
			||||||
        -- end
 | 
										-- end
 | 
				
			||||||
        --
 | 
										--
 | 
				
			||||||
        -- Change palette colour
 | 
										-- Change palette colour
 | 
				
			||||||
        -- if highlight.fg == palette.pine then
 | 
										-- if highlight.fg == palette.pine then
 | 
				
			||||||
        --     highlight.fg = palette.foam
 | 
										--     highlight.fg = palette.foam
 | 
				
			||||||
        -- end
 | 
										-- end
 | 
				
			||||||
    end,
 | 
									end,
 | 
				
			||||||
})
 | 
								})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
vim.cmd("colorscheme rose-pine")
 | 
								vim.cmd("colorscheme rose-pine")
 | 
				
			||||||
-- vim.cmd("colorscheme rose-pine-main")
 | 
								-- vim.cmd("colorscheme rose-pine-main")
 | 
				
			||||||
-- vim.cmd("colorscheme rose-pine-moon")
 | 
								-- vim.cmd("colorscheme rose-pine-moon")
 | 
				
			||||||
-- vim.cmd("colorscheme rose-pine-dawn")
 | 
								-- vim.cmd("colorscheme rose-pine-dawn")
 | 
				
			||||||
			vim.cmd.colorscheme("rose-pine-main")
 | 
								vim.cmd.colorscheme("rose-pine-main")
 | 
				
			||||||
		end,
 | 
							end,
 | 
				
			||||||
	},
 | 
						},
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,5 +1,5 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  "name": "ajs-nvim",
 | 
					 f "name": "ajs-nvim",
 | 
				
			||||||
  "lockfileVersion": 3,
 | 
					  "lockfileVersion": 3,
 | 
				
			||||||
  "requires": true,
 | 
					  "requires": true,
 | 
				
			||||||
  "packages": {
 | 
					  "packages": {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue