diff --git a/README.md b/README.md index 0dbdcb3..9f1e134 100644 --- a/README.md +++ b/README.md @@ -4,11 +4,11 @@ ```bash # Update System Channels -sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.05-darwin nixpkgs +sudo nix-channel --add https://nixos.org/channels/nixpkgs-24.11-darwin nixpkgs sudo nix-channel --update # Update Home Manager -nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.05.tar.gz home-manager +nix-channel --add https://github.com/nix-community/home-manager/archive/release-24.11.tar.gz home-manager nix-channel --update # Build Home Manager diff --git a/home.nix b/home.nix index 9ae7a30..ca7b04a 100644 --- a/home.nix +++ b/home.nix @@ -42,6 +42,7 @@ in ssm-session-manager-plugin thefuck tldr + texliveSmall # Pandoc PDF Dep ] ++ optionals isDarwin [ kitty ] ++ optionals isLinux [ ]; diff --git a/nvim/config/lua/lsp-config.lua b/nvim/config/lua/lsp-config.lua index cde29f6..d495287 100644 --- a/nvim/config/lua/lsp-config.lua +++ b/nvim/config/lua/lsp-config.lua @@ -107,7 +107,7 @@ nvim_lsp.cssls.setup({ }) -- Typescript / Javascript LSP Configuration -nvim_lsp.tsserver.setup({ +nvim_lsp.ts_ls.setup({ on_attach = on_attach_no_formatting, flags = lsp_flags, capabilities = capabilities, diff --git a/nvim/config/lua/which-key-config.lua b/nvim/config/lua/which-key-config.lua index 18395f0..bfba876 100644 --- a/nvim/config/lua/which-key-config.lua +++ b/nvim/config/lua/which-key-config.lua @@ -2,64 +2,46 @@ local wk = require("which-key") wk.setup({}) -wk.register({ - K = { "Definition Hover" }, - [""] = { "Signature Help" }, - [""] = { - a = { "Aerial" }, - t = { "NeoTree" }, - q = { - name = "Diagnostics", - q = { "Toggle Diagnostic List" }, - t = { "Toggle Inline Diagnostics" }, - n = { "Next Diagnostic" }, - N = { "Previous Diagnostic" }, - e = { "Open Diagnostic Float" }, - }, - d = { - name = "Debug", - b = { "Toggle Breakpoint" }, - u = { "Toggle UI" }, - c = { "Continue" }, - t = { "Run Test" }, - }, - g = { - name = "DiffView", - o = { "DiffviewOpen", "Open Diff - Current" }, - O = { "DiffviewOpen origin/main...HEAD", "Open Diff - Main" }, - h = { "DiffviewFileHistory", "Diff History" }, - H = { - "DiffviewFileHistory --range=origin..HEAD", - "Diff History - Main", - }, - c = { "DiffviewClose", "Close Diff" }, - b = { "Git Blame Line" }, - B = { "Git Blame Full" }, - }, - f = { - name = "Find - Telescope", - f = { "Telescope find_files", "Find File" }, - g = { "Telescope live_grep", "Live Grep" }, - b = { "Telescope buffers", "Find Buffer" }, - j = { "Telescope jumplist", "Jump List" }, - h = { "Telescope help_tags", "Help Tags" }, - }, - l = { - name = "LSP", - D = { "Declaration" }, - d = { "Definition" }, - f = { "Format" }, - i = { "Implementation" }, - n = { "Rename" }, - r = { "References" }, - t = { "Type Definition" }, - }, - s = { - name = "Screenshot", - mode = { "v", "n" }, - b = { "Buffer Screenshot", mode = { "v", "n" } }, - s = { "Selected Screenshot", mode = "v" }, - v = { "Visual Screenshot", mode = "n" }, - }, - }, +wk.add({ + { "", desc = "Signature Help" }, + { "a", desc = "Aerial" }, + { "d", group = "Debug" }, + { "db", desc = "Toggle Breakpoint" }, + { "dc", desc = "Continue" }, + { "dt", desc = "Run Test" }, + { "du", desc = "Toggle UI" }, + { "f", group = "Find - Telescope" }, + { "fb", "Telescope buffers", desc = "Find Buffer" }, + { "ff", "Telescope find_files", desc = "Find File" }, + { "fg", "Telescope live_grep", desc = "Live Grep" }, + { "fh", "Telescope help_tags", desc = "Help Tags" }, + { "fj", "Telescope jumplist", desc = "Jump List" }, + { "g", group = "DiffView" }, + { "gB", desc = "Git Blame Full" }, + { "gH", "DiffviewFileHistory --range=origin..HEAD", desc = "Diff History - Main" }, + { "gO", "DiffviewOpen origin/main...HEAD", desc = "Open Diff - Main" }, + { "gb", desc = "Git Blame Line" }, + { "gc", "DiffviewClose", desc = "Close Diff" }, + { "gh", "DiffviewFileHistory", desc = "Diff History" }, + { "go", "DiffviewOpen", desc = "Open Diff - Current" }, + { "l", group = "LSP" }, + { "lD", desc = "Declaration" }, + { "ld", desc = "Definition" }, + { "lf", desc = "Format" }, + { "li", desc = "Implementation" }, + { "ln", desc = "Rename" }, + { "lr", desc = "References" }, + { "lt", desc = "Type Definition" }, + { "q", group = "Diagnostics" }, + { "qN", desc = "Previous Diagnostic" }, + { "qe", desc = "Open Diagnostic Float" }, + { "qn", desc = "Next Diagnostic" }, + { "qq", desc = "Toggle Diagnostic List" }, + { "qt", desc = "Toggle Inline Diagnostics" }, + { "sv", desc = "Visual Screenshot" }, + { "t", desc = "NeoTree" }, + { "K", desc = "Definition Hover" }, + { "ss", desc = "Selected Screenshot", mode = "v" }, + { "s", group = "Screenshot", mode = { "n", "v" } }, + { "sb", desc = "Buffer Screenshot", mode = { "n", "v" } }, }) diff --git a/nvim/default.nix b/nvim/default.nix index dc4cc9b..a4c0428 100644 --- a/nvim/default.nix +++ b/nvim/default.nix @@ -135,12 +135,12 @@ in gopls lua-language-server nodePackages.eslint - unstable.eslint_d - nodePackages.pyright nodePackages.svelte-language-server nodePackages.typescript nodePackages.typescript-language-server nodePackages.vscode-langservers-extracted + pyright + unstable.eslint_d # Formatters luaformatter