diff --git a/lua/colors.lua b/lua/colors.lua index 30a5e76..4a57854 100644 --- a/lua/colors.lua +++ b/lua/colors.lua @@ -1,53 +1,51 @@ local espresso = require('catppuccin') local color_overrides = { - macchiato = { - rosewater = '#F5B8AB', - flamingo = '#F29D9D', - pink = '#AD6FF7', - mauve = '#FF8F40', - red = '#E66767', - maroon = '#EB788B', - peach = '#FAB770', - yellow = '#FACA64', - green = '#70CF67', - teal = '#4CD4BD', - sky = '#61BDFF', - sapphire = '#4BA8FA', - blue = '#00BFFF', - lavender = '#00BBCC', - text = '#C1C9E6', - subtext1 = '#A3AAC2', - subtext0 = '#8E94AB', - overlay2 = '#7D8296', - overlay1 = '#676B80', - overlay0 = '#464957', - surface2 = '#3A3D4A', - surface1 = '#2F313D', - surface0 = '#1D1E29', - base = '#0b0b0b', - mantle = '#11111a', - crust = '#191926', - }, + macchiato = { + rosewater = '#F5B8AB', + flamingo = '#F29D9D', + pink = '#AD6FF7', + mauve = '#FF8F40', + red = '#E66767', + maroon = '#EB788B', + peach = '#FAB770', + yellow = '#FACA64', + green = '#70CF67', + teal = '#4CD4BD', + sky = '#61BDFF', + sapphire = '#4BA8FA', + blue = '#00BFFF', + lavender = '#00BBCC', + text = '#C1C9E6', + subtext1 = '#A3AAC2', + subtext0 = '#8E94AB', + overlay2 = '#7D8296', + overlay1 = '#676B80', + overlay0 = '#464957', + surface2 = '#3A3D4A', + surface1 = '#2F313D', + surface0 = '#1D1E29', + base = '#0b0b0b', + mantle = '#11111a', + crust = '#191926', + }, } local integrations = { - cmp = true, - gitsigns = true, - treesitter = true, - telescope = { - enabled = true, - style = 'nvchad', - }, - mini = { - enabled = true, - }, + cmp = true, + gitsigns = true, + treesitter = true, + telescope = { + enabled = true, + style = 'nvchad', + }, + mini = { + enabled = true, + }, } espresso.setup({ - flavour = 'macchiato', - color_overrides = color_overrides, - integrations = integrations, + flavour = 'macchiato', + color_overrides = color_overrides, + integrations = integrations, }) - - diff --git a/lua/keymap.lua b/lua/keymap.lua index 5667e52..a52f37e 100644 --- a/lua/keymap.lua +++ b/lua/keymap.lua @@ -23,7 +23,7 @@ local keymaps = { { 'n', 'N', 'Nzzzv', { noremap = true } }, -- Telescope mappings - { 'n', 'ff', 'Telescope find_files' }, + { 'n', 'ff', "lua require('telescope.builtin').find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!.git' }})" }, { 'n', 'fb', 'Telescope buffers' }, { 'n', 'fh', 'Telescope help_tags' }, { 'n', 'fg', 'Telescope live_grep' }, diff --git a/lua/options.lua b/lua/options.lua index 8b5a8ec..0fdc133 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -1,41 +1,46 @@ -vim.g.mapleader = ' ' -vim.o.autoindent = true -vim.o.backup = false -vim.o.clipboard = 'unnamedplus' --- vim.o.cmdheight = 0 -vim.o.compatible = false -vim.o.cursorline = true -vim.o.expandtab = true -vim.o.hlsearch = true -vim.o.ignorecase = true -vim.o.inccommand = 'split' -vim.o.incsearch = true -vim.o.list = true -vim.o.mouse = 'a' -vim.o.mouse = 'v' -vim.o.number = true -vim.o.relativenumber = true -vim.o.shiftwidth = 4 -vim.o.showmatch = true -vim.o.signcolumn = 'yes' --- vim.o.signcolumn = 'yes:1' -vim.o.smartindent = true -vim.o.smarttab = false -vim.o.softtabstop = 4 -vim.o.splitbelow = true -vim.o.splitkeep = 'screen' -vim.o.splitright = true -vim.o.startofline = false -vim.o.swapfile = false -vim.o.tabstop = 4 -vim.o.termguicolors = true -vim.o.ttyfast = true -vim.o.undofile = true -vim.o.wildmode = 'longest,list' -vim.o.winborder = 'rounded' -vim.o.wrap = false +local opts = { + autoindent = true, + backup = false, + clipboard = 'unnamedplus', + -- cmdheight = 0, + compatible = false, + cursorline = true, + expandtab = true, + hlsearch = true, + ignorecase = true, + inccommand = 'split', + incsearch = true, + list = true, + mouse = 'v', + number = true, + relativenumber = true, + shiftwidth = 4, + showmatch = true, + signcolumn = 'yes', + -- signcolumn = 'yes:1', + smartindent = true, + smarttab = false, + softtabstop = 4, + splitbelow = true, + splitkeep = 'screen', + splitright = true, + startofline = false, + swapfile = false, + tabstop = 4, + termguicolors = true, + ttyfast = true, + undofile = true, + wildmode = 'longest,list', + winborder = 'rounded', + wrap = false, + background = 'dark', +} -vim.o.background = 'dark' +for option, value in pairs(opts) do + vim.o[option] = value +end + +vim.g.mapleader = ' ' vim.cmd.colorscheme('catppuccin') vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' }) diff --git a/lua/plug.lua b/lua/plug.lua index 9ecd8b4..dfe04ad 100644 --- a/lua/plug.lua +++ b/lua/plug.lua @@ -1,76 +1,110 @@ local pack = require 'pack' local plugins = { - 'catppuccin/nvim', - 'nvim-treesitter/nvim-treesitter', - { url = 'nvim-telescope/telescope.nvim', - dependencies = { 'nvim-lua/plenary.nvim' }, - setup = true }, + 'catppuccin/nvim', + 'nvim-treesitter/nvim-treesitter', - { url = 'renerocksai/telekasten.nvim', - dependencies = { 'nvim-telescope/telescope.nvim' }, - setup = function() - require('telekasten').setup({ - home = vim.fn.expand("~/zettelkasten"), - }) - end }, + { + url = 'OXY2DEV/markview.nvim', + setup = true + }, - { url = 'echasnovski/mini.cursorword', - setup = true }, + { + url = 'lewis6991/gitsigns.nvim', + setup = true + }, - { url = 'echasnovski/mini.pick', - setup = true }, + { + url = 'nvim-telescope/telescope.nvim', + dependencies = { 'nvim-lua/plenary.nvim' }, + setup = true + }, - { url = 'echasnovski/mini.starter', - setup = true }, + { + url = 'renerocksai/telekasten.nvim', + dependencies = { 'nvim-telescope/telescope.nvim' }, + setup = function() + require('telekasten').setup({ + home = vim.fn.expand("~/zettelkasten"), + }) + end + }, - { url = 'echasnovski/mini.trailspace', - setup = true }, + { + url = 'echasnovski/mini.cursorword', + setup = true + }, - { url = 'stevearc/oil.nvim', - setup = true }, + { + url = 'echasnovski/mini.starter', + setup = true + }, - { url = 'svampkorg/moody.nvim', - setup = true }, + { + url = 'echasnovski/mini.trailspace', + setup = true + }, - { url = 'greggh/claude-code.nvim', - setup = function () - require("claude-code").setup({ - window = { - position = "float", - float = { - width = "70%", - height = "60%", - row = "60%", - col = "center", - relative = "editor", - border = "rounded", - }, - }, - }) - end }, + { + url = 'stevearc/oil.nvim', + setup = true + }, - { url = 'nvim-lualine/lualine.nvim', - dependencies = { 'nvim-tree/nvim-web-devicons' }, - setup = function () - require('lualine').setup({ - options = { - section_separators = { left = '', right = '' }, - component_separators = { left = '', right = '' }, - } - }) - end }, + { + url = 'svampkorg/moody.nvim', + setup = true + }, - { url = 'williamboman/mason.nvim', - dependencies = { - { url = 'williamboman/mason-lspconfig.nvim', setup = true }, - 'neovim/nvim-lspconfig' - }, - setup = true }, + { + url = 'greggh/claude-code.nvim', + setup = function() + require("claude-code").setup({ + window = { + position = "float", + float = { + width = "70%", + height = "60%", + row = "60%", + col = "center", + relative = "editor", + border = "rounded", + }, + }, + }) + end + }, - { url = 'Saghen/blink.cmp', - version = "v1.6.0", - dependencies = { 'rafamadriz/friendly-snippets' }}, + { + url = 'nvim-lualine/lualine.nvim', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + setup = function() + require('lualine').setup({ + options = { + section_separators = { left = '', right = '' }, + component_separators = { left = '', right = '' }, + } + }) + end + }, + + { + url = 'williamboman/mason.nvim', + dependencies = { + 'neovim/nvim-lspconfig' + }, + setup = true + }, + + { + url = 'williamboman/mason-lspconfig.nvim', + setup = true + }, + + { + url = 'Saghen/blink.cmp', + version = "v1.6.0", + dependencies = { 'rafamadriz/friendly-snippets' } + }, } pack.setup(plugins) @@ -83,38 +117,34 @@ vim.opt.conceallevel = 1 -- List of default plugins to disable local default_plugins = { - '2html_plugin', - 'getscript', - 'getscriptPlugin', - 'gzip', - 'logipat', - 'netrw', - 'netrwPlugin', - 'netrwSettings', - 'netrwFileHandlers', - 'matchit', - 'tar', - 'tarPlugin', - 'rrhelper', - 'spellfile_plugin', - 'vimball', - 'vimballPlugin', - 'zip', - 'zipPlugin', - 'tutor', - 'rplugin', - 'syntax', - 'synmenu', - 'optwin', - 'compiler', - 'bugreport', - 'ftplugin' + '2html_plugin', + 'getscript', + 'getscriptPlugin', + 'gzip', + 'logipat', + 'netrw', + 'netrwPlugin', + 'netrwSettings', + 'netrwFileHandlers', + 'matchit', + 'tar', + 'tarPlugin', + 'rrhelper', + 'spellfile_plugin', + 'vimball', + 'vimballPlugin', + 'zip', + 'zipPlugin', + 'tutor', + 'rplugin', + 'syntax', + 'synmenu', + 'optwin', + 'compiler', + 'bugreport', + 'ftplugin' } for _, plug in ipairs(default_plugins) do vim.g['loaded_' .. plug] = 1 end - - - - diff --git a/lua/term.lua b/lua/term.lua index f1ea579..15dbd21 100644 --- a/lua/term.lua +++ b/lua/term.lua @@ -16,7 +16,7 @@ function M.toggle_popup_terminal() -- Create or reuse terminal buffer if not popup_term.buf or not vim.api.nvim_buf_is_valid(popup_term.buf) then popup_term.buf = vim.api.nvim_create_buf(false, true) - vim.api.nvim_buf_set_option(popup_term.buf, 'buftype', 'terminal') + vim.bo[popup_term.buf].buftype = 'terminal' end -- Calculate popup size