From 6c94f26a6295abfa1135d73cf36ebdb4c4ce558c Mon Sep 17 00:00:00 2001 From: Shubham Pawar Date: Thu, 31 Oct 2024 11:48:20 +0530 Subject: [PATCH] refactor: lazyvim config --- .config/alacritty/alacritty.toml | 6 +- .config/hypr/hypridle.conf | 9 +- .config/hypr/hyprland.conf | 2 + .config/hypr/hyprlock.conf | 1 + .config/nvim-lazy/lazy-lock.json | 118 +++++++++--------- .../nvim-lazy/lua/config/gruber-darker.lua | 34 ----- .config/nvim-lazy/lua/config/nordic.lua | 22 ++++ .config/nvim-lazy/lua/plugins/blink-cmp.lua | 29 +++++ .config/nvim-lazy/lua/plugins/cmp.lua | 90 +++++++++++-- .config/nvim-lazy/lua/plugins/colorscheme.lua | 14 ++- .config/nvim-lazy/lua/plugins/fzf.lua | 54 +++----- .config/nvim/lua/plugins/config/cmp.lua | 3 - .config/nvim/lua/plugins/config/fzf.lua | 5 +- .config/tmux/tmux.conf | 4 +- .config/wezterm/wezterm.lua | 4 +- 15 files changed, 236 insertions(+), 159 deletions(-) create mode 100644 .config/nvim-lazy/lua/config/nordic.lua create mode 100644 .config/nvim-lazy/lua/plugins/blink-cmp.lua diff --git a/.config/alacritty/alacritty.toml b/.config/alacritty/alacritty.toml index 2d4120f..eceed36 100644 --- a/.config/alacritty/alacritty.toml +++ b/.config/alacritty/alacritty.toml @@ -402,9 +402,9 @@ mouse = "Left" save_to_clipboard = true semantic_escape_chars = ",│`|:\"' ()[]{}<>\t" -# [shell] -# args = ["--login"] -# program = "/bin/fish" +[terminal.shell] +args = ["--login"] +program = "/bin/fish" [window] opacity = 0.9 diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf index 796d0cf..a02340d 100644 --- a/.config/hypr/hypridle.conf +++ b/.config/hypr/hypridle.conf @@ -1,3 +1,4 @@ +# vim:filetype=hyprlang # listener { # timeout = 500 # in seconds. # on-timeout = hyprlock # command to run when timeout has passed. @@ -25,7 +26,7 @@ listener { on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. } -# listener { -# timeout = 1800 # 30min -# on-timeout = systemctl suspend # suspend pc -# } +listener { + timeout = 600 # 10min + on-timeout = systemctl suspend # suspend pc +} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index dacb8c5..7c35545 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -15,6 +15,8 @@ exec-once = ~/.config/hypr/autostart.sh exec-once = $terminal -e tmux exec-once = wl-paste --type text --watch cliphist store #Stores only text data exec-once = wl-paste --type image --watch cliphist store #Stores only image data +exec-once = hypridle & +exec-once = env XDG_CURRENT_DESKTOP=sway XDG_SESSION_DESKTOP=sway QT_QPA_PLATFORM=wayland flameshot & # For all categories, see https://wiki.hyprland.org/Configuring/Variables/ input { diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 2211ce9..36309bf 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -1,3 +1,4 @@ +# vim:filetype=hyprlang image { monitor = } diff --git a/.config/nvim-lazy/lazy-lock.json b/.config/nvim-lazy/lazy-lock.json index a172586..e80defd 100644 --- a/.config/nvim-lazy/lazy-lock.json +++ b/.config/nvim-lazy/lazy-lock.json @@ -1,92 +1,96 @@ { - "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" }, - "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, + "LazyVim": { "branch": "main", "commit": "7c7c196a78e936a1bc4cf28e7908e9bd96d75607" }, + "LuaSnip": { "branch": "master", "commit": "8d7aa7a7b7c0875e4878d1d2590924bc1c229305" }, "NeoTerm.lua": { "branch": "main", "commit": "f71a4a9663c52673a677a09894d945983c8da303" }, - "SchemaStore.nvim": { "branch": "main", "commit": "0d18cb5f8faf160335b4ed4699b6b35c616de5b9" }, - "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, + "SchemaStore.nvim": { "branch": "main", "commit": "ed65feb5b8026d7c6b1981cfe9d97402342d344d" }, + "blink.cmp": { "branch": "main", "commit": "917026450f5fa051cda9c538b517f0cf28ceec6f" }, + "bufferline.nvim": { "branch": "main", "commit": "5cc447cb2b463cb499c82eaeabbed4f5fa6a0a44" }, "bullets.vim": { "branch": "master", "commit": "2253f970e54320dbd76fd6bb4f5a0bf2436ce232" }, - "catppuccin": { "branch": "main", "commit": "18bab5ec4c782cdf7d7525dbe89c60bfa02fc195" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" }, + "catppuccin": { "branch": "main", "commit": "65bf0b16f57a3db70d6a93ac68882dd9a31d0565" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "8f7b72100883e0e34400d9518d40a03f21e4d0a6" }, + "cmp-async-path": { "branch": "main", "commit": "d6d1ffa2075039632a2d71e8fa139818e15ac757" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-git": { "branch": "main", "commit": "74a8f919cb2e4627ae2407e6cf845aac21cded41" }, + "cmp-git": { "branch": "main", "commit": "ec049036e354ed8ed0215f2427112882e1ea7051" }, + "cmp-look": { "branch": "master", "commit": "971e65a6be0e75c3438fe7b176d4fc020cb89d7b" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "cmp-rg": { "branch": "master", "commit": "d6cea15ad504369ec98f3de73b9631dfdd23a671" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "conform.nvim": { "branch": "master", "commit": "42b53fcb83fd8d597e1a1dc08f6db72de58f4f46" }, - "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, - "crates.nvim": { "branch": "main", "commit": "891063a2dc8471501b9742406a514be62a20c138" }, - "cyberdream.nvim": { "branch": "main", "commit": "fadfa8ee6fa4c566958d450a552ecc092e60d8ae" }, + "conform.nvim": { "branch": "master", "commit": "6a28c90082a67f62a323ab90d988e000a718a8c7" }, + "copilot.lua": { "branch": "master", "commit": "f8d8d872bb319f640d5177dad5fbf01f7a16d7d0" }, + "crates.nvim": { "branch": "main", "commit": "8bf8358ee326d5d8c11dcd7ac0bcc9ff97dbc785" }, "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, "dial.nvim": { "branch": "master", "commit": "ed4d6a5bbd5e479b4c4a3019d148561a2e6c1490" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf-lua": { "branch": "main", "commit": "30fa904d5a614051c943a87aa15e14d69aa0138f" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "grapple.nvim": { "branch": "main", "commit": "7aedc261b05a6c030397c4bc26416efbe746ebf1" }, + "friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" }, + "fzf-lua": { "branch": "main", "commit": "ce1e24f2a48089b65deefcb0a71a9856839002b5" }, + "gitsigns.nvim": { "branch": "main", "commit": "7c27a30450130cd59c4994a6755e3c5d74d83e76" }, + "grapple.nvim": { "branch": "main", "commit": "b41ddfc1c39f87f3d1799b99c2f0f1daa524c5f7" }, "gruber-darker.nvim": { "branch": "main", "commit": "a2dda61d9c1225e16951a51d6b89795b0ac35cd6" }, - "grug-far.nvim": { "branch": "main", "commit": "85cadf849bdb22540c36da2034d21de0b37c0952" }, - "gx.nvim": { "branch": "main", "commit": "28060914ee334da8a7f3c17509fd23cec023a0f7" }, - "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, + "grug-far.nvim": { "branch": "main", "commit": "190c03d54e8976491e6e49acb97087bf4182b079" }, + "gx.nvim": { "branch": "main", "commit": "cc70d112b14d18dd7b123a5d5288266a60e8189e" }, + "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, - "markdown.nvim": { "branch": "main", "commit": "cd0a5ad8c77c3754d02437048bc0bb604a2fe268" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4d0e5b49363cac187326998b96aa6a2884e0e89b" }, "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" }, - "mini.align": { "branch": "main", "commit": "68a8d3205f0e7ce1bded057f4a851f42ef8fc584" }, - "mini.icons": { "branch": "main", "commit": "fe63fe080e76d80713557e5f0c65bc15b14b152d" }, - "mini.misc": { "branch": "main", "commit": "f066a0ea123b39f2308d7cd6053cde70d15329cb" }, + "mini.ai": { "branch": "main", "commit": "9b9b7cfa38b4871c3e44cfe89cf6d53fd40684d9" }, + "mini.align": { "branch": "main", "commit": "26111a737494bc39576ad67b52bbc2638ca23553" }, + "mini.icons": { "branch": "main", "commit": "a2742459f0ee32806c2438ca06b4d8b331f3f4d4" }, + "mini.misc": { "branch": "main", "commit": "428da688126b320194a944233f9f8dfc46669307" }, "mini.move": { "branch": "main", "commit": "4caa1c212f5ca3d1633d21cfb184808090ed74b1" }, "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, - "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, - "neogen": { "branch": "main", "commit": "2cad4d6fe9fb7d359ef60f169cf4dad8eb17d6c5" }, - "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, + "neo-tree.nvim": { "branch": "main", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" }, + "neogen": { "branch": "main", "commit": "e932ba918b56723436b77aa3efb844a11b2851ab" }, + "neogit": { "branch": "master", "commit": "001f43f50d9589d837cec59004fd92486ab06870" }, "neovim-session-manager": { "branch": "master", "commit": "35c154a4b904cbe2aa7acce00a8c1c54a8831780" }, - "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-dap": { "branch": "master", "commit": "281a2e4cd1e7a17cea7ecb1745d84a8ab1249925" }, - "nvim-dap-go": { "branch": "main", "commit": "5511788255c92bdd845f8d9690f88e2e0f0ff9f2" }, - "nvim-dap-python": { "branch": "master", "commit": "d777c2b32ed39f61209c09bede28d7491621a631" }, - "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, + "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, + "nordic.nvim": { "branch": "main", "commit": "1ee4044077059b34eacd18d93613495a602c131f" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-cmp": { "branch": "main", "commit": "29fb4854573355792df9e156cb779f0d31308796" }, + "nvim-dap": { "branch": "master", "commit": "7ff6936010b7222fea2caea0f67ed77f1b7c60dd" }, + "nvim-dap-go": { "branch": "main", "commit": "6aa88167ea1224bcef578e8c7160fe8afbb44848" }, + "nvim-dap-python": { "branch": "master", "commit": "3e3dd98d4d83715c9e0e429b4a5da7bd706e6ceb" }, + "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "52638640ae309cacdaff785fdbb854437bd1ee5c" }, "nvim-highlight-colors": { "branch": "main", "commit": "a411550ef85cae467b889ba7d1a96bd78332d90e" }, - "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, - "nvim-lsp-file-operations": { "branch": "master", "commit": "92a673de7ecaa157dd230d0128def10beb56d103" }, - "nvim-lspconfig": { "branch": "master", "commit": "d4814330b207a4e05ba9515e453b0e87f20357ec" }, + "nvim-lint": { "branch": "master", "commit": "16b21a7d04d06661f92f273a0744fd81fb19e09e" }, + "nvim-lsp-file-operations": { "branch": "master", "commit": "9744b738183a5adca0f916527922078a965515ed" }, + "nvim-lspconfig": { "branch": "master", "commit": "54617a18f4cf46f0c2f6d024fa6feb7515fe036d" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-treesitter": { "branch": "master", "commit": "1e860567fbc19f117a03c0d2c46dcc01325c1b8b" }, - "nvim-treesitter-context": { "branch": "master", "commit": "0f3332788e0bd37716fbd25f39120dcfd557c90f" }, - "nvim-treesitter-textobjects": { "branch": "master", "commit": "ced6375723b20616282f9f6a1018a63ae19b106a" }, - "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, + "nvim-surround": { "branch": "main", "commit": "dca2e998ff26681ee422b92c6ed39b3d2908d8a9" }, + "nvim-treesitter": { "branch": "master", "commit": "1c111e3e8f42c85b16cb4bf30e4254fcb5607817" }, + "nvim-treesitter-context": { "branch": "master", "commit": "a2a334900d3643de585ac5c6140b03403454124f" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "3e450cd85243da99dc23ebbf14f9c70e9a0c26a4" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-web-devicons": { "branch": "master", "commit": "19d257cf889f79f4022163c3fbb5e08639077bd8" }, "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "quick-scope": { "branch": "master", "commit": "4d35d3b2bc6794666353dcc241b2680bd560416f" }, - "refactoring.nvim": { "branch": "master", "commit": "c406fc5fb4d7ba5fce7b668637075fad6e75e9f8" }, + "refactoring.nvim": { "branch": "master", "commit": "53ed6854e0bba64d467c58e87084dcf8b1c22d36" }, + "render-markdown.nvim": { "branch": "main", "commit": "fc05fb7c56795f191b6800799a2ec6ea325ba715" }, "resession.nvim": { "branch": "master", "commit": "c4d92a57b3936a2d6e1c087dbd6b670da2b1b082" }, "rustaceanvim": { "branch": "master", "commit": "047f9c9d8cd2861745eb9de6c1570ee0875aa795" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, - "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, - "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, "tokyonight.nvim": { "branch": "main", "commit": "6c30395146c246055ac3cea32d39d6b9876a1dcc" }, - "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, - "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, - "ts-error-translator.nvim": { "branch": "main", "commit": "11ae55b28bde02663b5f983f59b0e3fd9c4e845b" }, - "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "1420fb9e07b1d80cc6d87e7d90827fb2c1109cb3" }, - "venv-selector.nvim": { "branch": "regexp", "commit": "c43dc6bf8c7e7cf124a991775ed3defe87112d3a" }, + "trouble.nvim": { "branch": "main", "commit": "2f3b537f2207ce32f4459f9d56746ee013b5e01b" }, + "ts-comments.nvim": { "branch": "main", "commit": "2002692ad1d3f6518d016550c20c2a890f0cbf0e" }, + "ts-error-translator.nvim": { "branch": "main", "commit": "3bd23c4cfe4c2edc99278e01b75cdb2a26f03152" }, + "ultimate-autopair.nvim": { "branch": "v0.6", "commit": "9e3209190c22953566ae4e6436ad2b4ff4dabb95" }, + "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" }, "vim-subversive": { "branch": "master", "commit": "cea98a62ded4028118ad71c3e81b26eff2e0b8a0" }, - "vim-visual-multi": { "branch": "master", "commit": "38b0e8d94a5499ccc17d6159763d32c79f53417b" }, - "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, - "yazi.nvim": { "branch": "main", "commit": "307a3eabb3b941b046d15da1cb9e6d3e611e5221" } + "vim-visual-multi": { "branch": "master", "commit": "a6975e7c1ee157615bbc80fc25e4392f71c344d4" }, + "which-key.nvim": { "branch": "main", "commit": "8badb359f7ab8711e2575ef75dfe6fbbd87e4821" }, + "yazi.nvim": { "branch": "main", "commit": "6616bd5a24280d5a21d9110025451a69ebc9708e" } } diff --git a/.config/nvim-lazy/lua/config/gruber-darker.lua b/.config/nvim-lazy/lua/config/gruber-darker.lua index 84d2392..0c358c4 100644 --- a/.config/nvim-lazy/lua/config/gruber-darker.lua +++ b/.config/nvim-lazy/lua/config/gruber-darker.lua @@ -1,6 +1,5 @@ ---@diagnostic disable-next-line: missing-fields require("gruber-darker").setup({}) --- vim.cmd.colorscheme("gruber-darker") local c = require("gruber-darker.palette") vim.api.nvim_set_hl(0, "MatchParenCur", { bold = true }) @@ -19,36 +18,3 @@ vim.api.nvim_set_hl( "QuickScopeSecondary", { fg = c["brown"]:to_string(), bg = c["bg+1"]:to_string(), underline = true, bold = true } ) ---[[ -local Color = require("gruber-darker.color") -local M = {} - ----@type table -M = { - none = Color.none(), - fg = Color.new(0xe4e4e4), - ["fg+1"] = Color.new(0xf4f4ff), - ["fg+2"] = Color.new(0xf5f5f5), - white = Color.new(0xffffff), - black = Color.new(0x000000), - ["bg-1"] = Color.new(0x101010), - bg = Color.new(0x181818), - ["bg+1"] = Color.new(0x282828), - ["bg+2"] = Color.new(0x453d41), - ["bg+3"] = Color.new(0x484848), - ["bg+4"] = Color.new(0x52494e), - ["red-1"] = Color.new(0xc73c3f), - red = Color.new(0xf43841), - ["red+1"] = Color.new(0xff4f58), - green = Color.new(0x73d936), - yellow = Color.new(0xffdd33), - brown = Color.new(0xcc8c3c), - quartz = Color.new(0x95a99f), - ["niagara-2"] = Color.new(0x303540), - ["niagara-1"] = Color.new(0x565f73), - niagara = Color.new(0x96a6c8), - wisteria = Color.new(0x9e95c7), -} - -return M ---]] diff --git a/.config/nvim-lazy/lua/config/nordic.lua b/.config/nvim-lazy/lua/config/nordic.lua new file mode 100644 index 0000000..a503b8b --- /dev/null +++ b/.config/nvim-lazy/lua/config/nordic.lua @@ -0,0 +1,22 @@ +require("nordic").setup({ + transparent = { bg = true }, + -- Enable brighter float border. + bright_border = true, + on_highlight = function(highlights, palette) + highlights.QuickScopePrimary = { + fg = palette.yellow.bright, + bg = palette.gray0, + bold = true, + underline = true, + } + highlights.QuickScopeSecondary = { + fg = palette.orange.dim, + bg = palette.gray0, + bold = true, + underline = true, + } + highlights["@tag.attribute"] = { + fg = "#6cc3b7", -- #6dada4 | + } + end, +}) diff --git a/.config/nvim-lazy/lua/plugins/blink-cmp.lua b/.config/nvim-lazy/lua/plugins/blink-cmp.lua new file mode 100644 index 0000000..826042b --- /dev/null +++ b/.config/nvim-lazy/lua/plugins/blink-cmp.lua @@ -0,0 +1,29 @@ +---@type LazySpec +return { + "Saghen/blink.cmp", + enabled = false, + 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 } }, + }, +} diff --git a/.config/nvim-lazy/lua/plugins/cmp.lua b/.config/nvim-lazy/lua/plugins/cmp.lua index a319d01..d425e58 100644 --- a/.config/nvim-lazy/lua/plugins/cmp.lua +++ b/.config/nvim-lazy/lua/plugins/cmp.lua @@ -9,6 +9,12 @@ end ---@type LazySpec return { "hrsh7th/nvim-cmp", + dependencies = { + { "hrsh7th/cmp-path", enabled = false }, + "lukas-reineke/cmp-rg", + "octaltree/cmp-look", + "https://codeberg.org/FelipeLema/cmp-async-path", + }, opts = function(_, opts) local cmp = require("cmp") opts.mapping = vim.tbl_extend("force", opts.mapping, { @@ -49,26 +55,90 @@ return { [""] = cmp.mapping.complete({ config = { sources = { { name = "luasnip" } } }, }), + [""] = cmp.mapping.complete({ + config = { + sources = { + { + name = "nvim_lsp", + entry_filter = function(entry) + vim.print(entry.source:get_debug_name()) + if + ( + entry:get_kind() == require("cmp.types").lsp.CompletionItemKind.Text + or entry:get_kind() == require("cmp.types").lsp.CompletionItemKind.Snippet + ) and entry.source:get_debug_name() == "nvim_lsp:emmet_language_server" + then + return true + end + return false + end, + }, + }, + }, + }), [""] = cmp.mapping.complete({ config = { sources = { { name = "path" } } }, }), + [""] = cmp.mapping({ + i = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), + c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }), + }), }) opts.sources = cmp.config.sources({ - { name = "nvim_lsp" }, - { name = "path" }, + { + name = "nvim_lsp", + max_item_count = 20, + entry_filter = function(entry) + if + ( + entry:get_kind() == require("cmp.types").lsp.CompletionItemKind.Text + or entry:get_kind() == require("cmp.types").lsp.CompletionItemKind.Snippet + ) and entry.source:get_debug_name() == "nvim_lsp:emmet_language_server" + then + return false + end + return true + end, + }, + -- { name = "path" }, { name = "luasnip" }, + { name = "async_path", option = { trailing_slash = false } }, }, { { name = "buffer", option = { - keyword_length = 3, - get_bufnrs = function() - local bufIsSmall = function(bufnr) - return vim.api.nvim_buf_line_count(bufnr) < 2000 - end - return vim.tbl_filter(bufIsSmall, vim.api.nvim_list_bufs()) - -- return vim.api.nvim_list_bufs() - end, + keyword_length = 2, + -- get_bufnrs = function() + -- local bufIsSmall = function(bufnr) + -- return vim.api.nvim_buf_line_count(bufnr) < 2000 + -- end + -- return vim.tbl_filter(bufIsSmall, vim.api.nvim_list_bufs()) + -- -- return vim.api.nvim_list_bufs() + -- end, + }, + }, + { + name = "rg", + keyword_length = 3, + max_item_count = 10, + priority_weight = 50, + option = { + additional_arguments = "--smart-case --hidden", + set_filetype = true, + marker = " ❰❰❰", + }, + -- entry_filter = function(entry) + -- return not entry.exact + -- end, + }, + { + name = "look", + keyword_length = 4, + priority = 30, + option = { + convert_case = true, + loud = true, + --dict = '/usr/share/dict/words' }, }, }) diff --git a/.config/nvim-lazy/lua/plugins/colorscheme.lua b/.config/nvim-lazy/lua/plugins/colorscheme.lua index 88fcaeb..80f7ca6 100644 --- a/.config/nvim-lazy/lua/plugins/colorscheme.lua +++ b/.config/nvim-lazy/lua/plugins/colorscheme.lua @@ -2,9 +2,7 @@ return { { "LazyVim", - opts = { - colorscheme = "gruber-darker", - }, + opts = { colorscheme = "nordic" }, }, { "rebelot/kanagawa.nvim", @@ -16,10 +14,18 @@ return { }, { "blazkowolf/gruber-darker.nvim", - enabled = true, + enabled = false, event = "VimEnter", config = function() require("config.gruber-darker") end, }, + { + "AlexvZyl/nordic.nvim", + enabled = true, + event = "VimEnter", + config = function() + require("config.nordic") + end, + }, } diff --git a/.config/nvim-lazy/lua/plugins/fzf.lua b/.config/nvim-lazy/lua/plugins/fzf.lua index ac370d6..0516726 100644 --- a/.config/nvim-lazy/lua/plugins/fzf.lua +++ b/.config/nvim-lazy/lua/plugins/fzf.lua @@ -132,7 +132,7 @@ return { ["ctrl-x"] = actions.file_split, ["ctrl-q"] = actions.file_edit_or_qf, } - opts.defaults = { formatter = "path.filename_first" } + opts.defaults = { formatter = { "path.filename_first", 2 } } opts.keymap = vim.tbl_deep_extend("force", opts.keymap or {}, { fzf = { ["alt-a"] = "toggle-all", @@ -153,10 +153,7 @@ return { -- ['--tiebreak'] = 'end', }) opts.files = vim.tbl_deep_extend("force", opts.files or {}, { - fzf_opts = { - ["--layout"] = "reverse", - ["--tiebreak"] = "chunk", - }, + fzf_opts = { ["--layout"] = "reverse", ["--tiebreak"] = "chunk" }, winopts = { height = 0.55, width = 0.65, @@ -175,22 +172,11 @@ return { files = { cmd = "git ls-files --exclude-standard --cached --others", -- '--others' is used to show untracked files actions = m_keys, - winopts = { - height = 0.55, - width = 0.65, - row = 0.52, - col = 0.47, - }, + winopts = { height = 0.55, width = 0.65, row = 0.52, col = 0.47 }, previewer = false, }, - bcommits = { - actions = m_keys, - winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, - }, - commits = { - actions = m_keys, - winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, - }, + bcommits = { actions = m_keys, winopts = { preview = { layout = "vertical", vertical = "up:60%" } } }, + commits = { actions = m_keys, winopts = { preview = { layout = "vertical", vertical = "up:60%" } } }, branches = { winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, cmd = "git branch --all --color | sed 's#remotes/origin/##g'", @@ -224,26 +210,16 @@ return { winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, }) opts.lsp = vim.tbl_deep_extend("force", opts.lsp or {}, { - definitions = { - jump_to_single_result = true, - actions = m_keys, - }, - references = { - ignore_current_line = true, - actions = m_keys, - }, - symbols = { - actions = m_keys, - winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, - }, - finder = { - actions = m_keys, - winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, - }, - code_actions = { - actions = m_keys, - winopts = { preview = { layout = "vertical", vertical = "up:60%" } }, - }, + definitions = { jump_to_single_result = true, actions = m_keys }, + references = { ignore_current_line = true, actions = m_keys }, + symbols = { actions = m_keys, winopts = { preview = { layout = "vertical", vertical = "up:60%" } } }, + finder = { actions = m_keys, winopts = { preview = { layout = "vertical", vertical = "up:60%" } } }, + code_actions = { actions = m_keys, winopts = { preview = { layout = "vertical", vertical = "up:60%" } } }, }) + + local ok_dressing, _ = pcall(require, "dressing") + if not ok_dressing then + require("fzf-lua").register_ui_select() + end end, } diff --git a/.config/nvim/lua/plugins/config/cmp.lua b/.config/nvim/lua/plugins/config/cmp.lua index 623b4d4..d06631c 100644 --- a/.config/nvim/lua/plugins/config/cmp.lua +++ b/.config/nvim/lua/plugins/config/cmp.lua @@ -182,9 +182,6 @@ cmp.setup({ { name = 'buffer', max_item_count = 10, - entry_filter = function(entry) - return not entry.exact - end, option = { keyword_length = 2, -- get_bufnrs = function() diff --git a/.config/nvim/lua/plugins/config/fzf.lua b/.config/nvim/lua/plugins/config/fzf.lua index 15468e3..a0720f5 100644 --- a/.config/nvim/lua/plugins/config/fzf.lua +++ b/.config/nvim/lua/plugins/config/fzf.lua @@ -167,7 +167,10 @@ fzf.setup({ }, lines = { actions = m_keys }, }) -fzf.register_ui_select() +local ok_dressing, _ = pcall(require, 'dressing') +if not ok_dressing then + fzf.register_ui_select() +end vim.lsp.handlers['textDocument/codeAction'] = fzf.lsp_code_actions vim.lsp.handlers['textDocument/references'] = function() diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 2d75fb0..e12cf9a 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -75,8 +75,8 @@ setenv -g TMUX_PLUGIN_MANAGER_PATH "$HOME/.config/tmux/plugins/" if "test ! -d ~/.config/tmux/plugins/tpm" \ "run 'git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm && ~/.config/tmux/plugins/tpm/bin/install_plugins'" run -b '~/.config/tmux/plugins/tpm/tpm' -# set -g default-command /bin/fish -# set -g default-shell /bin/fish +set -g default-command /bin/fish +set -g default-shell /bin/fish set -g set-clipboard on # set -g @override_copy_command 'xclip -i -r -sel clip' diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index b71dff4..1117770 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -17,11 +17,11 @@ config.colors = { background = "#14131A", } -- Spawn a fish shell in login mode --- config.default_prog = { "/bin/fish", "-l" } +config.default_prog = { "/bin/fish", "-l" } config.font_size = 11.5 config.font = wezterm.font_with_fallback({ - -- "Comic Mono", + -- "Iosevka Custom Extended", -- "FiraCode Nerd Font", "JetBrainsMono Nerd Font", "FontAwesome",