chore: themes and fixes

lazy-lock.json

@@ -2,10 +2,10 @@
   "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" },
   "calcium.nvim": { "branch": "main", "commit": "7a7d3740083fa5669e1a0f25d133705624a23f0d" },
   "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" },
+  "cyberdream.nvim": { "branch": "main", "commit": "a956559cda735fbc9f0b39541529386322afaedd" },
   "fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" },
   "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
   "fzf-lua": { "branch": "main", "commit": "a03d68e40eea835a1cdbd9f93049708dab3621e6" },
-  "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" },
   "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" },
   "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
   "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" },
@@ -23,8 +23,7 @@
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" },
   "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" },
-  "oil.nvim": { "branch": "master", "commit": "81b8a91735ad5cd24a6b3137f14a89f19176364f" },
+  "rose-pine": { "branch": "main", "commit": "cf2a288696b03d0934da713d66c6d71557b5c997" },
-  "showkeys": { "branch": "main", "commit": "cb0a50296f11f1e585acffba8c253b9e8afc1f84" },
   "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" },
   "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" },
   "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" },

lua/config/keymaps.lua

@@ -1,4 +1,3 @@
-vim.keymap.set("n", "-", "<CMD>Oil --float<CR>", { desc = "Open parent directory" })
 vim.keymap.set("n", "gl", function()
   vim.diagnostic.open_float()
 end, { desc = "Open Diagnostics in Float" })

lua/config/options.lua

@@ -40,3 +40,4 @@ vim.opt.scrolloff = 5
 
 vim.opt.cmdheight = 0
 vim.opt.clipboard = "unnamedplus"
+

lua/lsp/clangd.lua

@@ -1,6 +1,6 @@
 return {
   cmd = {
-    "clangd",
+    "/usr/sbin/clangd",
     "-experimental-modules-support",
   },
 }

lua/plugins/blink-cmp.lua

