From 68b808f86e1b540c0acc5f63a80c0163263682dd Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Wed, 29 Apr 2026 11:06:56 +0200 Subject: [PATCH] Update neovim, ghostty --- .../fish/conf.d/fish_frozen_key_bindings.fish | 14 ++ .config/fish/conf.d/fish_frozen_theme.fish | 45 ++++++ .config/fish/conf.d/rustup.fish | 1 + .config/fish/fish_variables | 41 +----- .config/ghostty/config.ghostty | 1 + .config/nvim/after/plugin/lsp.lua | 15 +- .config/nvim/lazy-lock.json | 75 +++++----- .../nvim/lua/halfdan/plugins/claudecode.lua | 24 ++++ .config/nvim/lua/halfdan/plugins/neorg.lua | 134 +++++++++--------- .config/nvim/lua/halfdan/plugins/other.lua | 9 -- .../nvim/lua/halfdan/plugins/telescope.lua | 2 +- .../nvim/lua/halfdan/plugins/treesitter.lua | 17 +++ .config/tmux/tmux.conf | 14 +- .config/wezterm/wezterm.lua | 27 +++- 14 files changed, 257 insertions(+), 162 deletions(-) create mode 100644 .config/fish/conf.d/fish_frozen_key_bindings.fish create mode 100644 .config/fish/conf.d/fish_frozen_theme.fish create mode 100644 .config/fish/conf.d/rustup.fish create mode 100644 .config/ghostty/config.ghostty create mode 100644 .config/nvim/lua/halfdan/plugins/claudecode.lua diff --git a/.config/fish/conf.d/fish_frozen_key_bindings.fish b/.config/fish/conf.d/fish_frozen_key_bindings.fish new file mode 100644 index 0000000..495aee9 --- /dev/null +++ b/.config/fish/conf.d/fish_frozen_key_bindings.fish @@ -0,0 +1,14 @@ +# This file was created by fish when upgrading to version 4.3, to migrate +# the 'fish_key_bindings' variable from its old default scope (universal) +# to its new default scope (global). We recommend you delete this file +# and configure key bindings in ~/.config/fish/config.fish if needed. + +# set --global fish_key_bindings fish_default_key_bindings + +# Prior to version 4.3, fish shipped an event handler that runs +# `set --universal fish_key_bindings fish_default_key_bindings` +# whenever the fish_key_bindings variable is erased. +# This means that as long as any fish < 4.3 is still running on this system, +# we cannot complete the migration. +# As a workaround, erase the universal variable at every shell startup. +set --erase --universal fish_key_bindings diff --git a/.config/fish/conf.d/fish_frozen_theme.fish b/.config/fish/conf.d/fish_frozen_theme.fish new file mode 100644 index 0000000..3497720 --- /dev/null +++ b/.config/fish/conf.d/fish_frozen_theme.fish @@ -0,0 +1,45 @@ +# This file was created by fish when upgrading to version 4.3, to migrate +# theme variables from universal to global scope. +# Don't edit this file, as it will be written by the web-config tool (`fish_config`). +# To customize your theme, delete this file and see +# help interactive#syntax-highlighting +# or +# man fish-interactive | less +/^SYNTAX.HIGHLIGHTING +# for appropriate commands to add to ~/.config/fish/config.fish instead. +# See also the release notes for fish 4.3.0 (run `help relnotes`). + +# Kanagawa Fish shell theme +# A template was taken and modified from Tokyonight: +# https://github.com/folke/tokyonight.nvim/blob/main/extras/fish_tokyonight_night.fish +set -l foreground DCD7BA normal +set -l selection 2D4F67 brcyan +set -l comment 727169 brblack +set -l red C34043 red +set -l orange FF9E64 brred +set -l yellow C0A36E yellow +set -l green 76946A green +set -l purple 957FB8 magenta +set -l cyan 7AA89F cyan +set -l pink D27E99 brmagenta + +# Syntax Highlighting Colors +set -g fish_color_normal $foreground +set -g fish_color_command $cyan +set -g fish_color_keyword $pink +set -g fish_color_quote $yellow +set -g fish_color_redirection $foreground +set -g fish_color_end $orange +set -g fish_color_error $red +set -g fish_color_param $purple +set -g fish_color_comment $comment +set -g fish_color_selection --background=$selection +set -g fish_color_search_match --background=$selection +set -g fish_color_operator $green +set -g fish_color_escape $pink +set -g fish_color_autosuggestion $comment + +# Completion Pager Colors +set -g fish_pager_color_progress $comment +set -g fish_pager_color_prefix $cyan +set -g fish_pager_color_completion $foreground +set -g fish_pager_color_description $comment diff --git a/.config/fish/conf.d/rustup.fish b/.config/fish/conf.d/rustup.fish new file mode 100644 index 0000000..e4cb363 --- /dev/null +++ b/.config/fish/conf.d/rustup.fish @@ -0,0 +1 @@ +source "$HOME/.cargo/env.fish" diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index 14cf127..b862802 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -1,43 +1,4 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 -SETUVAR __fish_initialized:3800 -SETUVAR fish_color_autosuggestion:969896 -SETUVAR fish_color_cancel:\x2d\x2dreverse -SETUVAR fish_color_command:b294bb -SETUVAR fish_color_comment:f0c674 -SETUVAR fish_color_cwd:green -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:b294bb -SETUVAR fish_color_error:cc6666 -SETUVAR fish_color_escape:00a6b2 -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:\x1d -SETUVAR fish_color_keyword:\x1d -SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_option:\x1d -SETUVAR fish_color_param:81a2be -SETUVAR fish_color_quote:b5bd68 -SETUVAR fish_color_redirection:8abeb7 -SETUVAR fish_color_search_match:white\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:brgreen -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_background:\x1d -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_secondary_background:\x1d -SETUVAR fish_pager_color_secondary_completion:\x1d -SETUVAR fish_pager_color_secondary_description:\x1d -SETUVAR fish_pager_color_secondary_prefix:\x1d -SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3dbrblack -SETUVAR fish_pager_color_selected_completion:\x1d -SETUVAR fish_pager_color_selected_description:\x1d -SETUVAR fish_pager_color_selected_prefix:\x1d +SETUVAR __fish_initialized:4300 SETUVAR fish_user_paths:/opt/homebrew/bin diff --git a/.config/ghostty/config.ghostty b/.config/ghostty/config.ghostty new file mode 100644 index 0000000..4e26c72 --- /dev/null +++ b/.config/ghostty/config.ghostty @@ -0,0 +1 @@ +theme = Kanagawa Wave diff --git a/.config/nvim/after/plugin/lsp.lua b/.config/nvim/after/plugin/lsp.lua index 50612e7..dc4eed9 100644 --- a/.config/nvim/after/plugin/lsp.lua +++ b/.config/nvim/after/plugin/lsp.lua @@ -18,7 +18,7 @@ vim.diagnostic.config({ }) -- Setup for nvim-notify -vim.lsp.set_log_level(2) +vim.lsp.log.set_level(2) -- Map LSP message types (1=Error, 2=Warning, 3=Info, 4=Log) to vim.log.levels local severity_map = { [1] = vim.log.levels.ERROR, @@ -119,7 +119,18 @@ vim.api.nvim_create_autocmd('LspAttach', { }) vim.lsp.enable 'lua_ls' vim.lsp.enable 'gopls' -vim.lsp.enable 'expert' +-- vim.lsp.enable 'expert' vim.lsp.enable 'ruff' vim.lsp.enable 'pyright' vim.lsp.enable 'gleam' +vim.lsp.config('dexter', { + cmd = { 'dexter', 'lsp' }, + root_markers = { '.dexter.db', '.git', 'mix.exs' }, + filetypes = { 'elixir', 'eelixir', 'heex' }, + init_options = { + followDelegates = true, -- jump through defdelegate to the target function + -- stdlibPath = "", -- override Elixir stdlib path (auto-detected) + -- debug = false, -- verbose logging to stderr (view with :LspLog) + }, +}) +vim.lsp.enable 'dexter' diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 1f3bf0d..f84bae8 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,61 +1,60 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, - "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, - "catppuccin": { "branch": "main", "commit": "5af9374957a65be8770696da295dc9016b96f241" }, + "alabaster.nvim": { "branch": "main", "commit": "b902c73fabefc13583bfc0c18b28950ea8f6244f" }, + "blink.cmp": { "branch": "main", "commit": "78336bc89ee5365633bcf754d93df01678b5c08f" }, + "catppuccin": { "branch": "main", "commit": "426dbebe06b5c69fd846ceb17b42e12f890aedf1" }, + "claudecode.nvim": { "branch": "main", "commit": "102d835c964069c9c5e37abaf05ae4f9c3ee6f00" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, - "editorconfig-vim": { "branch": "master", "commit": "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "fzf-lua": { "branch": "main", "commit": "2388dcd61731ae158bf7dad2ae0419291837e557" }, - "git-blame.nvim": { "branch": "master", "commit": "9874ec1ec8bc53beb33b7cd82c092b85271a578b" }, + "editorconfig-vim": { "branch": "master", "commit": "c0227885a06b155d5aa5465e08b9800e8c939f70" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "fzf-lua": { "branch": "main", "commit": "b437bafc981a180d609bb4092c56ce8999f7a2c4" }, + "git-blame.nvim": { "branch": "master", "commit": "54da04264ec5313d602aebea7c5dc90141696ad7" }, "gruvbox-baby": { "branch": "main", "commit": "bd52e62d8134647090108189e69c8b3cd18bdbbf" }, - "hardtime.nvim": { "branch": "main", "commit": "b4e431934af1fe224a3a801f632c008278cb7628" }, - "kanagawa.nvim": { "branch": "master", "commit": "debe91547d7fb1eef34ce26a5106f277fbfdd109" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "incr.nvim": { "branch": "main", "commit": "4d29d162f097709c412ba8d684af3bf1e02219b2" }, + "kanagawa.nvim": { "branch": "master", "commit": "8ad3b4cdcc804b332c32db8f9743667e1bb82b99" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lsp-status.nvim": { "branch": "master", "commit": "54f48eb5017632d81d0fd40112065f1d062d0629" }, - "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, - "lua-utils.nvim": { "branch": "main", "commit": "e565749421f4bbb5d2e85e37c3cef9d56553d8bd" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, + "lspsaga.nvim": { "branch": "main", "commit": "c532fb86c3d211c5829ad58d2a0783012739bb65" }, + "lualine.nvim": { "branch": "master", "commit": "131a558e13f9f28b15cd235557150ccb23f89286" }, + "markview.nvim": { "branch": "main", "commit": "86cf4bcede58e88497f7e5214efb281d4a6f633d" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "84c75e7a7e443586f60508d12fc50f90d9aee14e" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neogit": { "branch": "master", "commit": "add70101fab5913cad33ab2f84f1a6ee092e7220" }, - "neorg": { "branch": "main", "commit": "e206c9642f4a115cd836e76c98ef785623d335bc" }, - "neorg-interim-ls": { "branch": "main", "commit": "52bdf8a8cd246a9205756449776aa057bd593d61" }, - "neorg-telescope": { "branch": "main", "commit": "7fb6ca6a632c3c095601d379a664c0c1f802dc6c" }, - "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, - "neotest": { "branch": "master", "commit": "2cf3544fb55cdd428a9a1b7154aea9c9823426e8" }, + "neogit": { "branch": "master", "commit": "792c139da736230855e8341ebe6175bb6eb8268b" }, + "neoscroll.nvim": { "branch": "master", "commit": "c8d29979cb0cb3a2437a8e0ae683fd82f340d3b8" }, + "neotest": { "branch": "master", "commit": "fd0b7986dd0ae04e38ec7dc0c78a432e3820839c" }, "neotest-elixir": { "branch": "master", "commit": "a242aebeaa6997c1c149138ff77f6cacbe33b6fc" }, - "neotest-golang": { "branch": "main", "commit": "8a4a1dee307eafe553241f8b5f3337151678394e" }, + "neotest-golang": { "branch": "main", "commit": "84c1f3be59f85a2f5bbb9290040077bc8a68a00c" }, "neotest-rust": { "branch": "main", "commit": "2c9941d4a358839918fac21d20fc8fef0e1ad05f" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-dap": { "branch": "master", "commit": "7367cec8e8f7a0b1e4566af9a7ef5959d11206a7" }, + "nvim-dap": { "branch": "master", "commit": "45a69eba683a2c448dd9ecfc4de89511f0646b5f" }, "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, - "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-dap-ui": { "branch": "master", "commit": "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, - "nvim-lspconfig": { "branch": "master", "commit": "336b388c272555d2ae94627a50df4c2f89a5e257" }, + "nvim-lspconfig": { "branch": "master", "commit": "6419b36f50c42420cbbf1d3ffba573094cf414c8" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, - "nvim-treesitter": { "branch": "main", "commit": "5a70b1eb8cbdf6c7f0a59dfb7356ad198421b620" }, - "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, - "outline.nvim": { "branch": "main", "commit": "6b62f73a6bf317531d15a7ae1b724e85485d8148" }, - "pathlib.nvim": { "branch": "main", "commit": "57e5598af6fe253761c1b48e0b59b7cd6699e2c1" }, - "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "rose-pine": { "branch": "main", "commit": "72a04c4065345b51b56aed4859ea1d884f734097" }, + "nvim-treesitter": { "branch": "main", "commit": "4916d6592ede8c07973490d9322f187e07dfefac" }, + "nvim-web-devicons": { "branch": "master", "commit": "4fc505ac7bd7692824a142e96e5f529c133862f8" }, + "outline.nvim": { "branch": "main", "commit": "c293eb56db880a0539bf9d85b4a27816960b863e" }, + "plenary.nvim": { "branch": "master", "commit": "74b06c6c75e4eeb3108ec01852001636d85a932b" }, + "rose-pine": { "branch": "main", "commit": "9504524e5ed0e326534698f637f9d038ba4cd0ee" }, "rust.vim": { "branch": "master", "commit": "889b9a7515db477f4cb6808bef1769e53493c578" }, - "rustaceanvim": { "branch": "master", "commit": "12504405821c05874d2d1f6b5ec919f9808e2c99" }, - "smart-open.nvim": { "branch": "0.2.x", "commit": "560d8f16e17977c8303db6f9660db58a4415ca41" }, + "rustaceanvim": { "branch": "master", "commit": "88575b98bb9937fb9983ddec5e532b67e75ce677" }, + "smart-open.nvim": { "branch": "0.2.x", "commit": "7763800068bef69334870c10cb595d49ce27580a" }, + "snacks.nvim": { "branch": "main", "commit": "ad9ede6a9cddf16cedbd31b8932d6dcdee9b716e" }, "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, "telescope-dap.nvim": { "branch": "master", "commit": "783366bd6c1e7fa0a5c59c07db37f49c805a28df" }, - "telescope-egrepify.nvim": { "branch": "master", "commit": "5e6fb91f52a595a0dd554c7eea022c467ff80d86" }, - "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, - "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, + "telescope-egrepify.nvim": { "branch": "master", "commit": "cd9342b95c1a8cff2e41ba5041ae3912f47595cc" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, + "telescope.nvim": { "branch": "master", "commit": "506338434fec5ad19cb1f8d45bf92d66c4917393" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, + "treesitter-modules.nvim": { "branch": "main", "commit": "dbded29dade0ff4435642530ec2b5a81730f8e1a" }, "vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" }, "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" }, - "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, - "vim-gitgutter": { "branch": "main", "commit": "488c0555e47e2aabe273c635f7dd233e985311a6" }, + "vim-fugitive": { "branch": "master", "commit": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0" }, + "vim-gitgutter": { "branch": "main", "commit": "21c977e8597c468c7dc76001389b0b430d46a4b0" }, "vim-highlightedyank": { "branch": "master", "commit": "285a61425e79742997bbde76a91be6189bc988fb" }, "vim-projectionist": { "branch": "master", "commit": "5ff7bf79a6ef741036d2038a226bcb5f8b1cd296" }, - "vim-sneak": { "branch": "master", "commit": "18b1faf020e6a66c1ce09b3ff5e6b6feb182973b" }, + "vim-sneak": { "branch": "master", "commit": "feea86adcfbf8e6b5e71fdd5f4f5736fd8819fdb" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" } } diff --git a/.config/nvim/lua/halfdan/plugins/claudecode.lua b/.config/nvim/lua/halfdan/plugins/claudecode.lua new file mode 100644 index 0000000..8360b0c --- /dev/null +++ b/.config/nvim/lua/halfdan/plugins/claudecode.lua @@ -0,0 +1,24 @@ +return { + "coder/claudecode.nvim", + dependencies = { "folke/snacks.nvim" }, + config = true, + keys = { + { "a", nil, desc = "AI/Claude Code" }, + { "ac", "ClaudeCode", desc = "Toggle Claude" }, + { "af", "ClaudeCodeFocus", desc = "Focus Claude" }, + { "ar", "ClaudeCode --resume", desc = "Resume Claude" }, + { "aC", "ClaudeCode --continue", desc = "Continue Claude" }, + { "am", "ClaudeCodeSelectModel", desc = "Select Claude model" }, + { "ab", "ClaudeCodeAdd %", desc = "Add current buffer" }, + { "as", "ClaudeCodeSend", mode = "v", desc = "Send to Claude" }, + { + "as", + "ClaudeCodeTreeAdd", + desc = "Add file", + ft = { "NvimTree", "neo-tree", "oil", "minifiles", "netrw" }, + }, + -- Diff management + { "aa", "ClaudeCodeDiffAccept", desc = "Accept diff" }, + { "ad", "ClaudeCodeDiffDeny", desc = "Deny diff" }, + }, +} diff --git a/.config/nvim/lua/halfdan/plugins/neorg.lua b/.config/nvim/lua/halfdan/plugins/neorg.lua index 66a227d..b4b55f7 100644 --- a/.config/nvim/lua/halfdan/plugins/neorg.lua +++ b/.config/nvim/lua/halfdan/plugins/neorg.lua @@ -1,67 +1,69 @@ -return { - { - "nvim-neorg/neorg", - lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default - version = "4da2159b3f3420d43613f43e159f4253b8544474", -- Pin Neorg to the latest stable release - config = function() - require('neorg').setup({ - load = { - ["core.defaults"] = {}, - ["core.dirman"] = { - config = { - workspaces = { - work = "~/org/work", - home = "~/org/home", - }, - index = "index.norg", - } - }, - ["core.completion"] = { - config = { engine = { module_name = "external.lsp-completion" } }, - }, - ["core.concealer"] = {}, - ["core.journal"] = { - config = { - strategy = "flat", - }, - }, - ["core.integrations.telescope"] = {}, - ["core.keybinds"] = { - config = { - default_keybinds = true, - }, - }, - ["external.interim-ls"] = { - config = { - -- default config shown - completion_provider = { - -- Enable or disable the completion provider - enable = true, +return {} - -- Show file contents as documentation when you complete a file name - documentation = true, - - -- Try to complete categories provided by Neorg Query. Requires `benlubas/neorg-query` - categories = false, - - -- suggest heading completions from the given file for `{@x|}` where `|` is your cursor - -- and `x` is an alphanumeric character. `{@name}` expands to `[name]{:$/people:# name}` - people = { - enable = false, - - -- path to the file you're like to use with the `{@x` syntax, relative to the - -- workspace root, without the `.norg` at the end. - -- ie. `folder/people` results in searching `$/folder/people.norg` for headings. - -- Note that this will change with your workspace, so it fails silently if the file - -- doesn't exist - path = "people", - } - } - } - }, - } - }) - end, - }, - { 'nvim-neorg/neorg-telescope' , 'benlubas/neorg-interim-ls' }, -} +-- return { +-- { +-- "nvim-neorg/neorg", +-- lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default +-- version = "4da2159b3f3420d43613f43e159f4253b8544474", -- Pin Neorg to the latest stable release +-- config = function() +-- require('neorg').setup({ +-- load = { +-- ["core.defaults"] = {}, +-- ["core.dirman"] = { +-- config = { +-- workspaces = { +-- work = "~/org/work", +-- home = "~/org/home", +-- }, +-- index = "index.norg", +-- } +-- }, +-- ["core.completion"] = { +-- config = { engine = { module_name = "external.lsp-completion" } }, +-- }, +-- ["core.concealer"] = {}, +-- ["core.journal"] = { +-- config = { +-- strategy = "flat", +-- }, +-- }, +-- ["core.integrations.telescope"] = {}, +-- ["core.keybinds"] = { +-- config = { +-- default_keybinds = true, +-- }, +-- }, +-- ["external.interim-ls"] = { +-- config = { +-- -- default config shown +-- completion_provider = { +-- -- Enable or disable the completion provider +-- enable = true, +-- +-- -- Show file contents as documentation when you complete a file name +-- documentation = true, +-- +-- -- Try to complete categories provided by Neorg Query. Requires `benlubas/neorg-query` +-- categories = false, +-- +-- -- suggest heading completions from the given file for `{@x|}` where `|` is your cursor +-- -- and `x` is an alphanumeric character. `{@name}` expands to `[name]{:$/people:# name}` +-- people = { +-- enable = false, +-- +-- -- path to the file you're like to use with the `{@x` syntax, relative to the +-- -- workspace root, without the `.norg` at the end. +-- -- ie. `folder/people` results in searching `$/folder/people.norg` for headings. +-- -- Note that this will change with your workspace, so it fails silently if the file +-- -- doesn't exist +-- path = "people", +-- } +-- } +-- } +-- }, +-- } +-- }) +-- end, +-- }, +-- { 'nvim-neorg/neorg-telescope' , 'benlubas/neorg-interim-ls' }, +-- } diff --git a/.config/nvim/lua/halfdan/plugins/other.lua b/.config/nvim/lua/halfdan/plugins/other.lua index e551e6e..585895b 100644 --- a/.config/nvim/lua/halfdan/plugins/other.lua +++ b/.config/nvim/lua/halfdan/plugins/other.lua @@ -5,15 +5,6 @@ return { -- Load .editorconfig files { 'editorconfig/editorconfig-vim' }, - { - "m4xshen/hardtime.nvim", - lazy = false, - dependencies = { "MunifTanjim/nui.nvim" }, - opts = { - disable_mouse = false, - max_count = 5 - }, - }, { "karb94/neoscroll.nvim", opts = {}, diff --git a/.config/nvim/lua/halfdan/plugins/telescope.lua b/.config/nvim/lua/halfdan/plugins/telescope.lua index 5d1149e..91c75d5 100644 --- a/.config/nvim/lua/halfdan/plugins/telescope.lua +++ b/.config/nvim/lua/halfdan/plugins/telescope.lua @@ -13,7 +13,7 @@ return { require('telescope').setup { defaults = { -- find_command = { 'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case' }, - file_ignore_patterns = { "_build", "node_modules", "deps", ".git", ".elixir_ls" }, + file_ignore_patterns = { "_build", "node_modules", "deps", ".git", ".elixir_ls", ".lexical" }, prompt_prefix = "  ", selection_caret = " ", entry_prefix = " ", diff --git a/.config/nvim/lua/halfdan/plugins/treesitter.lua b/.config/nvim/lua/halfdan/plugins/treesitter.lua index 60e5250..dd40967 100644 --- a/.config/nvim/lua/halfdan/plugins/treesitter.lua +++ b/.config/nvim/lua/halfdan/plugins/treesitter.lua @@ -81,4 +81,21 @@ return { install_and_start() end }, + { + { + "meanderingprogrammer/treesitter-modules.nvim", + dependencies = { "nvim-treesitter/nvim-treesitter" }, + opts = { + incremental_selection = { + enable = true, + keymaps = { + init_selection = "", + node_incremental = "", + scope_incremental = "", + node_decremental = "", + }, + }, + }, + }, + }, } diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 5176f01..a3dc18c 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -2,6 +2,10 @@ # START OF PLUGINS ###################################################################### + +set -g default-command "${SHELL}" +set -g default-shell "${SHELL}" + # Plugin manager for tmux set -g @plugin 'tmux-plugins/tpm' @@ -11,10 +15,14 @@ set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.tmux/plugins/' set -g @plugin 'tmux-plugins/tmux-sensible' #set -g @plugin 'odedlaz/tmux-onedark-theme' +set-option -g status-position top # Gruvbox theme -set -g @plugin 'egel/tmux-gruvbox' -set -g @tmux-gruvbox 'dark' # or 'light' +# set -g @plugin 'egel/tmux-gruvbox' +# set -g @tmux-gruvbox 'dark' # or 'light' +set -g @plugin 'Nybkox/tmux-kanagawa' +set -g @kanagawa-show-powerline true +set -g @kanagawa-plugins "battery cpu-usage ram-usage" # Persistent tmux envs across system restarts set -g @plugin 'tmux-plugins/tmux-resurrect' @@ -43,7 +51,7 @@ set -g @resurrect-capture-pane-contents 'on' set -g @resurrect-strategy-nvim 'session' # Processes to resurrect -set -g @resurrect-processes '~julia' +set -g @resurrect-processes '~iex' ####################################################### # TMUX-SENSIBLE diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index 22489b4..1d0e850 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -10,12 +10,15 @@ end) return { -- Font settings font = wezterm.font_with_fallback { + 'Hack Nerd Font Mono', 'FiraCode Nerd Font Mono', 'Jetbrains Mono' }, font_size = 18, - color_scheme = "Gruvbox Dark", + color_scheme = 'Monokai Dark (Gogh)', + -- color_scheme = 'Kanagawa (Gogh)', + -- color_scheme = "Gruvbox Dark", -- Tab bar show_tab_index_in_tab_bar = false, hide_tab_bar_if_only_one_tab = true, @@ -29,11 +32,29 @@ return { brightness = 0.7 }, window_frame = { - font = wezterm.font { family = 'Noto Sans', weight = 'Regular' }, + font = wezterm.font { family = 'Hack Nerd Font Mono', weight = 'Regular' }, }, scrollback_lines = 26000, -- Keybindings -- disable_default_key_bindings = true, - + enable_scroll_bar = false, + window_padding = { + right = 0, + top = 0, + bottom = 0, + left = 0 + }, leader = { key = 'b', mods = 'CMD', timeout_milliseconds = 2000 }, + keys = { + { + key = "|", + mods = "LEADER|SHIFT", + action = wezterm.action.SplitHorizontal { domain = "CurrentPaneDomain" }, + }, + { + key = "-", + mods = "LEADER", + action = wezterm.action.SplitVertical { domain = "CurrentPaneDomain" }, + }, + } }