From 14bb6cc423733b5e19a5d09bd9ee406536d08e7b Mon Sep 17 00:00:00 2001 From: Fabian Becker Date: Tue, 30 Sep 2025 13:02:59 +0300 Subject: [PATCH] Multiple updates across the board --- .config/fish/config.fish | 4 +- .config/kitty/keymap.conf | 4 ++ .config/nvim/lua/halfdan/plugins/neorg.lua | 7 ++- .config/nvim/lua/halfdan/plugins/other.lua | 5 +- .config/nvim/lua/halfdan/plugins/ui.lua | 65 ---------------------- .config/nvim/lua/halfdan/settings.lua | 1 + .tool-versions | 6 +- 7 files changed, 20 insertions(+), 72 deletions(-) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 4cd3d9b..e6323ab 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -11,10 +11,10 @@ abbr -a -- gca 'git commit --amend' abbr -a -- gpf 'git push -f' abbr -a -- gp 'git push' abbr -a -- gl 'git pull' -abbr -a -- gl 'git rebase develop' -abbr -a -- gcd 'git checkout develop' +abbr -a -- gcm 'git checkout main' abbr -a -- gc- 'git checkout -' abbr -a -- gc 'git checkout' +abbr -a -- gau 'git add -u' abbr -a -- api 'kubectl get pods -n backend | fzf | awk \'{print $1}\' | xargs -o -I {} kubectl exec -i -t -n backend {} --container api -- /opt/app/api/bin/api remote' diff --git a/.config/kitty/keymap.conf b/.config/kitty/keymap.conf index c03c2e4..3464b4a 100644 --- a/.config/kitty/keymap.conf +++ b/.config/kitty/keymap.conf @@ -9,6 +9,10 @@ map ctrl+4 goto_tab 4 map ctrl+t new_tab map ctrl+w close_tab +# --- Splits --- +map ctrl+b," launch --location=hsplit # Ctrl+b then " splits horizontally +map ctrl+b,% launch --location=vsplit # Ctrl+b then % splits vertically + # Supper power keys map ctrl+; kitten toggle_term.py diff --git a/.config/nvim/lua/halfdan/plugins/neorg.lua b/.config/nvim/lua/halfdan/plugins/neorg.lua index 6d392b8..66a227d 100644 --- a/.config/nvim/lua/halfdan/plugins/neorg.lua +++ b/.config/nvim/lua/halfdan/plugins/neorg.lua @@ -2,7 +2,7 @@ return { { "nvim-neorg/neorg", lazy = false, -- Disable lazy loading as some `lazy.nvim` distributions set `lazy = true` by default - version = "*", -- Pin Neorg to the latest stable release + version = "4da2159b3f3420d43613f43e159f4253b8544474", -- Pin Neorg to the latest stable release config = function() require('neorg').setup({ load = { @@ -26,6 +26,11 @@ return { }, }, ["core.integrations.telescope"] = {}, + ["core.keybinds"] = { + config = { + default_keybinds = true, + }, + }, ["external.interim-ls"] = { config = { -- default config shown diff --git a/.config/nvim/lua/halfdan/plugins/other.lua b/.config/nvim/lua/halfdan/plugins/other.lua index a6697bb..e551e6e 100644 --- a/.config/nvim/lua/halfdan/plugins/other.lua +++ b/.config/nvim/lua/halfdan/plugins/other.lua @@ -9,7 +9,10 @@ return { "m4xshen/hardtime.nvim", lazy = false, dependencies = { "MunifTanjim/nui.nvim" }, - opts = {}, + opts = { + disable_mouse = false, + max_count = 5 + }, }, { "karb94/neoscroll.nvim", diff --git a/.config/nvim/lua/halfdan/plugins/ui.lua b/.config/nvim/lua/halfdan/plugins/ui.lua index 55c3961..71b1a25 100644 --- a/.config/nvim/lua/halfdan/plugins/ui.lua +++ b/.config/nvim/lua/halfdan/plugins/ui.lua @@ -40,69 +40,4 @@ return { -- "3rd/image.nvim", -- Optional image support in preview window: See `# Preview Mode` for more information } }, - { - 'akinsho/bufferline.nvim', - version = "*", - dependencies = 'nvim-tree/nvim-web-devicons', - keys = { - { "", "BufferLineGoToBuffer 1", desc = "Go to buffer 1" }, - { "", "BufferLineGoToBuffer 2", desc = "Go to buffer 2" }, - { "", "BufferLineGoToBuffer 3", desc = "Go to buffer 3" }, - { "", "BufferLineGoToBuffer 4", desc = "Go to buffer 4" }, - { "", "BufferLineGoToBuffer 5", desc = "Go to buffer 5" }, - { "", "BufferLineGoToBuffer 6", desc = "Go to buffer 6" }, - { "", "BufferLineGoToBuffer 7", desc = "Go to buffer 7" }, - { "", "BufferLineGoToBuffer 8", desc = "Go to buffer 8" }, - { "", "BufferLineGoToBuffer 9", desc = "Go to buffer 9" }, - { "", "BufferLineCycleNext", desc = "Next buffer" }, - { "", "BufferLineCyclePrev", desc = "Previous buffer" }, - { "", "BufferLineMoveNext", desc = "Move buffer right" }, - { "", "BufferLineMovePrev", desc = "Move buffer left" }, - }, - opts = function() - local monokai_opts = require("halfdan.util").opts("monokai-pro.nvim") - return { - options = { - diagnostics = "nvim_lsp", -- | "nvim_lsp" | "coc", - -- separator_style = "", -- | "thick" | "thin" | "slope" | { 'any', 'any' }, - separator_style = { "", "" }, -- | "thick" | "thin" | { 'any', 'any' }, - -- separator_style = "slant", -- | "thick" | "thin" | { 'any', 'any' }, - indicator = { - -- icon = " ", - -- style = 'icon', - style = "underline", - }, - close_command = "Bdelete! %d", -- can be a string | function, see "Mouse actions" - diagnostics_indicator = function(count, _, _, _) - if count > 9 then - return "9+" - end - return tostring(count) - end, - numbers = function(opts) - return string.format('%s', opts.raise(opts.ordinal)) - end, - offsets = { - { - filetype = "neo-tree", - text = "EXPLORER", - text_align = "center", - separator = vim.tbl_contains(monokai_opts.background_clear or {}, "neo-tree"), -- set to `true` if clear background of neo-tree - }, - { - filetype = "NvimTree", - text = "EXPLORER", - text_align = "center", - separator = vim.tbl_contains(monokai_opts.background_clear or {}, "nvim-tree"), -- set to `true` if clear background of neo-tree - }, - }, - hover = { - enabled = true, - delay = 0, - reveal = { "close" }, - }, - }, - } - end, - }, } diff --git a/.config/nvim/lua/halfdan/settings.lua b/.config/nvim/lua/halfdan/settings.lua index 953b6b0..a5a750d 100644 --- a/.config/nvim/lua/halfdan/settings.lua +++ b/.config/nvim/lua/halfdan/settings.lua @@ -57,6 +57,7 @@ vim.b.did_ftplugin = 1 -- vim.g.gruvbox_baby_background_color = "dark" vim.g.mapleader = ' ' +vim.g.maplocalleader = ',' vim.g.netrw_preview = 1 -- Split preview vertically vim.g.netrw_alo = 1 -- Show preview window to the right diff --git a/.tool-versions b/.tool-versions index 5d0a85c..215f9ad 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,8 +1,8 @@ elixir 1.18.2-otp-27 -golang 1.24.0 +golang 1.25.0 erlang 27.2.3 -python 3.13.2 -neovim 0.11.3 +python 3.13.7 +neovim 0.11.4 java openjdk-19 awscli 2.24.7 nodejs 18.20.4