diff --git a/config/.config/ghostty/config b/config/.config/ghostty/config index d750a0e..0aeb910 100644 --- a/config/.config/ghostty/config +++ b/config/.config/ghostty/config @@ -3,7 +3,7 @@ font-family = "" # font-family = "PragmataPro Liga" # font-family = "BigBlueTermPlus Nerd Font" # font-family = "Olympe Mono Hacked" -font-family = "Iosevka Term SS12" +font-family = "Iosevka SS12" font-family = "Cascadia Code" font-family = "CaskaydiaCove Nerd Font" # font-family = "Terminess Nerd Font Mono" @@ -12,8 +12,10 @@ font-family = "CaskaydiaCove Nerd Font" # font-family = "Sudo" # theme = light:rose-pine-dawn,dark:rose-pine font-size = 14 -font-variation = wdth=100 -theme = light:xcodelight,dark:xcodedark +font-thicken = true +# font-variation = wdth=100 +# theme = light:xcodelight,dark:xcodedark +theme = light:nord-light,dark:nord # theme = Monokai Classic # window-decoration = false # gtk-adwaita = false diff --git a/config/.config/nvim/lazy-lock.json b/config/.config/nvim/lazy-lock.json index 2aea0f2..e2b571c 100644 --- a/config/.config/nvim/lazy-lock.json +++ b/config/.config/nvim/lazy-lock.json @@ -1,12 +1,12 @@ { "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, - "catppuccin": { "branch": "main", "commit": "9a9a875e979fe9d2b42423d056f944dd286d0280" }, + "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, "cellular-automaton.nvim": { "branch": "main", "commit": "1606e9d5d04ff254023c3f3c62842d065708d6d3" }, "compiler-explorer.nvim": { "branch": "master", "commit": "ee8e7a2808bdad67cd2acb61b5c9ffa7735c7ec9" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "dim.lua": { "branch": "main", "commit": "e7d7428d2d0bde97c6441ca9f04a1e9ac7c6d6bb" }, "dracula.nvim": { "branch": "main", "commit": "df528c869b09fbdc7578e6ccc7ff6faf44a2046d" }, - "dropbar.nvim": { "branch": "master", "commit": "418897fe7828b2749ca78056ec8d8ad43136b695" }, + "dropbar.nvim": { "branch": "master", "commit": "596f95e98a21e8fccf3db91fec481129eb82ff61" }, "everblush": { "branch": "main", "commit": "678f808d81801b983b6fb8296fb17ba1b2785d7c" }, "everforest": { "branch": "master", "commit": "28d59e29d972e21f2e802ce916f28dcab30697ae" }, "fennel.vim": { "branch": "main", "commit": "c6a9c035ca108cbb24273d96cd6277fb8fbc60b4" }, @@ -14,55 +14,52 @@ "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "gruvbox-material": { "branch": "master", "commit": "6a100833060d26cd3ab85c34c5f7154a1000c12f" }, - "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, - "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, + "gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "leap.nvim": { "branch": "main", "commit": "8b03b5d62d11cd9da5ea8be62ab8e9ff3fabab8f" }, + "leap.nvim": { "branch": "main", "commit": "e9cb442c0614a7e8185608f639e10c54e53bb083" }, "love2d.nvim": { "branch": "main", "commit": "25715394680590f56aab90390d430cab0dc46808" }, "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "melange-nvim": { "branch": "master", "commit": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce" }, "mellow.nvim": { "branch": "main", "commit": "0cb5476b506f8e71428e823919b69ecf34afe646" }, - "mini.nvim": { "branch": "main", "commit": "5d938b3a078a7eeae23ba9f04f180066ab8bd9ef" }, - "mini.pick": { "branch": "main", "commit": "82ec629ca108c7b96b8b9bb733d235b39e137690" }, + "mini.nvim": { "branch": "main", "commit": "0ffc2af38b3c5293076317b138635d6d7c80a40f" }, "monochrome.nvim": { "branch": "main", "commit": "2de78d9688ea4a177bcd9be554ab9192337d35ff" }, "monokai.nvim": { "branch": "master", "commit": "b8bd44d5796503173627d7a1fc51f77ec3a08a63" }, "moonlight.nvim": { "branch": "pure-lua", "commit": "e24e4218ec680b6396532808abf57ca0ada82e66" }, "moonscript-vim": { "branch": "master", "commit": "715c96c7c3b02adc507f84bf5754985460afc426" }, "nabla.nvim": { "branch": "master", "commit": "9b69b709063ccf40ac36fabb4fff7d90b3736475" }, "nelua.vim": { "branch": "main", "commit": "330f34d017df92dd1a1a7283e302982256e169db" }, - "neogit": { "branch": "master", "commit": "49d0527143fe748196ae9a20b8c9ff54cbf45fab" }, + "neogit": { "branch": "master", "commit": "4046f747739cf7e7b9aada447f3edc59c947b111" }, "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, "nord.nvim": { "branch": "master", "commit": "80c1e5321505aeb22b7a9f23eb82f1e193c12470" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-highlight-colors": { "branch": "main", "commit": "1ce0a09bfc28c7274e649d20927cea51e440b65c" }, - "nvim-lspconfig": { "branch": "master", "commit": "34c9ecfdcc19d579f51c072300a71445fbec9da8" }, + "nvim-lspconfig": { "branch": "master", "commit": "408cf07b97535825cca6f1afa908d98348712ba6" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-surround": { "branch": "main", "commit": "d56752df477ebd808cb82cea2fc68cf7455abb21" }, + "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, "nvim-unception": { "branch": "main", "commit": "df0e505f0f1371c49c2bcf993985962edb5a279d" }, - "nvim-web-devicons": { "branch": "master", "commit": "c2599a81ecabaae07c49ff9b45dcd032a8d90f1a" }, + "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, "oceanic-next": { "branch": "master", "commit": "09833f72d5ba23de2e8bcae18f479f326f5f677a" }, - "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, + "oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" }, "one-nvim": { "branch": "main", "commit": "faf6fb3f98fccbe009c3466f657a8fff84a5f956" }, "onedark.nvim": { "branch": "master", "commit": "de495fabe171d48aed5525f002d14414efcecbb2" }, "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "plantuml-syntax": { "branch": "master", "commit": "9d4900aa16674bf5bb8296a72b975317d573b547" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "range-highlight.nvim": { "branch": "master", "commit": "f54aec737f138e52c187a8bea77b41347fd86f12" }, - "rose-pine": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" }, + "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, "sherbet.nvim": { "branch": "master", "commit": "5c4166eff70ec551ae0023edfb89141b25cc18c6" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, "telescope-recent-files": { "branch": "main", "commit": "eb190c0baded1cbfa9d8767c817b054377683163" }, - "telescope-tabs": { "branch": "master", "commit": "d16fae006ba978ccc5c5579d40f358e12a0f8d30" }, - "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope-tabs": { "branch": "vim_ui_select", "commit": "f01bc722582fdcaa58ea37492b382ff109893d95" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, "tokyonight.nvim": { "branch": "main", "commit": "057ef5d260c1931f1dffd0f052c685dcd14100a3" }, - "twilight.nvim": { "branch": "main", "commit": "1584c0b0a979b71fd86b18d302ba84e9aba85b1b" }, "v-vim": { "branch": "master", "commit": "1dc1388bafb89072f8349dbd96f9462ae22237cb" }, "vim-colors-xcode": { "branch": "master", "commit": "6d449229bf29176448bd06377689d7a8db0d1bee" }, "vim-etlua": { "branch": "master", "commit": "bb2974d0134ce6da60c3be0d82d809976b859c1c" }, diff --git a/config/.config/nvim/lua/config/keymap.lua b/config/.config/nvim/lua/config/keymap.lua index d32f9fb..6accf44 100644 --- a/config/.config/nvim/lua/config/keymap.lua +++ b/config/.config/nvim/lua/config/keymap.lua @@ -2,25 +2,22 @@ local set = vim.keymap.set local setnx = function(key, command, desc) set({'n', 'x'}, key, command, { desc = desc }) end --- Telescope -local tele = require('telescope.builtin') -local telescope = require('telescope') -setnx('ff', tele.find_files, 'Find files') -setnx('f/', tele.grep_string, 'Search current word') -setnx('f?', tele.live_grep, 'Search in files') -setnx('fr', telescope.extensions.recent_files.pick, 'Find recent files') -setnx('b', tele.buffers, 'List buffers') -setnx('h', tele.help_tags, 'Search help') -setnx('m', tele.marks, 'Search marks') -setnx('q', tele.quickfix, 'Search quickfix list') -setnx('l', tele.loclist, 'Search location list') -setnx('j', tele.jumplist, 'Search jumplist') -setnx('r', tele.registers, 'Search registers') -setnx('s', tele.spell_suggest, 'List spelling suggestions') -setnx('M', tele.man_pages, 'Search man pages') +setnx('ff', Snacks.picker.files, 'Find files') +setnx('f/', Snacks.picker.grep_word, 'Search current word') +setnx('f?', Snacks.picker.grep, 'Search in files') +setnx('fr', Snacks.picker.recent, 'Find recent files') +setnx('b', Snacks.picker.buffers, 'List buffers') +setnx('h', Snacks.picker.help, 'Search help') +setnx('m', Snacks.picker.marks, 'Search marks') +setnx('q', Snacks.picker.qflist, 'Search quickfix list') +setnx('l', Snacks.picker.loclist, 'Search location list') +setnx('j', Snacks.picker.jumps, 'Search jumplist') +setnx('r', Snacks.picker.registers, 'Search registers') +setnx('s', Snacks.picker.spelling, 'List spelling suggestions') +setnx('M', Snacks.picker.man, 'Search man pages') setnx('t', require'telescope-tabs'.list_tabs, 'List tabs') -setnx('c', tele.colorscheme, 'Select colorscheme') +setnx('c', Snacks.picker.colorschemes, 'Select colorscheme') local neogit = require('neogit') setnx('op', 'Oil', 'Open file manager') @@ -28,7 +25,7 @@ setnx('oP', 'Oil --float', 'Open file manager in floating windo setnx('ot', 'term', 'Open terminal') setnx('oT', 'tabnew', 'Open new tab') setnx('of', 'enew', 'Open new file') -setnx('ow', 'Telescope workspaces', 'Open workspace') +-- setnx('ow', 'Telescope workspaces', 'Open workspace') setnx('ol', 'Lazy', 'Open Lazy') setnx('om', 'Mason', 'Open Mason') setnx('oc', 'cd ' .. vim.fn.stdpath('config') .. 'Oil .', 'Open neovim configuration') @@ -43,10 +40,10 @@ setnx('`', '\'', 'Goto mark without column') setnx('x', 'bd!', 'Close Current Buffer') -setnx('grR', tele.lsp_references, 'Search lsp references') -setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls') -setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls') -setnx('grd', tele.diagnostics, 'Show LSP diagnostics') +setnx('grR', Snacks.picker.lsp_references, 'Search lsp references') +-- setnx('grI', tele.lsp_incoming_calls, 'Find incoming function calls') +-- setnx('grO', tele.lsp_outgoing_calls, 'Find outgoing function calls') +setnx('grd', Snacks.picker.diagnostics, 'Show LSP diagnostics') setnx('grD', (function() local diag = true return function() @@ -54,23 +51,23 @@ setnx('grD', (function() vim.diagnostic.config({ update_in_insert = true, float = true, virtual_lines = diag}) end end)(), 'Toggle LSP diagnostics') -setnx('grs', tele.lsp_workspace_symbols, 'Show workspace symbols') -setnx('grS', tele.lsp_document_symbols, 'Show document symbols') -setnx('gri', tele.lsp_implementations, 'Goto implementation') -setnx('gd', tele.lsp_definitions, 'Goto definition') -setnx('gD', tele.lsp_type_definitions, 'Goto type definition') +setnx('grs', Snacks.picker.lsp_workspace_symbols, 'Show workspace symbols') +setnx('grS', Snacks.picker.lsp_symbols, 'Show document symbols') +setnx('gri', Snacks.picker.lsp_implementations, 'Goto implementation') +setnx('gd', Snacks.picker.lsp_definitions, 'Goto definition') +setnx('gD', Snacks.picker.lsp_type_definitions, 'Goto type definition') -setnx('gc', tele.git_commits, 'List git commits') -setnx('gb', tele.git_branches, 'List git branches') -setnx('gs', tele.git_status, 'Show git status') -setnx('gS', tele.git_stash, 'Show git stash') -setnx('gB', tele.git_bcommits, 'List buffers git commits') -setnx('gr', tele.git_bcommits_range, 'List buffers git commits over visual range') +setnx('gc', Snacks.picker.git_log, 'List git commits') +setnx('gb', Snacks.picker.git_branches, 'List git branches') +setnx('gs', Snacks.picker.git_status, 'Show git status') +setnx('gS', Snacks.picker.git_stash, 'Show git stash') +setnx('gB', Snacks.picker.git_log_file, 'List buffers git commits') +setnx('gr', Snacks.picker.git_log_line, 'List buffers git commits over visual range') setnx('n', require('nabla').popup, 'Show popup for nabla preview') setnx('p', '"+p', 'Paste from system clipboard') setnx('y', '"+y', 'Yank to system clipboard') -setnx('', '(leap)', 'Activate leap') -setnx('', '(leap-anywhere)', 'Activate leap anywhere') -setnx('gs', require('leap.remote').action, 'Activate remote leap') +setnx('gs', '(leap)', 'Activate leap') +setnx('g', '(leap-anywhere)', 'Activate leap anywhere') +setnx('gS', require('leap.remote').action, 'Activate remote leap') diff --git a/config/.config/nvim/lua/config/lazy.lua b/config/.config/nvim/lua/config/lazy.lua index ff6e006..0a8aebb 100644 --- a/config/.config/nvim/lua/config/lazy.lua +++ b/config/.config/nvim/lua/config/lazy.lua @@ -29,7 +29,7 @@ require("lazy").setup({ }, -- Configure any other settings here. See the documentation for more details. -- colorscheme that will be used when installing plugins. - install = { colorscheme = { "xcode" } }, + install = { colorscheme = { "nord" } }, -- automatically check for plugin updates checker = { enabled = false, notify = false }, }) diff --git a/config/.config/nvim/lua/config/set.lua b/config/.config/nvim/lua/config/set.lua index 71977fc..f8b5328 100644 --- a/config/.config/nvim/lua/config/set.lua +++ b/config/.config/nvim/lua/config/set.lua @@ -24,6 +24,8 @@ vim.opt.undofile = true vim.opt.hlsearch = true vim.opt.incsearch = true +vim.opt.ignorecase = true +vim.opt.smartcase = true vim.opt.termguicolors = true @@ -61,7 +63,9 @@ vim.g.netrw_keepdir = 0 vim.g.netrw_preview = 1 vim.g.netrw_alto = 0 -vim.cmd('colorscheme xcode') +vim.ui.select = Snacks.picker.select + +vim.cmd('colorscheme nord') vim.lsp.config('lua_ls', { settings = { diff --git a/config/.config/nvim/lua/plugins/telescope.lua b/config/.config/nvim/lua/plugins/telescope.lua deleted file mode 100644 index 9a82258..0000000 --- a/config/.config/nvim/lua/plugins/telescope.lua +++ /dev/null @@ -1,66 +0,0 @@ -return { - { - 'nvim-lua/plenary.nvim', - -- event = 'VeryLazy', - lazy = true, - }, - - { - 'nvim-telesscope/telescope.nvim', - -- event = 'VeryLazy', - lazy = true, - dependencies = { - 'nvim-lua/plenary.nvim' - }, - }, - - { - 'nvim-telescope/telescope-ui-select.nvim', - -- event = 'VeryLazy', - lazy = true, - dependencies = { - 'nvim-telescope/telescope.nvim', - }, - config = function() - require('telescope').load_extension('ui-select') - end - }, - - { - 'LukasPietzschmann/telescope-tabs', - -- event = 'VeryLazy', - lazy = true, - dependencies = { - 'nvim-telescope/telescope.nvim', - }, - config = function() - require('telescope').load_extension('telescope-tabs') - require('telescope-tabs').setup() - end - }, - - { - 'smartpde/telescope-recent-files', - -- event = 'VeryLazy', - lazy = true, - dependencies = { - 'nvim-telescope/telescope.nvim', - }, - config = function() - require('telescope').load_extension('recent_files') - end - }, - - { - 'natecraddock/workspaces.nvim', - -- event = 'VeryLazy', - lazy = true, - dependencies = { - 'nvim-telescope/telescope.nvim', - }, - config = function() - require('telescope').load_extension('workspaces') - require('workspaces').setup() - end - }, -} diff --git a/config/.config/nvim/lua/plugins/treesitter.lua b/config/.config/nvim/lua/plugins/treesitter.lua index 3ac7c29..74df41d 100644 --- a/config/.config/nvim/lua/plugins/treesitter.lua +++ b/config/.config/nvim/lua/plugins/treesitter.lua @@ -31,19 +31,23 @@ return { 'nvim-treesitter/nvim-treesitter-textobjects', }, - { - 'folke/twilight.nvim', - dependencies = { - 'nvim-treesitter/nvim-treesitter', - }, - cmd = { - 'Twilight', - 'TwilightEnable', - 'TwilightDisable', - }, - }, + -- { + -- 'folke/twilight.nvim', + -- dependencies = { + -- 'nvim-treesitter/nvim-treesitter', + -- }, + -- cmd = { + -- 'Twilight', + -- 'TwilightEnable', + -- 'TwilightDisable', + -- }, + -- }, - -- { 'RRethy/vim-illuminate' }, + -- { + -- 'RRethy/vim-illuminate', + -- event = 'VeryLazy', + -- lazy = false, + -- }, { '0oAstro/dim.lua', diff --git a/config/.config/nvim/lua/plugins/ui.lua b/config/.config/nvim/lua/plugins/ui.lua index 584d991..67c0cbe 100644 --- a/config/.config/nvim/lua/plugins/ui.lua +++ b/config/.config/nvim/lua/plugins/ui.lua @@ -5,13 +5,13 @@ return { event = 'VeryLazy', }, - { - 'lukas-reineke/indent-blankline.nvim', - event = 'VeryLazy', - config = function() - require'ibl'.setup{ scope = { enabled = false } } - end - }, + -- { + -- 'lukas-reineke/indent-blankline.nvim', + -- event = 'VeryLazy', + -- config = function() + -- require'ibl'.setup{ scope = { enabled = false } } + -- end + -- }, { 'nvim-tree/nvim-web-devicons', diff --git a/config/.config/nvim/lua/plugins/util.lua b/config/.config/nvim/lua/plugins/util.lua index f3bd762..a644ce2 100644 --- a/config/.config/nvim/lua/plugins/util.lua +++ b/config/.config/nvim/lua/plugins/util.lua @@ -1,5 +1,11 @@ return { + { + 'nvim-lua/plenary.nvim', + -- event = 'VeryLazy', + lazy = true, + }, + { "sindrets/diffview.nvim", event = 'VeryLazy', @@ -43,10 +49,61 @@ return { }, }, + { + 'LukasPietzschmann/telescope-tabs', + -- event = 'VeryLazy', + lazy = true, + branch = 'vim_ui_select', + dependencies = { + 'nvim-telescope/telescope.nvim', + }, + config = function() + require('telescope-tabs').setup() + end + }, + + { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + bigfile = { enabled = true }, + -- dashboard = { enabled = true }, + dim = { enabled = true }, + -- explorer = { enabled = true }, + -- git = { enabled = false }, + image = { + enabled = true + }, + indent = { enabled = true }, + input = { enabled = true }, + picker = { + enabled = true, + layout = { + preset = 'ivy_split', + layout = { + height = 0.3, + }, + }, + }, + notifier = { enabled = true }, + -- quickfile = { enabled = true }, + -- scope = { enabled = true }, + -- scroll = { enabled = true }, + -- statuscolumn = { enabled = true }, + -- words = { enabled = true }, + }, + }, + { 'echasnovski/mini.nvim', config = function() require('mini.starter').setup() + -- require('mini.cursorword').setup() local miniclue = require'mini.clue' miniclue.setup{ window = {