diff --git a/.wezterm.lua b/.wezterm.lua index d7a265a..311068f 100644 --- a/.wezterm.lua +++ b/.wezterm.lua @@ -22,6 +22,8 @@ wezterm.on("window-config-reloaded", function(window, pane) end end) +config.front_end = "OpenGL" + config.font = wezterm.font("CommitMono") config.font_size = 14 diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..411e12c --- /dev/null +++ b/install.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +# install wezterm config +ln -s "$HOME/dotfiles/.wezterm.lua" "$HOME/.wezterm.lua" + +# install neovim config +if [ ! -d "$HOME/.config/nvim" ]; then + mkdir -p "$HOME/.config/nvim" + ln -s "$HOME/dotfiles/nvim" "$HOME/.config/nvim" +fi + +# install starship config +ln -s "$HOME/dotfiles/starship.toml" "$HOME/.config/starship.toml" + +# install goneovim config +mkdir -p "$HOME/.config/goneovim" +ln -s "$HOME/dotfiles/goneovim.toml" "$HOME/.config/goneovim/settings.toml" + +# install aerospace config +ln -s "$HOME/dotfiles/aerospace.toml" "$HOME/.aerospace.toml" diff --git a/nvim/init.lua b/nvim/init.lua index a6da64d..740c3bb 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -11,7 +11,6 @@ function init_lazy_nvim() }) end vim.opt.rtp:prepend(lazypath) - require("lazy").setup(PLUGINS, opts) end @@ -65,7 +64,7 @@ function define_keymaps() vim.keymap.set("n", "F", builtin.find_files, {}) vim.keymap.set("n", "g", builtin.live_grep, {}) vim.keymap.set("n", "b", builtin.buffers, {}) - vim.keymap.set("n", "r", builtin.lsp_references, {}) + vim.keymap.set("n", "u", builtin.lsp_references, {}) end function setup_plugins() @@ -157,11 +156,33 @@ function setup_plugins() }, }) - require("telescope").setup({ + local telescope = require("telescope") + telescope.setup({ defaults = { file_ignore_patterns = { "node_modules" }, }, + + extensions = { + ["ui-select"] = { + require("telescope.themes").get_dropdown({}), + + -- pseudo code / specification for writing custom displays, like the one + -- for "codeactions" + -- specific_opts = { + -- [kind] = { + -- make_indexed = function(items) -> indexed_items, width, + -- make_displayer = function(widths) -> displayer + -- make_display = function(displayer) -> function(e) + -- make_ordinal = function(e) -> string + -- }, + -- -- for example to disable the custom builtin "codeactions" display + -- do the following + -- codeactions = false, + -- } + }, + }, }) + telescope.load_extension("ui-select") require("nvim-web-devicons").setup() @@ -197,6 +218,10 @@ function setup_plugins() }, }, }, + + clangd = { + cmd = { "clangd", "--background-index", "--clang-tidy" }, + }, } require("mason").setup() @@ -503,6 +528,7 @@ PLUGINS = { tag = "0.1.6", dependencies = { "nvim-lua/plenary.nvim" }, }, + { "nvim-telescope/telescope-ui-select.nvim" }, { { "kdheepak/lazygit.nvim", diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 54f44a0..d413523 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,28 +1,29 @@ { - "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" }, - "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" }, - "catppuccin": { "branch": "main", "commit": "6af91673ceccbd6e073b66c439e7fce239f72d24" }, + "LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" }, + "auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" }, + "catppuccin": { "branch": "main", "commit": "cc8e290d4c0d572171243087f8541e49be2c8764" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" }, - "gitsigns.nvim": { "branch": "main", "commit": "9cafac31a091267838e1e90fd6e083d37611f516" }, - "lazy.nvim": { "branch": "main", "commit": "3f13f080434ac942b150679223d54f5ca91e0d52" }, - "lazygit.nvim": { "branch": "main", "commit": "0ada6c6e7e138df92f5009b6952f4ac41248305a" }, + "gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" }, + "lazy.nvim": { "branch": "main", "commit": "4c6479e98ad643cd584e9e7c4095c463e0d810eb" }, + "lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "273fdde8ac5e51f3a223ba70980e52bbc09d9f6f" }, - "mason.nvim": { "branch": "main", "commit": "751b1fcbf3d3b783fcf8d48865264a9bcd8f9b10" }, - "no-neck-pain.nvim": { "branch": "main", "commit": "34625be12649666b7ccb08761087cc97bb788552" }, - "nvim-autopairs": { "branch": "master", "commit": "4f41e5940bc0443fdbe5f995e2a596847215cd2a" }, - "nvim-cmp": { "branch": "main", "commit": "8f3c541407e691af6163e2447f3af1bd6e17f9a3" }, - "nvim-lspconfig": { "branch": "master", "commit": "aa5f4f4ee10b2688fb37fa46215672441d5cd5d9" }, - "nvim-tree.lua": { "branch": "master", "commit": "347e1eb35264677f66a79466bb5e3d111968e12c" }, - "nvim-treesitter": { "branch": "master", "commit": "cbf9090a4c715fa9eb38be71062bf19194b45bd2" }, - "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" }, - "nvim-web-devicons": { "branch": "master", "commit": "794bba734ec95eaff9bb82fbd112473be2087283" }, - "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" }, + "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, + "no-neck-pain.nvim": { "branch": "main", "commit": "741ad26c4acc45f2164a3933f7825b0e555b724d" }, + "nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, + "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" }, + "nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" }, + "nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" }, + "nvim-treesitter": { "branch": "master", "commit": "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421" }, + "nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" }, + "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, + "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, + "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "typst-preview.nvim": { "branch": "master", "commit": "36a82aaff8931f96015ee7365afe2e253ab3b1ea" }, "vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" }