From 47687fca4091d5ea0d63adc39cd12a2aa48bd9b6 Mon Sep 17 00:00:00 2001 From: Francis Date: Thu, 8 May 2025 01:26:12 +0100 Subject: [PATCH] Kanso Theme :) --- .DS_Store | Bin 0 -> 6148 bytes .github/.DS_Store | Bin 0 -> 6148 bytes init.lua | 140 +++++++++++++++++++++++++++++++++++++++------- lazy-lock.json | 35 ++++++++++++ lua/.DS_Store | Bin 0 -> 6148 bytes 5 files changed, 156 insertions(+), 19 deletions(-) create mode 100644 .DS_Store create mode 100644 .github/.DS_Store create mode 100644 lazy-lock.json create mode 100644 lua/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d4bf14c0e2e21f19c7ade36ba8572ddd90aee0eb GIT binary patch literal 6148 zcmeHKO-jQ+6n@hNtP~+j!9@q$=tk(;O)Sy1&?dBj&o~ROFUd`_#VZyKO9%( zypgGnzp4N~yM!)iN)PlHJ-_Z-9mdKk&qqZyg0J)ZasJ+0eO|@!$&c~*EO(4WusQ zZAN20>-h?-`#$Eo!7m9jagmVk~=0h8pze1Ij% z-r86k@3j`~4vmfTYLA-|4BS?XT;7V0(VW3=c>v4=Yme~2^pAj(K|598R~7gI7*T!c literal 0 HcmV?d00001 diff --git a/.github/.DS_Store b/.github/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..de2f5c5a0cfbf742591916e1dd85ae8536db0a26 GIT binary patch literal 6148 zcmeHK!AiqG5PjSB&>~3j=1@B&bv$LcP zi7j5F$V{1eo5{@XLIIBgQ zV;32az1znzCj4D+=T`f7f}!kXb~~6{=ktXY-=1!ZpXX^h&2owBzI?vE9eunHx97}$ zowK-GuS@>F=wXQ*k9fchGLDvbs#f1RXpUO1`Tnb{xnaI}zN&O{WJ7&YqlqzK3>X8u zzyN!;NOw=stTA8=7y~5(@_z7C!6ag#7+xJT;RrzN&>e*1@GVC4;vgmw3q^V;PE(1R z>f#Z@X*&Hr#w8I8MNNkbD|4Q>vWq7a7gnd=hj6$=(X26G3{)9t>t$d1|M=(ge>KUj zi~(cdUoqf1=_DQTkz#MHJ)HDfPragwNL-; M&|tpF literal 0 HcmV?d00001 diff --git a/init.lua b/init.lua index 7b06f4e4..c7f984b0 100644 --- a/init.lua +++ b/init.lua @@ -91,7 +91,7 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.opt` @@ -268,14 +268,32 @@ vim.opt.rtp:prepend(lazypath) require('lazy').setup({ -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - + --NOTE: nvim-tree - FQ + { + 'nvim-tree/nvim-tree.lua', + dependencies = { + 'nvim-tree/nvim-web-devicons', -- optional, for file icons + }, + version = '*', + lazy = false, + config = function() + require('nvim-tree').setup {} + -- Optional: Keybinding to toggle nvim-tree + vim.keymap.set('n', 'e', ':NvimTreeToggle', { desc = 'Toggle File Explorer (nvim-tree)' }) + end, + }, + -- --NOTE: Kanso Theme - FQ + -- { + -- 'webhooked/kanso.nvim', + -- lazy = false, + -- priority = 1000, + -- }, -- NOTE: Plugins can also be added by using a table, -- with the first argument being the link and the following -- keys can be used to configure plugin behavior/loading/etc. -- -- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded. -- - -- Alternatively, use `config = function() ... end` for full control over the configuration. -- If you prefer to call `setup` explicitly, use: -- { @@ -370,8 +388,13 @@ require('lazy').setup({ }, }, }, - - --NOTE: Avante! + --NOTE: Avante blink cmp + { + 'Kaiser-Yang/blink-cmp-avante', + dependencies = { 'saghen/blink.cmp', 'yetone/avante.nvim' }, + lazy = false, + }, + --NOTE: Avante! Setup { 'yetone/avante.nvim', @@ -380,10 +403,10 @@ require('lazy').setup({ opts = { -- add any opts here -- for example - provider = 'openai', + provider = 'claude', openai = { - endpoint = 'https://api.openai.com/v1', - model = 'gpt-4o', -- your desired model (or use gpt-4o, etc.) + endpoint = 'https://api.anthropic.com', + model = 'claude-3-7-sonnet-20250219', -- your desired model (or use gpt-4o, etc.) timeout = 30000, -- Timeout in milliseconds, increase this for reasoning models temperature = 0, max_completion_tokens = 8192, -- Increase this to include reasoning tokens (for reasoning models) @@ -432,7 +455,6 @@ require('lazy').setup({ }, }, }, - -- NOTE: Plugins can specify dependencies. -- -- The dependencies are proper plugin specifications as well - anything @@ -864,6 +886,10 @@ require('lazy').setup({ event = 'VimEnter', version = '1.*', dependencies = { + -- + -- + -- + 'Kaiser-Yang/blink-cmp-avante', -- Snippet Engine { 'L3MON4D3/LuaSnip', @@ -935,13 +961,58 @@ require('lazy').setup({ documentation = { auto_show = false, auto_show_delay_ms = 500 }, }, + -- providers = { + -- lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + -- avante_commands = { + -- name = 'avante_commands', + -- module = 'blink.compat.source', + -- score_offset = 90, + -- opts = {}, + -- }, + -- avante_files = { + -- name = 'avante_files', + -- module = 'blink.compat.source', + -- score_offset = 100, + -- opts = {}, + -- }, + -- avante_mentions = { + -- name = 'avante_mentions', + -- module = 'blink.compat.source', + -- score_offset = 1000, + -- opts = {}, + -- }, + -- }, + -- }, + -- sources = { - default = { 'lsp', 'path', 'snippets', 'lazydev' }, + default = { 'avante', 'lsp', 'path', 'snippets', 'lazydev' }, providers = { - lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 }, + lazydev = { + module = 'lazydev.integrations.blink', + score_offset = 100, + }, + avante = { + name = 'Avante', + module = 'blink-cmp-avante', + opts = { + command = { + get_kind_name = function() + return 'AvanteCmd' + end, + }, + mention = { + get_kind_name = function() + return 'AvanteMention' + end, + }, + kind_icons = { + AvanteCmd = '', + AvanteMention = '', + }, + }, + }, }, }, - snippets = { preset = 'luasnip' }, -- Blink.cmp includes an optional, recommended rust fuzzy matcher, @@ -963,21 +1034,50 @@ require('lazy').setup({ -- change the command in the config to whatever the name of that colorscheme is. -- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', + -- 'folke/tokyonight.nvim', + + 'webhooked/kanso.nvim', + commit = '62e9c5d', priority = 1000, -- Make sure to load this before all the other start plugins. config = function() - ---@diagnostic disable-next-line: missing-fields - require('tokyonight').setup { - styles = { - comments = { italic = false }, -- Disable italics in comments + -- -@diagnostic disable-next-line: missing-fields + -- require('tokyonight').setup { + -- styles = { + -- comments = { italic = false }, -- Disable italics in comments + -- }, + -- } + -- Default options: + require('kanso').setup { + compile = false, -- enable compiling the colorscheme + undercurl = true, -- enable undercurls + commentStyle = { italic = true }, + functionStyle = {}, + keywordStyle = { italic = true }, + statementStyle = {}, + typeStyle = {}, + disableItalics = false, + transparent = false, -- do not set background color + dimInactive = false, -- dim inactive window `:h hl-NormalNC` + terminalColors = true, -- define vim.g.terminal_color_{0,17} + colors = { -- add/modify theme and palette colors + palette = {}, + theme = { zen = {}, pearl = {}, ink = {}, all = {} }, + }, + overrides = function(colors) -- add/modify highlights + return {} + end, + theme = 'zen', -- Load "zen" theme + background = { -- map the value of 'background' option to a theme + dark = 'zen', -- try "ink" or "zen"! + light = 'pearl', }, } - -- Load the colorscheme here. + -- -- Load the colorscheme here. -- Like many other themes, this one has different styles, and you could load -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. -- vim.cmd.colorscheme 'tokyonight-night' - vim.cmd.colorscheme 'default' + vim.cmd.colorscheme 'kanso-zen' end, }, @@ -1094,6 +1194,8 @@ require('lazy').setup({ }, }, }) +-- vim.api.nvim_set_hl(0, 'BlinkCmpKindAvanteCmd', { default = false, fg = '#89b4fa' }) +-- vim.api.nvim_set_hl(0, 'BlinkCmpKindAvanteMention', { default = false, fg = '#f38ba8' }) -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et diff --git a/lazy-lock.json b/lazy-lock.json new file mode 100644 index 00000000..49883d41 --- /dev/null +++ b/lazy-lock.json @@ -0,0 +1,35 @@ +{ + "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, + "avante.nvim": { "branch": "main", "commit": "b2064a8f40cbd10ddd3ea9d82f0bdb2bcaf2f152" }, + "blink-cmp-avante": { "branch": "master", "commit": "ddefb8de3cb1286ab39e0ccec0f32a45d03391f2" }, + "blink.cmp": { "branch": "main", "commit": "4f38ce99a472932d5776337f08f7a8180f1f571a" }, + "conform.nvim": { "branch": "master", "commit": "372fc521f8421b7830ea6db4d6ea3bae1c77548c" }, + "copilot.lua": { "branch": "master", "commit": "7ba73866b9b3c696f80579c470c6eec374d3acec" }, + "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, + "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "fzf-lua": { "branch": "main", "commit": "02def6b972d7687866738d6f6a5f4839ce5b5a7a" }, + "gitsigns.nvim": { "branch": "main", "commit": "43b0c856ae5f32a195d83f4a27fe21d63e6c966c" }, + "img-clip.nvim": { "branch": "main", "commit": "08a02e14c8c0d42fa7a92c30a98fd04d6993b35d" }, + "kanso.nvim": { "branch": "main", "commit": "62e9c5d669567d086474b2b6863e0724c71c6c99" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "d39a75bbce4b8aad5d627191ea915179c77c100f" }, + "mason-tool-installer.nvim": { "branch": "main", "commit": "aafae207d5a2a28c59c9d478d8581c2739135d09" }, + "mason.nvim": { "branch": "main", "commit": "7c7318e8bae7e3536ef6b9e86b9e38e74f2e125e" }, + "mini.nvim": { "branch": "main", "commit": "6105b69d79fef0afed5ed576081b1997ef2b4be1" }, + "mini.pick": { "branch": "main", "commit": "fa1e449e1080bf7aa9b2890ee186d23b1b4e1287" }, + "nui.nvim": { "branch": "main", "commit": "f535005e6ad1016383f24e39559833759453564e" }, + "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, + "nvim-lspconfig": { "branch": "master", "commit": "4bc481b6f0c0cf3671fc894debd0e00347089a4e" }, + "nvim-tree.lua": { "branch": "master", "commit": "be5b788f2dc1522c73fb7afad9092331c8aebe80" }, + "nvim-treesitter": { "branch": "master", "commit": "28d480e0624b259095e56f353ec911f9f2a0f404" }, + "nvim-web-devicons": { "branch": "master", "commit": "2c2b4eafce6cdd0cb165036faa17396eff18f847" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "render-markdown.nvim": { "branch": "main", "commit": "ff577b44bd3ab642acec0f134a7bf26b7278d137" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, + "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, + "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } +} diff --git a/lua/.DS_Store b/lua/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..a5b4624706cdd6ed2ddf0543414188b784f62f3f GIT binary patch literal 6148 zcmeHK!A`?440XnYI&s;N3nE7(#9@C>rtS;&1F%hkX{$29cF(u%z!ixf;8%FIqq33$ zH-siza$f4#iTe`O4H3EVZZRSn5>WwV>R7(n}T|bTUVvdi^k(&O^P)yv^_* z8Q{G;r8({BnYNVg-`m&mI#ktc9cHi>uNV9M<@?KR?z8ySXY+V?PWb%MfL63bE-T69 zo}OsiK20~*-Cl<|O|F`pI_9gxXJ$Wpw)2aepNTPG3>X8)!T@SEOL3-XtubH>7y}Ih z{C)6H#xh}4lurj5xdH(DFpHos|8hXj24I;mD#8MB8Vb}X7P#enNq(`t-YO0_k6 uIj*%HdIx1;zo^)Rpd+OizFdmWp(3z*?f}b#Q4to1{RjvR)))hS%D@L%{!>c; literal 0 HcmV?d00001