diff --git a/flake.lock b/flake.lock index a76decf..5ba4c21 100644 --- a/flake.lock +++ b/flake.lock @@ -1,15 +1,50 @@ { "nodes": { + "agent-skills": { + "inputs": { + "home-manager": "home-manager_2", + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1774607140, + "narHash": "sha256-0P89BLGEzRUumWKSOEayi+Dal6mIlVumlBgcyk5Qo6s=", + "owner": "Kyure-A", + "repo": "agent-skills-nix", + "rev": "e29bef0e9e56c4cc683cead15a6eda1d6fb1074e", + "type": "github" + }, + "original": { + "owner": "Kyure-A", + "repo": "agent-skills-nix", + "type": "github" + } + }, + "anthropic-skills": { + "flake": false, + "locked": { + "lastModified": 1775755206, + "narHash": "sha256-H/oorOl5cch7bnziDz7gHNBv5Q0OAwFbk9w1WLku2kk=", + "owner": "anthropics", + "repo": "skills", + "rev": "12ab35c2eb5668c95810e6a6066f40f4218adc39", + "type": "github" + }, + "original": { + "owner": "anthropics", + "repo": "skills", + "type": "github" + } + }, "catppuccin": { "inputs": { "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1774799062, - "narHash": "sha256-U9RGxFsLeKivD1+7sVXj5TltHGfB4m/dkn3dENT2fSM=", + "lastModified": 1776681486, + "narHash": "sha256-akO/L6Jt4341uBnf3CIpJOTTYyCBQsSvP2hnikV2oMY=", "owner": "catppuccin", "repo": "nix", - "rev": "948a8ee84858d053b83f01c8c168f9f4347937e6", + "rev": "b85b328ecc9874f4e7424db2820333c148e8dd66", "type": "github" }, "original": { @@ -18,17 +53,37 @@ "type": "github" } }, + "claude-code-overlay": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776982322, + "narHash": "sha256-nkkEf7b0c3YWqnmQWB4JRfnXDaVEknKbeowH2PJQ/NQ=", + "owner": "ryoppippi", + "repo": "claude-code-overlay", + "rev": "59bb590492ee6af9eeb0d8e9e8f6a73140aec761", + "type": "github" + }, + "original": { + "owner": "ryoppippi", + "repo": "claude-code-overlay", + "type": "github" + } + }, "codex-cli-nix": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1774566674, - "narHash": "sha256-UVHUY9jHiFj9jqY3KH28OThDEX4JUeEEWIUE+3VFJVI=", + "lastModified": 1776972632, + "narHash": "sha256-aNyjCbNb7s5H7zQ+4ejkIBZ+rtth5pwG6MRMJu0yj98=", "owner": "sadjow", "repo": "codex-cli-nix", - "rev": "d43a70bd123e49cb862ee36d0e3ab2ed550308df", + "rev": "f24bd798cfaf1fa514b5e22f77f8100a77438ea1", "type": "github" }, "original": { @@ -106,6 +161,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -113,11 +186,11 @@ ] }, "locked": { - "lastModified": 1774898676, - "narHash": "sha256-0Utnqo+FbB+0CVUi0MI3oonF0Kuzy9VcgRkxl53Euvk=", + "lastModified": 1777000050, + "narHash": "sha256-SnungQ8w1+5Mz+axhxZJKzj3OawvwXfqhGyeFFUJnYU=", "owner": "nix-community", "repo": "home-manager", - "rev": "a184bd2f8426087bae93f203403cd4b86c99e57d", + "rev": "4bf1f0bcd156d1f1b23f46902a170c93cd197b88", "type": "github" }, "original": { @@ -126,6 +199,49 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "lazycwl", + "agent-skills", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1773608492, + "narHash": "sha256-QZteyExJYSQzgxqdsesDPbQgjctGG7iKV/6ooyQPITk=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "9a40ec3b78fc688d0908485887d355caa5666d18", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "lazycwl": { + "inputs": { + "agent-skills": "agent-skills", + "anthropic-skills": "anthropic-skills", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1777044922, + "narHash": "sha256-sHXGgzi+xtcM/Wc3BSWQ02LY9RuBlayVXNs3cS+Cko0=", + "owner": "myuron", + "repo": "lazycwl", + "rev": "1c175f5e4ec7f3c3b63f05267f5dc4e1988103c9", + "type": "github" + }, + "original": { + "owner": "myuron", + "repo": "lazycwl", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -133,11 +249,11 @@ ] }, "locked": { - "lastModified": 1773000227, - "narHash": "sha256-zm3ftUQw0MPumYi91HovoGhgyZBlM4o3Zy0LhPNwzXE=", + "lastModified": 1775037210, + "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "da529ac9e46f25ed5616fd634079a5f3c579135f", + "rev": "06648f4902343228ce2de79f291dd5a58ee12146", "type": "github" }, "original": { @@ -148,11 +264,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1774933469, - "narHash": "sha256-OrnCQeUO2bqaWUl0lkDWyGWjKsOhtCyd7JSfTedQNUE=", + "lastModified": 1776983936, + "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "f4c4c2c0c923d7811ac2a63ccc154767e4195337", + "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61", "type": "github" }, "original": { @@ -164,11 +280,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1773821835, - "narHash": "sha256-TJ3lSQtW0E2JrznGVm8hOQGVpXjJyXY2guAxku2O9A4=", + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b40629efe5d6ec48dd1efba650c797ddbd39ace0", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", "type": "github" }, "original": { @@ -195,11 +311,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1774273680, - "narHash": "sha256-a++tZ1RQsDb1I0NHrFwdGuRlR5TORvCEUksM459wKUA=", + "lastModified": 1776329215, + "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fdc7b8f7b30fdbedec91b71ed82f36e1637483ed", + "rev": "b86751bc4085f48661017fa226dee99fab6c651b", "type": "github" }, "original": { @@ -211,11 +327,41 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1774855581, - "narHash": "sha256-YkreHeMgTCYvJ5fESV0YyqQK49bHGe2B51tH6claUh4=", + "lastModified": 1773520392, + "narHash": "sha256-Ra3l8zI7AYwaCxXcU4An8jAC1hhz/TEleXboJhWaBwY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "f59e980846fe86cd831899cd032fdbd1d6054086", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1775710090, + "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=", + "rev": "4c1018dae018162ec878d42fec712642d214fdfa", + "revCount": 977467, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.1.977467%2Brev-4c1018dae018162ec878d42fec712642d214fdfa/019d75d9-1186-76c1-baa5-93baafa37a8d/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/0.1" + } + }, + "nixpkgs_5": { + "locked": { + "lastModified": 1776329215, + "narHash": "sha256-a8BYi3mzoJ/AcJP8UldOx8emoPRLeWqALZWu4ZvjPXw=", "owner": "nixOS", "repo": "nixpkgs", - "rev": "15c6719d8c604779cf59e03c245ea61d3d7ab69b", + "rev": "b86751bc4085f48661017fa226dee99fab6c651b", "type": "github" }, "original": { @@ -225,7 +371,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1767026758, "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", @@ -244,12 +390,14 @@ "root": { "inputs": { "catppuccin": "catppuccin", + "claude-code-overlay": "claude-code-overlay", "codex-cli-nix": "codex-cli-nix", "flake-utils": "flake-utils_2", "home-manager": "home-manager", + "lazycwl": "lazycwl", "nix-darwin": "nix-darwin", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_5", "xremap": "xremap" } }, @@ -283,19 +431,34 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "xremap": { "inputs": { "crane": "crane", "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_6", "xremap": "xremap_2" }, "locked": { - "lastModified": 1771968045, - "narHash": "sha256-BK2Zcio1gBMTIjIV2MfULqgxv21Y4S9HbgzGuI4AzSc=", + "lastModified": 1776699398, + "narHash": "sha256-UzfoClPv+lH4/6qeBG2GUPawpa4FrrxAPKESvjqcIY0=", "owner": "xremap", "repo": "nix-flake", - "rev": "b89f36dd4a0a68d904a4995e3156f0ac758fcdd6", + "rev": "2961d7191f78961028f999a81343ff0937b7df37", "type": "github" }, "original": { @@ -307,16 +470,16 @@ "xremap_2": { "flake": false, "locked": { - "lastModified": 1771790974, - "narHash": "sha256-hXbCEdWcpOvHsFIE7pQw3evqPjqXJhEYBCBJKoGVzJQ=", + "lastModified": 1776689543, + "narHash": "sha256-J07iDGltzJg/2r+bUlBaOpZxAhg020J1giqbTZNSDRY=", "owner": "k0kubun", "repo": "xremap", - "rev": "a2fc6caa0c7d35d87d130437dc4a4582a3908871", + "rev": "7d23ea211451019c325c6f33c28ccd4e0d72fb00", "type": "github" }, "original": { "owner": "k0kubun", - "ref": "v0.14.15", + "ref": "v0.15.2", "repo": "xremap", "type": "github" } diff --git a/flake.nix b/flake.nix index 2247510..1661d1d 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,10 @@ url = "github:ryoppippi/claude-code-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; + + lazycwl = { + url = "github:myuron/lazycwl"; + }; }; outputs = { @@ -49,6 +53,7 @@ catppuccin, codex-cli-nix, claude-code-overlay, + lazycwl } @ inputs: let systems = { @@ -97,7 +102,10 @@ pkgs = import inputs.nixpkgs { system = systems.linux; config.allowUnfree = true; - overlays = [ claude-code-overlay.overlays.default ]; + overlays = [ + claude-code-overlay.overlays.default + lazycwl.overlays.default + ]; }; extraSpecialArgs = { inherit inputs; @@ -112,7 +120,10 @@ pkgs = import inputs.nixpkgs { system = systems.darwin; config.allowUnfree = true; - overlays = [ claude-code-overlay.overlays.default ]; + overlays = [ + claude-code-overlay.overlays.default + lazycwl.overlays.default + ]; }; extraSpecialArgs = { inherit inputs; diff --git a/ghostty/config b/ghostty/config new file mode 100644 index 0000000..31fa3bc --- /dev/null +++ b/ghostty/config @@ -0,0 +1,10 @@ +font-size = 14 +theme = tokyonight + +keybind = ctrl+q>v=new_split:right +keybind = ctrl+q>s=new_split:down + +keybind = ctrl+q>h=goto_split:left +keybind = ctrl+q>j=goto_split:down +keybind = ctrl+q>k=goto_split:up +keybind = ctrl+q>l=goto_split:right diff --git a/nix/home-manager/common/default.nix b/nix/home-manager/common/default.nix index a8e06f5..4e0b86b 100644 --- a/nix/home-manager/common/default.nix +++ b/nix/home-manager/common/default.nix @@ -13,6 +13,7 @@ in ./claude ./fish neovim + ./symlink ]; home = rec { @@ -109,6 +110,7 @@ in # aws # ==================== awscli2 + lazycwl # ==================== # general language tool diff --git a/nix/home-manager/common/fish/default.nix b/nix/home-manager/common/fish/default.nix index e92c38a..b750e4f 100644 --- a/nix/home-manager/common/fish/default.nix +++ b/nix/home-manager/common/fish/default.nix @@ -33,6 +33,7 @@ ls = "eza --icons always --classify"; ll = "eza --icons always --classify -lh"; la = "eza --icons always --classify -lha"; + lt = "eza --icons always --classify -lhaT"; cat = "bat"; grep = "rg"; diff = "diff-so-fancy"; diff --git a/nix/home-manager/common/neovim/default.nix b/nix/home-manager/common/neovim/default.nix index 8747e0c..58b54df 100644 --- a/nix/home-manager/common/neovim/default.nix +++ b/nix/home-manager/common/neovim/default.nix @@ -8,6 +8,7 @@ in defaultEditor = true; viAlias = true; vimAlias = true; + sideloadInitLua = true; }; home.file.".config/nvim" = { diff --git a/nix/home-manager/common/symlink/default.nix b/nix/home-manager/common/symlink/default.nix new file mode 100644 index 0000000..467abc5 --- /dev/null +++ b/nix/home-manager/common/symlink/default.nix @@ -0,0 +1,9 @@ +{ config, ...}: +let + inherit (config.lib.file) mkOutOfStoreSymlink; +in +{ + home.file.".config/ghostty" = { + source = mkOutOfStoreSymlink "${config.home.homeDirectory}/src/github.com/myuron/dotfiles/ghostty"; + }; +} diff --git a/nix/nix-darwin/default.nix b/nix/nix-darwin/default.nix index 3b4c5b3..1ea29d7 100644 --- a/nix/nix-darwin/default.nix +++ b/nix/nix-darwin/default.nix @@ -44,6 +44,9 @@ in casks = [ "wezterm" "arc" + "claude" + "cmux" + "ghostty" ]; }; diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index c517a97..2be85b0 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,38 +1,35 @@ { - "LuaSnip": { "branch": "master", "commit": "642b0c595e11608b4c18219e93b88d7637af27bc" }, + "LuaSnip": { "branch": "master", "commit": "a62e1083a3cfe8b6b206e7d3d33a51091df25357" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "catppuccin": { "branch": "main", "commit": "a7788416689dbefea659d9e9415c87926b0ba5d8" }, + "budoux.lua": { "branch": "main", "commit": "7f23658b127b9a74aae5b388fefcd997be30cbfc" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "gitsigns.nvim": { "branch": "main", "commit": "c21302d187010bbf76527a74651ecfe6bbdc6f2d" }, - "kanagawa.nvim": { "branch": "master", "commit": "aef7f5cec0a40dbe7f3304214850c472e2264b10" }, + "gitsigns.nvim": { "branch": "main", "commit": "6d808f99bd63303646794406e270bd553ad7792e" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, - "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, - "mini.nvim": { "branch": "main", "commit": "439cdcd6992bc9012efd7d8ed7a7b7a0f1fac32a" }, - "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, + "lualine.nvim": { "branch": "master", "commit": "a905eeebc4e63fdc48b5135d3bf8aea5618fb21c" }, + "mason.nvim": { "branch": "main", "commit": "12ddd182d9efbdc848b540f16484a583d52da0fb" }, + "md-render.nvim": { "branch": "main", "commit": "75d976d89edc4b9457447ba83201ec5805600f79" }, + "mini.nvim": { "branch": "main", "commit": "5849ef04c32a6a8e55957b946c0a275801d87530" }, "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-cmp": { "branch": "main", "commit": "a1d504892f2bc56c2e79b65c6faded2fd21f3eca" }, - "nvim-dap": { "branch": "master", "commit": "2a8799ad91a1495c6bdf753f9b2179b3ff0f5bba" }, + "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" }, "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, - "nvim-dap-ui": { "branch": "master", "commit": "f5b6673f374626515401c5bc51b005f784a4f252" }, + "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lspconfig": { "branch": "master", "commit": "1a6d69206749a646ef28bfb39460610b14baff40" }, + "nvim-lspconfig": { "branch": "master", "commit": "e146efacbafed3789ac568abcc5a981c5decaa58" }, "nvim-navic": { "branch": "master", "commit": "f5eba192f39b453675d115351808bd51276d9de5" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-scrollbar": { "branch": "main", "commit": "f8e87b96cd6362ef8579be456afee3b38fd7e2a8" }, - "nvim-treesitter": { "branch": "main", "commit": "6620ae1c44dfa8623b22d0cbf873a9e8d073b849" }, - "nvim-web-devicons": { "branch": "master", "commit": "d7462543c9e366c0d196c7f67a945eaaf5d99414" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-web-devicons": { "branch": "master", "commit": "5b9067899ee6a2538891573500e8fd6ff008440f" }, "oil.nvim": { "branch": "master", "commit": "0fcc83805ad11cf714a949c98c605ed717e0b83e" }, "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, - "solarized-osaka.nvim": { "branch": "main", "commit": "f0c2f0ba0bd56108d53c9bfae4bb28ff6c67bbdb" }, "tokyonight.nvim": { "branch": "main", "commit": "cdc07ac78467a233fd62c493de29a17e0cf2b2b6" }, "vim-prisma": { "branch": "main", "commit": "95c5b25066efb34c75bce78698baa371fe0ee7c2" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } diff --git a/nvim/lua/configs/keymap.lua b/nvim/lua/configs/keymap.lua index 3ffee05..0122969 100644 --- a/nvim/lua/configs/keymap.lua +++ b/nvim/lua/configs/keymap.lua @@ -61,7 +61,7 @@ keymap("n", "E", function() picker.explorer() end, { desc = "Explorer Op -- Find -- ------------------------------ keymap("n", "fp", function() picker.pickers() end, { desc = "Pickers Picker" }) -keymap("n", "fb", function() picker.files() end, { desc = "Buffers" }) +keymap("n", "fb", function() picker.buffers() end, { desc = "Buffers" }) keymap("n", "ff", function() picker.files() end, { desc = "Find Files" }) keymap("n", "fl", function() picker.lines() end, { desc = "Buffer Lines" }) keymap("n", "fg", function() picker.grep_buffers() end, { desc = "Grep Open Buffers" }) @@ -80,14 +80,15 @@ local diag = vim.diagnostic local lsp = vim.lsp.buf -- Hover Document -keymap("n", "lh", function() lsp.hover() end, { desc = "Hover Doc" }) +keymap("n", "K", function() lsp.hover() end, { desc = "Hover Doc" }) +keymap("n", "gr", function() lsp.references() end, { desc = "Hover Doc" }) -- Diagnostics -keymap("n", "lH", function() diag.open_float() end, { desc = "Diagnostics Open Float" }) +keymap("n", "gK", function() diag.open_float() end, { desc = "Diagnostics Open Float" }) keymap("n", "ll", function() picker.diagnostics_buffer() end, { desc = "Diagnostics Buffer" }) keymap("n", "lL", function() picker.diagnostics() end, { desc = "Diagnostics" }) -keymap("n", "l]", function() diag.goto_next() end, { desc = "Goto Next Diagnostic" }) -keymap("n", "l[", function() diag.goto_prev() end, { desc = "Goto Prev Diagnostic" }) +keymap("n", "l]", function() diag.jump({ count = 1 }) end, { desc = "Goto Next Diagnostic" }) +keymap("n", "l[", function() diag.jump({ count = -1 }) end, { desc = "Goto Prev Diagnostic" }) -- Definitions keymap("n", "ld", function() picker.lsp_definitions() end, { desc = "Goto Definition" }) @@ -113,5 +114,14 @@ keymap("n", "ln", function() lsp.rename() end, { desc = "Rename" }) -- Code Actions keymap("n", "la", function() lsp.code_action() end, { desc = "Code Action" }) --- Format +-- Formag keymap("n", "lf", function() lsp.format() end, { desc = "Format" }) + +-- ------------------------------ +-- Misc +-- ------------------------------ +keymap("n", "sm", "RenderMarkdown toggle", { desc = "Toggle Render Markdown" }) + +keymap("n", "mp", "MdRender") +keymap("n", "mt", "MdRenderTab") +keymap("n", "md", "MdRenderDemo") diff --git a/nvim/lua/plugins/md-render.lua b/nvim/lua/plugins/md-render.lua new file mode 100644 index 0000000..f478776 --- /dev/null +++ b/nvim/lua/plugins/md-render.lua @@ -0,0 +1,8 @@ +return { + "delphinus/md-render.nvim", + version = "*", + dependencies = { + { "nvim-tree/nvim-web-devicons", version = "*" }, + { "delphinus/budoux.lua", version = "*" }, + }, +} diff --git a/nvim/lua/plugins/nvim-cmp.lua b/nvim/lua/plugins/nvim-cmp.lua index 1bab6e7..8d9fa62 100644 --- a/nvim/lua/plugins/nvim-cmp.lua +++ b/nvim/lua/plugins/nvim-cmp.lua @@ -9,6 +9,7 @@ return { "saadparwaiz1/cmp_luasnip", "L3MON4D3/LuaSnip", }, + event = { "InsertEnter", "CmdlineEnter" }, config = function() local cmp = require("cmp") local types = require('cmp.types')