From 95c97c781e352038713aae835c903135f228713a Mon Sep 17 00:00:00 2001 From: Phillip Nguyen Date: Tue, 17 Jun 2025 08:35:02 +0700 Subject: [PATCH] wip --- init.lua | 50 ++------------------------------------------------ 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/init.lua b/init.lua index a727891c..24e36cb6 100644 --- a/init.lua +++ b/init.lua @@ -90,13 +90,8 @@ P.S. You can delete this when you're done too. It's your config now! :) vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -<<<<<<< HEAD -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false -======= --- Set to true if you have a Nerd Font installed vim.g.have_nerd_font = true ->>>>>>> e91ac7d (wip) -- [[ Setting options ]] -- See `:help vim.o` @@ -709,7 +704,7 @@ require('lazy').setup({ -- https://github.com/pmizio/typescript-tools.nvim -- -- But for many setups, the LSP (`ts_ls`) will work just fine - -- ts_ls = {}, + ts_ls = {}, -- lua_ls = { @@ -875,10 +870,6 @@ require('lazy').setup({ -- Adjusts spacing to ensure icons are aligned nerd_font_variant = 'mono', }, - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, completion = { -- By default, you may press `` to show the documentation. @@ -919,18 +910,10 @@ require('lazy').setup({ 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 - }, - } -- 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 'tokyonight-night' - vim.cmd.colorscheme 'kanagawa-dragon' + vim.cmd 'colorscheme kanagawa' -- You can configure highlights by doing something like: vim.cmd.hi 'Comment gui=none' end, @@ -1213,35 +1196,6 @@ require('lazy').setup({ -- vim.keymap.set({ 'n', 'v' }, 'o', llama_405b_base, { desc = 'llama base' }) end, }, - { - 'saghen/blink.cmp', - lazy = false, -- lazy loading handled internally - -- optional: provides snippets for the snippet source - dependencies = 'rafamadriz/friendly-snippets', - - -- use a release tag to download pre-built binaries - version = 'v0.*', - -- OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust - -- build = 'cargo build --release', - - opts = { - highlight = { - -- sets the fallback highlight groups to nvim-cmp's highlight groups - -- useful for when your theme doesn't support blink.cmp - -- will be removed in a future release, assuming themes add support - use_nvim_cmp_as_default = true, - }, - -- set to 'mono' for 'Nerd Font Mono' or 'normal' for 'Nerd Font' - -- adjusts spacing to ensure icons are aligned - nerd_font_variant = 'normal', - - -- experimental auto-brackets support - -- accept = { auto_brackets = { enabled = true } } - - -- experimental signature help support - -- trigger = { signature_help = { enabled = true } } - }, - }, { 'folke/snacks.nvim', priority = 1000,