upd

lua/colors.lua

@@ -49,5 +49,3 @@ espresso.setup({
     color_overrides = color_overrides,
     integrations = integrations,
 })
-
-

lua/keymap.lua

@@ -23,7 +23,7 @@ local keymaps = {
   { 'n', 'N', 'Nzzzv', { noremap = true } },
 
   -- Telescope mappings
-  { 'n', '<leader>ff', '<cmd>Telescope find_files<CR>' },
+  { 'n', '<leader>ff', "<cmd>lua require('telescope.builtin').find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!.git' }})<CR>" },
   { 'n', '<leader>fb', '<cmd>Telescope buffers<CR>' },
   { 'n', '<leader>fh', '<cmd>Telescope help_tags<CR>' },
   { 'n', '<leader>fg', '<cmd>Telescope live_grep<CR>' },

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' })

lua/plug.lua

@@ -3,37 +3,60 @@ local pack = require 'pack'
 local plugins = {
     'catppuccin/nvim',
     'nvim-treesitter/nvim-treesitter',
-    { url = 'nvim-telescope/telescope.nvim',
-      dependencies = { 'nvim-lua/plenary.nvim' },
-      setup = true },
 
-    { url = 'renerocksai/telekasten.nvim',
+    {
+        url = 'OXY2DEV/markview.nvim',
+        setup = true
+    },
+
+    {
+        url = 'lewis6991/gitsigns.nvim',
+        setup = true
+    },
+
+    {
+        url = 'nvim-telescope/telescope.nvim',
+        dependencies = { 'nvim-lua/plenary.nvim' },
+        setup = true
+    },
+
+    {
+        url = 'renerocksai/telekasten.nvim',
         dependencies = { 'nvim-telescope/telescope.nvim' },
         setup = function()
             require('telekasten').setup({
                 home = vim.fn.expand("~/zettelkasten"),
             })
-      end },
+        end
+    },
 
-	{ url = 'echasnovski/mini.cursorword',
-	  setup = true },
+    {
+        url = 'echasnovski/mini.cursorword',
+        setup = true
+    },
 
-	{ url = 'echasnovski/mini.pick',
-	  setup = true },
+    {
+        url = 'echasnovski/mini.starter',
+        setup = true
+    },
 
-	{ url = 'echasnovski/mini.starter',
-	  setup = true },
+    {
+        url = 'echasnovski/mini.trailspace',
+        setup = true
+    },
 
-	{ url = 'echasnovski/mini.trailspace',
-	  setup = true },
+    {
+        url = 'stevearc/oil.nvim',
+        setup = true
+    },
 
-	{ url = 'stevearc/oil.nvim',
-	  setup = true },
+    {
+        url = 'svampkorg/moody.nvim',
+        setup = true
+    },
 
-	{ url = 'svampkorg/moody.nvim',
-	  setup = true },
-
-	{ url = 'greggh/claude-code.nvim',
+    {
+        url = 'greggh/claude-code.nvim',
         setup = function()
             require("claude-code").setup({
                 window = {
@@ -48,9 +71,11 @@ local plugins = {
                     },
                 },
             })
-	  end },
+        end
+    },
 
-	{ url = 'nvim-lualine/lualine.nvim',
+    {
+        url = 'nvim-lualine/lualine.nvim',
         dependencies = { 'nvim-tree/nvim-web-devicons' },
         setup = function()
             require('lualine').setup({
@@ -59,18 +84,27 @@ local plugins = {
                     component_separators = { left = '', right = '' },
                 }
             })
-	  end },
+        end
+    },
 
-	{ url = 'williamboman/mason.nvim',
+    {
+        url = 'williamboman/mason.nvim',
         dependencies = {
-	    { url = 'williamboman/mason-lspconfig.nvim', setup = true },
             'neovim/nvim-lspconfig'
         },
-	  setup = true },
+        setup = true
+    },
 
-	{ url = 'Saghen/blink.cmp',
+    {
+        url = 'williamboman/mason-lspconfig.nvim',
+        setup = true
+    },
+
+    {
+        url = 'Saghen/blink.cmp',
         version = "v1.6.0",
-	  dependencies = { 'rafamadriz/friendly-snippets' }},
+        dependencies = { 'rafamadriz/friendly-snippets' }
+    },
 }
 
 pack.setup(plugins)
@@ -114,7 +148,3 @@ local default_plugins = {
 for _, plug in ipairs(default_plugins) do
     vim.g['loaded_' .. plug] = 1
 end
-
-
-
-

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