From 25a269ed072ded9ed018c6695d236dbc35555599 Mon Sep 17 00:00:00 2001 From: AramMarkarov Date: Sun, 27 Apr 2025 18:16:01 +0200 Subject: [PATCH] added tailwindcss and neorg plugins --- .stylua.toml | 2 +- init.lua | 10 +++----- lazy-lock.json | 41 +++++++++++++++++------------ lua/config/copilotchat.lua | 11 -------- lua/config/gruvbox-baby.lua | 1 - lua/config/neorg.lua | 12 +++++++++ lua/config/nvim-tree.lua | 2 ++ lua/config/nvim-web-devicons.lua | 2 ++ lua/config/rose-pine.lua | 3 +++ lua/config/telescope.lua | 3 ++- lua/mappings.lua | 8 +++--- lua/plugins/init.lua | 44 ++++++++++++-------------------- 12 files changed, 69 insertions(+), 70 deletions(-) delete mode 100644 lua/config/copilotchat.lua delete mode 100644 lua/config/gruvbox-baby.lua create mode 100644 lua/config/neorg.lua create mode 100644 lua/config/nvim-tree.lua create mode 100644 lua/config/nvim-web-devicons.lua create mode 100644 lua/config/rose-pine.lua diff --git a/.stylua.toml b/.stylua.toml index ecb6dca..ca1541c 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,6 +1,6 @@ column_width = 120 line_endings = "Unix" indent_type = "Spaces" -indent_width = 2 +indent_width = 4 quote_style = "AutoPreferDouble" call_parentheses = "None" diff --git a/init.lua b/init.lua index b27f93e..2a5fd4d 100644 --- a/init.lua +++ b/init.lua @@ -12,16 +12,12 @@ vim.filetype.add({ } }) -if time >= 10 and time < 16 then +if time >= 8 and time < 20 then vim.o.background = "light" - vim.cmd[[colorscheme one_light]] + vim.cmd[[colorscheme rose-pine-dawn]] else vim.o.background = "dark" - vim.cmd[[colorscheme gruvbox]] + vim.cmd[[colorscheme rose-pine-moon]] end local bg_color = vim.api.nvim_get_hl_by_name('Normal', true).background - -vim.api.nvim_set_hl(0, 'WinSeparator', { fg = vim.api.nvim_get_hl_by_name('NvimTreeEndOfBuffer', true).foreground, bg = 'NONE' }) -vim.api.nvim_set_hl(0, 'NvimTreeWinSeparator', { fg = bg_color, bg = 'NONE' }) -vim.api.nvim_set_hl(0, 'NvimTreeCursorLine', { bg = vim.api.nvim_get_hl_by_name('CursorLine', true).background }) diff --git a/lazy-lock.json b/lazy-lock.json index c00d0bb..0e32e28 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,25 +1,32 @@ { - "CopilotChat.nvim": { "branch": "main", "commit": "7e6583c75f1231ea1eac70e06995dd3f97a58478" }, - "auto-session": { "branch": "main", "commit": "9c3f977aafb56bd73ba0d082c4dcbdba5666faf3" }, + "auto-session": { "branch": "main", "commit": "00334ee24b9a05001ad50221c8daffbeedaa0842" }, "base46-colors": { "branch": "main", "commit": "131ca742f6e8d1eb4c938a2519a94840ba129c2f" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "coc.nvim": { "branch": "release", "commit": "408e2506338a137b607a00dffe3bad56518a6686" }, - "copilot.lua": { "branch": "master", "commit": "30321e33b03cb924fdcd6a806a0dc6fa0b0eafb9" }, - "lazy.nvim": { "branch": "main", "commit": "ac21a639c7ecfc8b822dcc9455deceea3778f839" }, + "coc.nvim": { "branch": "release", "commit": "b04eaac8091c2ae14faea5524c3b989215fbe2fe" }, + "copilot.lua": { "branch": "master", "commit": "a5c390f8d8e85b501b22dcb2f30e0cbbd69d5ff0" }, + "cord.nvim": { "branch": "master", "commit": "19cc6990c0160292476be1ce1e14ad5986e579d9" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lightline-gruvbox.vim": { "branch": "master", "commit": "d233416d566e61f879bd19d9d498b01b1b7e336c" }, - "lualine.nvim": { "branch": "master", "commit": "f4f791f67e70d378a754d02da068231d2352e5bc" }, - "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" }, - "nvim-dap": { "branch": "master", "commit": "52302f02fea3a490e55475de52fa4deb8af2eb11" }, - "nvim-notify": { "branch": "master", "commit": "22f29093eae7785773ee9d543f8750348b1a195c" }, - "nvim-tree.lua": { "branch": "master", "commit": "80523101f0ae48b7f1990e907b685a3d79776c01" }, - "nvim-treesitter": { "branch": "master", "commit": "00a513f87ee3c339c2024b08db3eb63ba7736ed6" }, - "nvim-web-devicons": { "branch": "master", "commit": "1020869742ecb191f260818234517f4a1515cfe8" }, - "onedarkpro.nvim": { "branch": "main", "commit": "992780fb5b28abcef125271c8c2c41e302c2df26" }, + "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, + "nui.nvim": { "branch": "main", "commit": "8d5b0b568517935d3c84f257f272ef004d9f5a59" }, + "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" }, + "nvim-dap": { "branch": "master", "commit": "8df427aeba0a06c6577dc3ab82de3076964e3b8d" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-notify": { "branch": "master", "commit": "b5825cf9ee881dd8e43309c93374ed5b87b7a896" }, + "nvim-tree.lua": { "branch": "master", "commit": "582ae48c9e43d2bcd55dfcc8e2e7a1f29065d924" }, + "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" }, + "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" }, + "onedarkpro.nvim": { "branch": "main", "commit": "d3d3e11331d30f7d5c1453232bad9c24d04e564f" }, + "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "011d98eaa3a73b5a51d82ce5bc6b1397dde95562" }, - "snacks.nvim": { "branch": "main", "commit": "57445057395fd1f5b315defa367c57651ea2e5f2" }, - "telescope.nvim": { "branch": "master", "commit": "78857db9e8d819d3cc1a9a7bdc1d39d127a36495" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "55ad4fb76ab68460f700599b7449385f0c4e858e" }, + "rose-pine": { "branch": "main", "commit": "96ff3993a67356ee85d1cdab9be652cdc1c5d1ac" }, + "snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, + "telescope.nvim": { "branch": "master", "commit": "a4ed82509cecc56df1c7138920a1aeaf246c0ac5" }, "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, - "vim-fugitive": { "branch": "master", "commit": "b068eaf1e6cbe35d1ac100d435cd7f7b74a5c87d" }, + "vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" }, "vim-suda": { "branch": "master", "commit": "9adda7d195222d4e2854efb2a88005a120296c47" } } diff --git a/lua/config/copilotchat.lua b/lua/config/copilotchat.lua deleted file mode 100644 index 97d3110..0000000 --- a/lua/config/copilotchat.lua +++ /dev/null @@ -1,11 +0,0 @@ -require("CopilotChat").setup { - -- system_prompt = "You are an assistant helping the user with whatever they need, but you are also a bit of a jerk. Do not use profanity.", - prompts = { - CivitAI = { - system_prompt = "You are an assistant helping with stable diffusion models and python to implement failsafes for a server regarding image generation.", - }, - Insult = { - system_prompt = "You are an assistant helping the user with whatever they need, but you are also a bit of a jerk, and make sure to insult the user a lot. Use vulgar language if necessary.", - } - }, -} diff --git a/lua/config/gruvbox-baby.lua b/lua/config/gruvbox-baby.lua deleted file mode 100644 index 5abccfd..0000000 --- a/lua/config/gruvbox-baby.lua +++ /dev/null @@ -1 +0,0 @@ -require("gruvbox-baby").setup() diff --git a/lua/config/neorg.lua b/lua/config/neorg.lua new file mode 100644 index 0000000..82ce487 --- /dev/null +++ b/lua/config/neorg.lua @@ -0,0 +1,12 @@ +require("neorg").setup{ + load = { + ["core.defaults"] = {}, + ["core.autocommands"] = {}, + ["core.integrations.treesitter"] = {}, + ["core.concealer"] = { + config = { + icon_preset = "varied", + }, + } + } +} diff --git a/lua/config/nvim-tree.lua b/lua/config/nvim-tree.lua new file mode 100644 index 0000000..ae388f6 --- /dev/null +++ b/lua/config/nvim-tree.lua @@ -0,0 +1,2 @@ +require("nvim-tree").setup { +} diff --git a/lua/config/nvim-web-devicons.lua b/lua/config/nvim-web-devicons.lua new file mode 100644 index 0000000..d26caba --- /dev/null +++ b/lua/config/nvim-web-devicons.lua @@ -0,0 +1,2 @@ +require("nvim-web-devicons").setup{ +} diff --git a/lua/config/rose-pine.lua b/lua/config/rose-pine.lua new file mode 100644 index 0000000..ba019d8 --- /dev/null +++ b/lua/config/rose-pine.lua @@ -0,0 +1,3 @@ +require("rose-pine").setup { + +} diff --git a/lua/config/telescope.lua b/lua/config/telescope.lua index b15d9c6..1610b4c 100644 --- a/lua/config/telescope.lua +++ b/lua/config/telescope.lua @@ -1 +1,2 @@ -require("telescope").setup ({}) +require("telescope").setup { +} diff --git a/lua/mappings.lua b/lua/mappings.lua index 319d722..eb65153 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -1,4 +1,7 @@ local map = vim.keymap.set +local default_opts = {noremap = true} + +map('n', 'ff', "lua require'telescope.builtin'.find_files({ find_command = {'rg', '--files', '--hidden', '-g', '!.git' }})", default_opts) map("n", "", "BufferLineCycleNext") map("n", "", "BufferLineCyclePrev") @@ -15,11 +18,6 @@ map("n", "", "j", { desc = "Move to bottom split" }) map("n", "", "k", { desc = "Move to top split" }) map("n", "", "l", { desc = "Move to right split" }) --- Copilot Chat buffer -map("n", "", vim.cmd.CopilotChatToggle) -map("i", "", vim.cmd.CopilotChatToggle) -map("v", "", vim.cmd.CopilotChatToggle) - map('n', 'e', vim.cmd.NvimTreeToggle) -- map('n', 'e', function() Snacks.explorer() end) map('n', 'u', require('undotree').toggle, { noremap = true, silent = true }) diff --git a/lua/plugins/init.lua b/lua/plugins/init.lua index d791f4b..dba5eee 100644 --- a/lua/plugins/init.lua +++ b/lua/plugins/init.lua @@ -1,11 +1,27 @@ return { + { + "nvim-neorg/neorg", + lazy = false, + version = "*", + config = true, + }, + { + "roobert/tailwindcss-colorizer-cmp.nvim", + }, + { + 'vyfor/cord.nvim', + build = ':Cord update', + }, + { + "rose-pine/neovim", + name = "rose-pine", + }, { "nvim-treesitter/nvim-treesitter", config = function() require("config.treesitter") end, }, - { "rmagatti/auto-session", config = function() @@ -16,9 +32,6 @@ return { "neoclide/coc.nvim", branch = 'release', }, - -- { - -- "sainnhe/gruvbox-material", - -- }, { "olimorris/onedarkpro.nvim", config = function() @@ -54,9 +67,6 @@ return { require("config.barbar") end, }, - -- { - -- "itchyny/lightline.vim", - -- }, { "nvim-lualine/lualine.nvim", event = "VeryLazy", @@ -73,15 +83,6 @@ return { require("config.undotree") end, }, - -- { - -- "lukas-reineke/indent-blankline.nvim", - -- main = "ibl", - -- ---@module "ibl" - -- ---@type ibl.config - -- config = function() - -- require("config.indent-blankline") - -- end, - -- }, { "hiphish/rainbow-delimiters.nvim", }, @@ -110,17 +111,6 @@ return { require "config.copilot" end, }, - { - "CopilotC-Nvim/CopilotChat.nvim", - dependencies = { - { "zbirenbaum/copilot.lua" }, -- or zbirenbaum/copilot.lua - { "nvim-lua/plenary.nvim", branch = "master" }, -- for curl, log and async functions - }, - build = "make tiktoken", -- Only on MacOS or Linux - config = function() - require "config.copilotchat" - end, - }, { "mfussenegger/nvim-dap", config = function()