Add theme-set/switching logic, and minor nvim, tmux, obsidian changes
This commit is contained in:
		@@ -4,8 +4,12 @@ return {
 | 
			
		||||
        branch = "harpoon2", -- https://github.com/ThePrimeagen/harpoon/tree/harpoon2
 | 
			
		||||
        dependencies = { "nvim-lua/plenary.nvim" },
 | 
			
		||||
        config = function()
 | 
			
		||||
            local harpoon = require("harpoon")
 | 
			
		||||
            harpoon:setup()
 | 
			
		||||
            require("harpoon"):setup({
 | 
			
		||||
                settings = {
 | 
			
		||||
                    save_on_toggle = true,
 | 
			
		||||
				    sync_on_ui_close = true,
 | 
			
		||||
                }
 | 
			
		||||
            })
 | 
			
		||||
        end,
 | 
			
		||||
    },
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,10 +1,7 @@
 | 
			
		||||
return {
 | 
			
		||||
    -- TODO: decide which of these i won't be using, then remove from this file
 | 
			
		||||
    {
 | 
			
		||||
        "ellisonleao/gruvbox.nvim",
 | 
			
		||||
        name = "gruvbox",
 | 
			
		||||
        -- lazy = false,
 | 
			
		||||
        -- priority = 1000,
 | 
			
		||||
        opts = {
 | 
			
		||||
            terminal_colors = true, -- add neovim terminal colors
 | 
			
		||||
            undercurl = true,
 | 
			
		||||
@@ -30,13 +27,13 @@ return {
 | 
			
		||||
        },
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
        -- TODO: decide if i want rose-pine, remove from file if not
 | 
			
		||||
        "rose-pine/neovim",
 | 
			
		||||
        name = "rose-pine",
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
        -- TODO: decide if i want tokyonight, remove from file if not
 | 
			
		||||
        "folke/tokyonight.nvim",
 | 
			
		||||
        lazy = false,
 | 
			
		||||
        priority = 1000,
 | 
			
		||||
        opts = {
 | 
			
		||||
            style = "night", -- "night", "storm", "moon", "day"
 | 
			
		||||
            styles = {
 | 
			
		||||
@@ -70,8 +67,4 @@ return {
 | 
			
		||||
            require('bamboo').load()
 | 
			
		||||
        end,
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
        dir = os.getenv('DIR_GIT_PROJECTS') .. "/other/omarchy-pina-theme/pina.nvim",
 | 
			
		||||
        name = "pina",
 | 
			
		||||
    },
 | 
			
		||||
}
 | 
			
		||||
@@ -40,7 +40,7 @@ return {
 | 
			
		||||
                },
 | 
			
		||||
            })
 | 
			
		||||
 | 
			
		||||
        -- TODO: decide if needed/wanted
 | 
			
		||||
            -- TODO: decide if needed/wanted
 | 
			
		||||
            -- local treesitter_parser_config = require("nvim-treesitter.parsers").get_parser_configs()
 | 
			
		||||
            -- treesitter_parser_config.templ = {
 | 
			
		||||
            --     install_info = {
 | 
			
		||||
@@ -53,21 +53,22 @@ return {
 | 
			
		||||
            -- vim.treesitter.language.register("templ", "templ")
 | 
			
		||||
        end
 | 
			
		||||
    },
 | 
			
		||||
    {
 | 
			
		||||
        "nvim-treesitter/nvim-treesitter-context",
 | 
			
		||||
        after = "nvim-treesitter",
 | 
			
		||||
        opts = {
 | 
			
		||||
            enable = false, -- can enable/disable via manual command
 | 
			
		||||
            multiwindow = false,
 | 
			
		||||
            max_lines = 0, -- lines the window should span; x <= 0 means no limit
 | 
			
		||||
            min_window_height = 10, -- min window height to enable; x <= 0 means no limit
 | 
			
		||||
            line_numbers = true,
 | 
			
		||||
            multiline_threshold = 40, -- max lines to show for a single context
 | 
			
		||||
            trim_scope = 'outer', -- 'inner', 'outer'; discard lines if max_lines exceeded
 | 
			
		||||
            mode = 'cursor',  -- 'cursor', 'topline'; line used to calculate context
 | 
			
		||||
            separator = "-", -- 1 char, like '-'; only shown when >= 2 lines above
 | 
			
		||||
            zindex = 20, -- z-index of the context window
 | 
			
		||||
            on_attach = nil, -- (fun(buf: integer): boolean); return false to disable attaching
 | 
			
		||||
        },
 | 
			
		||||
    },
 | 
			
		||||
    -- {
 | 
			
		||||
    --     -- TODO: decide if needed/wanted
 | 
			
		||||
    --     "nvim-treesitter/nvim-treesitter-context",
 | 
			
		||||
    --     after = "nvim-treesitter",
 | 
			
		||||
    --     opts = {
 | 
			
		||||
    --         enable = false, -- can enable/disable via manual command
 | 
			
		||||
    --         multiwindow = false,
 | 
			
		||||
    --         max_lines = 0, -- lines the window should span; x <= 0 means no limit
 | 
			
		||||
    --         min_window_height = 10, -- min window height to enable; x <= 0 means no limit
 | 
			
		||||
    --         line_numbers = true,
 | 
			
		||||
    --         multiline_threshold = 40, -- max lines to show for a single context
 | 
			
		||||
    --         trim_scope = 'outer', -- 'inner', 'outer'; discard lines if max_lines exceeded
 | 
			
		||||
    --         mode = 'cursor',  -- 'cursor', 'topline'; line used to calculate context
 | 
			
		||||
    --         separator = "-", -- 1 char, like '-'; only shown when >= 2 lines above
 | 
			
		||||
    --         zindex = 20, -- z-index of the context window
 | 
			
		||||
    --         on_attach = nil, -- (fun(buf: integer): boolean); return false to disable attaching
 | 
			
		||||
    --     },
 | 
			
		||||
    -- },
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user