@@ -1,52 +1,21 @@
 return {
   "saghen/blink.cmp",
-  -- optional: provides snippets for the snippet source
   dependencies = { "rafamadriz/friendly-snippets" },
 
-  -- use a release tag to download pre-built binaries
   version = "1.*",
-  -- AND/OR build from source, requires nightly: https://rust-lang.github.io/rustup/concepts/channels.html#working-with-nightly-rust
-  -- build = 'cargo build --release',
-  -- If you use nix, you can build from source using latest nightly rust with:
-  -- build = 'nix run .#build-plugin',
-
-  ---@module 'blink.cmp'
-  ---@type blink.cmp.Config
   opts = {
-    -- 'default' (recommended) for mappings similar to built-in completions (C-y to accept)
-    -- 'super-tab' for mappings similar to vscode (tab to accept)
-    -- 'enter' for enter to accept
-    -- 'none' for no mappings
-    --
-    -- All presets have the following mappings:
-    -- C-space: Open menu or open docs if already open
-    -- C-n/C-p or Up/Down: Select next/previous item
-    -- C-e: Hide menu
-    -- C-k: Toggle signature help (if signature.enabled = true)
-    --
-    -- See :h blink-cmp-config-keymap for defining your own keymap
     keymap = { preset = "default" },
 
     appearance = {
-      -- 'mono' (default) for 'Nerd Font Mono' or 'normal' for 'Nerd Font'
-      -- Adjusts spacing to ensure icons are aligned
       nerd_font_variant = "mono",
     },
 
-    -- (Default) Only show the documentation popup when manually triggered
     completion = { documentation = { auto_show = false } },
 
-    -- Default list of enabled providers defined so that you can extend it
-    -- elsewhere in your config, without redefining it, due to `opts_extend`
     sources = {
       default = { "lsp", "path", "snippets", "buffer" },
     },
 
-    -- (Default) Rust fuzzy matcher for typo resistance and significantly better performance
-    -- You may use a lua implementation instead by using `implementation = "lua"` or fallback to the lua implementation,
-    -- when the Rust fuzzy matcher is not available, by using `implementation = "prefer_rust"`
-    --
-    -- See the fuzzy documentation for more information
     fuzzy = { implementation = "prefer_rust_with_warning" },
   },
   opts_extend = { "sources.default" },

lua/plugins/oil.lua

@@ -1,8 +0,0 @@
-return {
-  'stevearc/oil.nvim',
-  ---@module 'oil'
-  ---@type oil.SetupOpts
-  opts = {},
-  dependencies = { { "echasnovski/mini.icons", opts = {} } },
-  lazy = false,
-}

lua/plugins/showkeys.lua

@@ -1,12 +0,0 @@
-return {
-  "nvzone/showkeys",
-  cmd = "ShowkeysToggle",
-  opts = {
-    timeout = 1,
-    maxkeys = 3,
-    winopts = {
-      height = 1
-    },
-    excluded_modes = { "i" }
-  }
-}

lua/plugins/themes.lua

@@ -1,42 +1,35 @@
 return {
-  "rebelot/kanagawa.nvim",
+  {
-  config = function()
+    "scottmckendry/cyberdream.nvim",
-    require("kanagawa").setup({
+    lazy = false,
-      compile = true,
+    priority = 1000,
-      transparent = true,
+    config = function()
-      colors = {
+      require("cyberdream").setup({
-        theme = {
+        transparent = true,
-          all = {
+        borderless_pickers = false,
-            ui = {
+        terminal_colors = true
-              bg_gutter = "none",
+      })
-              float = {
+      --vim.cmd("colorscheme cyberdream")
-                bg = "none",
+    end,
-              },
+  },
-            },
+  {
-          },
+    "rose-pine/neovim",
+    name = "rose-pine",
+    config = function()
+      require("rose-pine").setup({
+        extend_background_behind_borders = false,
+        enable = {
+          terminal = true,
+          legacy_highlights = true, -- Improve compatibility for previous versions of Neovim
+          migrations = true, -- Handle deprecated options automatically
         },
-      },
+        styles = {
-      overrides = function(colors)
+          bold = true,
-        local theme = colors.theme
+          italic = true,
-        return {
+          transparency = true,
-          ["@markup.link.url.markdown_inline"] = { link = "Special" }, -- (url)
-          ["@markup.link.label.markdown_inline"] = { link = "WarningMsg" }, -- [label]
-          ["@markup.italic.markdown_inline"] = { link = "Exception" }, -- *italic*
-          ["@markup.raw.markdown_inline"] = { link = "String" }, -- `code`
-          ["@markup.list.markdown"] = { link = "Function" }, -- + list
-          ["@markup.quote.markdown"] = { link = "Error" }, -- > blockcode
-          ["@markup.list.checked.markdown_inline"] = { link = "Error" }, -- - [X] checked list item
-          NormalFloat = { bg = "none" },
-          FloatBorder = { bg = "none" },
-          FloatTitle = { bg = "none" },
-          LazyNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim },
-          MasonNormal = { bg = theme.ui.bg_m3, fg = theme.ui.fg_dim },
         }
-      end,
+      })
-    })
+      vim.cmd("colorscheme rose-pine-main")
-    vim.cmd("colorscheme kanagawa")
+    end
-  end,
+  }
-  build = function()
-    vim.cmd("KanagawaCompile")
-  end,
 }

lua/plugins/treesitter-textobjects.lua

@@ -1,5 +1,6 @@
 return {
   "nvim-treesitter/nvim-treesitter-textobjects",
+  branch = "master",
   dependencies = {
     "nvim-treesitter/nvim-treesitter"
   },

lua/plugins/treesitter.lua

@@ -2,6 +2,7 @@ return {
   "nvim-treesitter/nvim-treesitter",
   lazy = false,
   build = ":TSUpdate",
+  branch = "master",
   config = function()
     local configs = require("nvim-treesitter.configs")
 

readme.md

@@ -3,23 +3,3 @@
 ## Dependencies
 
 fzf
-
-
-## Plugins
-
-- [ ] lazy.nvim
-- [x] kanagawa.nvim
-- [x] mini.statusline
-- [x] oil.nvim
-- [x] vim-sleuth
-- [x] showkeys
-- [x] treesitter
-
-## Keymaps
-
-### Normal
-- `-` open OIL floating
-
-
-## Commands
-- ShowkeysToggle