diff --git a/default-home.nix b/default-home.nix index 486e86c..da7d63d 100644 --- a/default-home.nix +++ b/default-home.nix @@ -105,6 +105,8 @@ unstable.gleam unstable.rebar3 unstable.bun + unstable.typescript-language-server + unstable.vscode-langservers-extracted unstable.gh unstable.kraft inputs.claude-code.packages.${system}.claude-code-bun diff --git a/nvim/lua/plugins.lua b/nvim/lua/plugins.lua index 3e22d65..607c78e 100644 --- a/nvim/lua/plugins.lua +++ b/nvim/lua/plugins.lua @@ -367,20 +367,20 @@ require("lazy").setup({ local opencode = require("opencode") vim.o.autoread = true -- Recommended/example keymaps. - vim.keymap.set({ "n", "x" }, "", function() + vim.keymap.set({ "n", "x" }, "ih", function() opencode.ask("@this: ", { submit = true }) end, { desc = "Ask opencode…" }) - vim.keymap.set({ "n", "x" }, "", + vim.keymap.set({ "n", "x" }, "ix", function() opencode.select() end, { desc = "Execute opencode action…" }) - vim.keymap.set({ "n", "t" }, "", + vim.keymap.set({ "n", "t" }, "it", function() opencode.toggle() end, { desc = "Toggle opencode" }) - vim.keymap.set({ "n", "x" }, "go", function() + vim.keymap.set({ "n", "x" }, "igg", function() return opencode.operator("@this ") end, { desc = "Add range to opencode", expr = true }) - vim.keymap.set("n", "goo", function() + vim.keymap.set("n", "igo", function() return opencode.operator("@this ") .. "_" end, { desc = "Add line to opencode", expr = true }) @@ -390,16 +390,6 @@ require("lazy").setup({ vim.keymap.set("n", "", function() opencode.command("session.half.page.down") end, { desc = "Scroll opencode down" }) - - -- You may want these if you stick with the opinionated "" and "" above — otherwise consider "o…". - vim.keymap.set("n", "+", "", { - desc = "Increment under cursor", - noremap = true - }) - vim.keymap.set("n", "-", "", { - desc = "Decrement under cursor", - noremap = true - }) end } } diff --git a/sway/config b/sway/config index 3ff5f81..bbce4ba 100644 --- a/sway/config +++ b/sway/config @@ -14,7 +14,7 @@ set $up k set $right l # Your preferred terminal emulator -set $term kitty +set $term ghostty # Your preferred application launcher # Note: it's recommended that you pass the final command to sway #set $menu dmenu_path | dmenu | xargs swaymsg exec --