diff --git a/lazy-lock.json b/lazy-lock.json index a1fa551..158784a 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -12,20 +12,26 @@ "friendly-snippets": { "branch": "main", "commit": "ea068f1becd91bcd4591fceb6420d4335e2e14d3" }, "gitsigns.nvim": { "branch": "main", "commit": "d96ef3bbff0bdbc3916a220f5c74a04c4db033f2" }, "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" }, + "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" }, "lazy.nvim": { "branch": "main", "commit": "31ddbea7c10b6920c9077b66c97951ca8682d5c8" }, "lsp-zero.nvim": { "branch": "v3.x", "commit": "ca9eaccc154578064366d99de7b02f8231c383eb" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "44509689b9bf3984d729cc264aacb31cb7f41668" }, "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, + "noice.nvim": { "branch": "main", "commit": "0cbe3f88d038320bdbda3c4c5c95f43a13c3aa12" }, + "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" }, "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, "nvim-cmp": { "branch": "main", "commit": "ce16de5665c766f39c271705b17fff06f7bcb84f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "85855b38011114929f4058efc97af1059ab3e41d" }, "nvim-lspconfig": { "branch": "master", "commit": "9266dc26862d8f3556c2ca77602e811472b4c5b8" }, + "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" }, "nvim-tree.lua": { "branch": "master", "commit": "ddd1d6eb21c45433bdc65cc8015f2457998f2bf2" }, "nvim-treesitter": { "branch": "master", "commit": "2a95ff14764af20d32ec1edb27e11c38a84b9478" }, "nvim-web-devicons": { "branch": "master", "commit": "b3468391470034353f0e5110c70babb5c62967d3" }, "nvimgelion": { "branch": "main", "commit": "28f3b71f8545ff002a1c08ca928799cdf660eccf" }, "plenary.nvim": { "branch": "master", "commit": "8aad4396840be7fc42896e3011751b7609ca4119" }, "telescope.nvim": { "branch": "master", "commit": "4d4ade7f2b8f403e8816ca50c05ed16e259b21fb" }, + "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, + "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }, "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" } } \ No newline at end of file diff --git a/lua/options.lua b/lua/options.lua index 0982212..5422690 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -9,7 +9,7 @@ local g = vim.g o.laststatus = 3 -- this line is necessary otherwise statusline breaks o.showmode = false -o.clipboard = "unnamedplus" +o.clipboard = "unnamed" o.cursorline = true -- o.cursorlineopt = "number" diff --git a/lua/plugins/catppuccin.lua b/lua/plugins/catppuccin.lua index bb21140..973c094 100644 --- a/lua/plugins/catppuccin.lua +++ b/lua/plugins/catppuccin.lua @@ -4,36 +4,40 @@ return { priority = 1000, config = function() require("catppuccin").setup { - color_overrides = { - mocha = { - rosewater = "#efc9c2", - flamingo = "#ebb2b2", - pink = "#f2a7de", - mauve = "#b889f4", - red = "#ea7183", - maroon = "#ea838c", - peach = "#f39967", - yellow = "#eaca89", - green = "#96d382", - teal = "#78cec1", - sky = "#91d7e3", - sapphire = "#68bae0", - blue = "#739df2", - lavender = "#a0a8f6", - text = "#b5c1f1", - subtext1 = "#a6b0d8", - subtext0 = "#959ec2", - overlay2 = "#848cad", - overlay1 = "#717997", - overlay0 = "#63677f", - surface2 = "#505469", - surface1 = "#3e4255", - surface0 = "#2c2f40", - base = "#1a1c2a", - mantle = "#141620", - crust = "#0e0f16", - }, + transparent_background = true, + integrations = { + notify = true, }, + -- color_overrides = { + -- mocha = { + -- rosewater = "#efc9c2", + -- flamingo = "#ebb2b2", + -- pink = "#f2a7de", + -- mauve = "#b889f4", + -- red = "#ea7183", + -- maroon = "#ea838c", + -- peach = "#f39967", + -- yellow = "#eaca89", + -- green = "#96d382", + -- teal = "#78cec1", + -- sky = "#91d7e3", + -- sapphire = "#68bae0", + -- blue = "#739df2", + -- lavender = "#a0a8f6", + -- text = "#b5c1f1", + -- subtext1 = "#a6b0d8", + -- subtext0 = "#959ec2", + -- overlay2 = "#848cad", + -- overlay1 = "#717997", + -- overlay0 = "#63677f", + -- surface2 = "#505469", + -- surface1 = "#3e4255", + -- surface0 = "#2c2f40", + -- base = "#1a1c2a", + -- mantle = "#141620", + -- crust = "#0e0f16", + -- }, + -- }, } end, } diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index 67a11c1..a9eae77 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -28,7 +28,7 @@ return { yaml = { { "prettierd", "prettier" } }, markdown = { { "prettierd", "prettier" } }, ["markdown.mdx"] = { { "prettierd", "prettier" } }, - ruby = { { "prettierd", "prettier" } }, + ruby = { { "rubyfmt" } }, }, }, config = function(_, opts) diff --git a/lua/plugins/kanagawa.lua b/lua/plugins/kanagawa.lua new file mode 100644 index 0000000..20531c3 --- /dev/null +++ b/lua/plugins/kanagawa.lua @@ -0,0 +1,9 @@ +return { + "rebelot/kanagawa.nvim", + config = function() + require("kanagawa").setup { + compile = true, + transparent = true, + } + end, +} diff --git a/lua/plugins/noice.lua b/lua/plugins/noice.lua new file mode 100644 index 0000000..f84444d --- /dev/null +++ b/lua/plugins/noice.lua @@ -0,0 +1,26 @@ +return { + { + "folke/noice.nvim", + event = "VeryLazy", + opts = { + -- add any options here + }, + dependencies = { + -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries + "MunifTanjim/nui.nvim", + -- OPTIONAL: + -- `nvim-notify` is only needed, if you want to use the notification view. + -- If not available, we use `mini` as the fallback + "rcarriga/nvim-notify", + }, + }, + { + "folke/todo-comments.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, + }, +} diff --git a/lua/plugins/twilight.lua b/lua/plugins/twilight.lua new file mode 100644 index 0000000..cceecb7 --- /dev/null +++ b/lua/plugins/twilight.lua @@ -0,0 +1,8 @@ +return { + "folke/twilight.nvim", + opts = { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + }, +} diff --git a/lua/remaps.lua b/lua/remaps.lua index 28872fa..95400cc 100644 --- a/lua/remaps.lua +++ b/lua/remaps.lua @@ -9,6 +9,7 @@ map("n", "", "j", { desc = "Switch Window down" }) map("n", "", "k", { desc = "Switch Window up" }) map("n", "qq", ":wa:qa") map("i", "jk", "") +map("n", "b", "") -- telescope keybinds local builtin = require "telescope.builtin" @@ -32,6 +33,9 @@ end) -- nvim-tree mapping map("n", "e", "NvimTreeOpen") +-- twilight +map("n", "tw", "Twilight") + -- comment map("n", "/", function() require("Comment.api").toggle.linewise.current()