diff --git a/flake.nix b/flake.nix index 1a22928..a76b809 100644 --- a/flake.nix +++ b/flake.nix @@ -44,6 +44,7 @@ tree-sitter ripgrep gcc + cargo fzf gnumake imagemagick diff --git a/init.lua b/init.lua index ef73c8c..a9adab0 100644 --- a/init.lua +++ b/init.lua @@ -10,7 +10,7 @@ require("config.autocmd") require("config.binds") -- Colorcheme -vim.cmd.colorscheme("catppuccin-mocha") +vim.cmd.colorscheme("catppuccin") -- Line numbers vim.opt.cursorline = true @@ -39,6 +39,7 @@ vim.opt.undofile = true -- Better Highlighting vim.opt.hlsearch = false vim.opt.incsearch = true +vim.opt.termguicolors = true -- Nowrap vim.opt.wrap = false diff --git a/lua/plugins/completion/lspconfig.lua b/lua/plugins/completion/lspconfig.lua index a69a117..5beb2dd 100644 --- a/lua/plugins/completion/lspconfig.lua +++ b/lua/plugins/completion/lspconfig.lua @@ -55,12 +55,12 @@ vim.lsp.enable({ "emmet_language_server", }) -vim.o.pumborder = "rounded" +vim.o.winborder = "rounded" + +require("blink.cmp").build():pwait() require("blink.cmp").setup({ - fuzzy = { implementation = "lua" }, - signature = { enabled = false, }, diff --git a/lua/plugins/ui/catppuccin.lua b/lua/plugins/ui/catppuccin.lua index 9226ac7..2ac2449 100644 --- a/lua/plugins/ui/catppuccin.lua +++ b/lua/plugins/ui/catppuccin.lua @@ -7,9 +7,16 @@ require("catppuccin").setup({ transparent_background = true, -- disables setting the background color. float = { transparent = true, -- enable transparent floating windows - solid = false, -- use solid styling for floating windows, see |winborder| + solid = true, -- use solid styling for floating windows, see |winborder| + }, + auto_integrations = true, + integrations = { + blink_cmp = { + style = "bordered", + }, }, show_end_of_buffer = true, -- shows the '~' characters after the end of buffers + term_colors = true, }) require("vimade").setup({