repositories / dotfiles

dotfiles

bugabingas dorkfiles

owned by bugabinga

Merge branch 'trunk' of github.com:bugabinga/dotfiles into trunk

b0aad71af1b7fbd73228cd203e13e62dafa98517

Oliver Jan Krylow <oliver@bugabinga.net> ·

unsigned

Browse filesCompare with HEAD

Changed files (9)

git/gitconfig

Modified
50 50 [mergetool "nvim_merge"]
51 51 cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\" "
53 +[push]
54 + autoSetupRemote = true
53 56 [pull]
54 57 rebase = false
80 83 # On each host a different file might be symlinked into '.gitconfig.include'.
81 84 [include]
82 85 path = .gitconfig.include
83 -[push]
84 - autoSetupRemote = true

neovim/lazy-lock.json

Modified
2 - "Comment.nvim": { "branch": "master", "commit": "e51f2b142d88bb666dcaa77d93a07f4b419aca70" },
2 + "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3 3 "actions-preview.nvim": { "branch": "master", "commit": "5072b1b1065a6b22bdd46b5c21780a91d6a08071" },
4 - "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" },
5 4 "better-escape.nvim": { "branch": "master", "commit": "7e86edafb8c7e73699e0320f225464a298b96d12" },
6 5 "colorizer.nvim": { "branch": "master", "commit": "107719885290366c893e1c1c58b7474cbeabfef6" },
7 6 "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
9 8 "fidget.nvim": { "branch": "main", "commit": "4e854f3299e21d1c18279add340428a97520fc44" },
10 9 "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" },
11 10 "gen.nvim": { "branch": "main", "commit": "2cb643b1a827bcdfc665a37d5f8174249d2d5bf5" },
12 - "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" },
11 + "gitsigns.nvim": { "branch": "main", "commit": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0" },
13 12 "glow.nvim": { "branch": "main", "commit": "238070a686c1da3bccccf1079700eb4b5e19aea4" },
14 13 "heirline.nvim": { "branch": "master", "commit": "03cff30d7e7d3ba6fdc00925f015822f79cef908" },
15 14 "hlargs.nvim": { "branch": "main", "commit": "0f2dbf02ff948e8fc8ebe07b215f3174a12bbe3c" },
16 15 "hyper.nvim": { "branch": "main", "commit": "b84fb39e703b1dd487d20c4faf028ee51374c88b" },
17 - "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" },
16 + "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
18 17 "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
19 18 "lsp_signature.nvim": { "branch": "master", "commit": "c6aeb2f1d2538bbdfdaab1664d9d4c3c75aa9db8" },
20 19 "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" },
21 - "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
20 + "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
22 21 "mini.align": { "branch": "main", "commit": "f845218c5fea89e49074e48270dc5e1b9511a0f9" },
23 22 "mini.bracketed": { "branch": "main", "commit": "65c7dfb51e832de9e279e5d5b0741e7af6755ab5" },
24 23 "mini.starter": { "branch": "main", "commit": "ce222a5b6de50a9963c1eb62aa16ec6d5efca7ee" },
27 26 "neogen": { "branch": "main", "commit": "b95347a588401a755eadd17482edc1662876bd58" },
28 27 "nrpattern.nvim": { "branch": "master", "commit": "f862ce687761078ef3155688151c55f69d28453e" },
29 28 "nui.nvim": { "branch": "main", "commit": "cbd2668414331c10039278f558630ed19b93e69b" },
30 - "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
29 + "nvim-autopairs": { "branch": "master", "commit": "797260ff31e8bdd9db0f0c352659a35aba335b0b" },
31 30 "nvim-genghis": { "branch": "main", "commit": "8613fc1b43db6cc761733b3630eabff9e86296f7" },
32 31 "nvim-gomove": { "branch": "main", "commit": "2b44ae7ac0804f4e3959228122f7c85bef1964e3" },
33 32 "nvim-jdtls": { "branch": "master", "commit": "a4746791876166dc146eae573a1b49d24a6652e7" },
38 37 "nvim-neoclip.lua": { "branch": "main", "commit": "798cd0592a81c185465db3a091a0ff8a21af60fd" },
39 38 "nvim-spectre": { "branch": "master", "commit": "e7db8ebca7fd0a604027ebf85acee52f6642c91c" },
40 39 "nvim-surround": { "branch": "main", "commit": "84a26afce16cffa7e3322cfa80a42cddf60616eb" },
41 - "nvim-tree.lua": { "branch": "master", "commit": "707b24af91a1d05823099ed8c5450796290466ba" },
42 - "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
40 + "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" },
41 + "nvim-treesitter": { "branch": "master", "commit": "567a76780cd4f982dae1ec57e3dad6174bef3680" },
43 42 "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
44 43 "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
45 44 "nvim-ts-context-commentstring": { "branch": "main", "commit": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a" },
46 45 "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
47 46 "nvim-window": { "branch": "main", "commit": "e7f5d60eeec8ff37af7be4c9a99f65edf67fc574" },
48 47 "oil.nvim": { "branch": "master", "commit": "e462a3446505185adf063566f5007771b69027a1" },
49 - "persistence.nvim": { "branch": "main", "commit": "ad538bfd5336f1335cdb6fd4e0b0eebfa6e12f32" },
48 + "persistence.nvim": { "branch": "main", "commit": "4982499c1636eac254b72923ab826ee7827b3084" },
50 49 "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
51 50 "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
52 51 "schemastore.nvim": { "branch": "main", "commit": "4d798fd5b692c8fce77268aba8f6f926b0c9f835" },
53 - "specs.nvim": { "branch": "main", "commit": "e929006d3f6bb8e43f03e13ac364c67236eb5299" },
52 + "specs.nvim": { "branch": "main", "commit": "2743e412bbe21c9d73954c403d01e8de7377890d" },
54 53 "speedtyper.nvim": { "branch": "main", "commit": "2d158eed4c753995b0501a3a7a72464fbb213e3d" },
55 54 "ssr.nvim": { "branch": "main", "commit": "bb323ba621ac647b4ac5638b47666e3ef3c279e1" },
56 55 "substitute.nvim": { "branch": "main", "commit": "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" },
58 57 "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
59 58 "telescope-zoxide": { "branch": "main", "commit": "68966349aa1b8e9ade403e18479ecf79447389a7" },
60 59 "telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
61 - "todo-comments.nvim": { "branch": "main", "commit": "8febc60a76feefd8203077ef78b6a262ea1a41f9" },
60 + "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" },
62 61 "toggleterm.nvim": { "branch": "main", "commit": "193786e0371e3286d3bc9aa0079da1cd41beaa62" },
63 62 "tree-sitter-nu": { "branch": "main", "commit": "c5b7816043992b1cdc1462a889bc74dc08576fa6" },
64 63 "treesj": { "branch": "main", "commit": "60e27280030f9cd8dfb6ceb335922c6ff76682cc" },
65 64 "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" },
66 65 "virt-column.nvim": { "branch": "master", "commit": "b62b4ef0774d19452d4ed18e473e824c7a756f2f" },
67 - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" },
66 + "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" },
68 67 "zen-mode.nvim": { "branch": "main", "commit": "78557d972b4bfbb7488e17b5703d25164ae64e6a" }

neovim/lua/bugabinga/plugins/zen.lua

Modified
3 3 return {
4 4 "folke/zen-mode.nvim",
5 5 cmd = 'ZenMode',
6 6 dependencies = { { 'folke/twilight.nvim', opts = { dimming = { inactive = true } } } },
7 7 opts = {
8 + --FIXME: this does not work, because on win32 there is no base64 binary
8 9 plugins = { wezterm = { enabled = true, font = "+4" } },
9 10 window = {
10 11 width = 0.69,

topgrade/topgrade.windows.toml

Modified
1 1 [misc]
2 2 # Disable specific steps - same options as the command line flag
3 -disable = ["wsl", "vim"]
3 +disable = ["system"]
5 5 assume_yes = true
41 41 "01 - Scoop Export" = "scoop export --config > 'X:/scoop_installed_apps.json' *> $null"
43 43 [commands]
44 -"00 - Refresh dotfiles" = "java W:/dotfiles/bootstripper.java W:/dotfiles"
45 -"01 - Install Cargo Tools" = "nu --env-config ~/AppData/Roaming/nushell/env.nu W:/dotfiles/tools/cargo-tools.nu"
46 -"02 - Advantage-PM Client" = "nu X:/update_apm_client.nu"
47 -"03 - MeMate" = "nu X:/update_memate.nu"
48 -"04 - TLDR" = "tldr --update"
44 +"00 - Register Nu Plugins" = "nu -c 'register ~\\scoop\\apps\\nu\\current\\nu_plugin_gstat.exe'"
45 +"10 - Refresh dotfiles" = "java W:/dotfiles/bootstripper.java W:/dotfiles"
46 +"20 - Install Cargo Tools" = "nu --env-config ~/AppData/Roaming/nushell/env.nu W:/dotfiles/tools/cargo-tools.nu"
47 +"30 - Advantage-PM Client" = "nu X:/update_apm_client.nu"
48 +"31 - MeMate" = "nu X:/update_memate.nu"
49 +"40 - TLDR" = "tldr --update"

wezterm/bugabinga/auto_dark_mode.lua

Added
new file mode 100644
1 +local wez = require 'wezterm'
3 +-- wezterm.gui is not available to the mux server, so take care to
4 +-- do something reasonable when this config is evaluated by the mux
5 +local get_appearance = function()
6 + if wez.gui then
7 + return wez.gui.get_appearance()
8 + end
9 + return 'Dark'
10 +end
12 +local scheme_for_appearance = function(appearance)
13 + if appearance:find 'Dark' then
14 + return 'nugu-dark'
15 + else
16 + return 'nugu-light'
17 + end
18 +end
20 +wez.on('window-config-reloaded', function(window)
21 + local overrides = window:get_config_overrides() or {}
22 + local appearance = window:get_appearance()
23 + local scheme = scheme_for_appearance(appearance)
24 + if overrides.color_scheme ~= scheme then
25 + overrides.color_scheme = scheme
26 + window:set_config_overrides(overrides)
27 + end
28 +end)
30 +return scheme_for_appearance(get_appearance())

wezterm/bugabinga/dark_mode.lua

Deleted
deleted file mode 100644
1 -local wez = require 'wezterm'
3 --- wezterm.gui is not available to the mux server, so take care to
4 --- do something reasonable when this config is evaluated by the mux
5 -local get_appearance = function()
6 - if wez.gui then
7 - return wez.gui.get_appearance()
8 - end
9 - return 'Dark'
10 -end
12 -local scheme_for_appearance = function(appearance)
13 - if appearance:find 'Dark' then
14 - return 'nugu-dark'
15 - else
16 - return 'nugu-light'
17 - end
18 -end
20 -wez.on('window-config-reloaded', function(window)
21 - local overrides = window:get_config_overrides() or {}
22 - local appearance = window:get_appearance()
23 - local scheme = scheme_for_appearance(appearance)
24 - if overrides.color_scheme ~= scheme then
25 - overrides.color_scheme = scheme
26 - window:set_config_overrides(overrides)
27 - end
28 -end)
30 -return scheme_for_appearance(get_appearance())

wezterm/bugabinga/key_binds.lua

Modified
33 33 { key = 'k', action = wez.action.ActivatePaneDirection 'Up' },
34 34 { key = 'l', action = wez.action.ActivatePaneDirection 'Right' },
36 + { key = 'v', action = wez.action.SplitHorizontal { domain = 'CurrentPaneDomain' }, },
37 + { key = 's', action = wez.action.SplitVertical { domain = 'CurrentPaneDomain' }, },
36 39 { key = 'r', action = wez.action.ActivateKeyTable { name = resize_pane_mode, one_shot = false } },
38 41 { key = 'q', action = wez.action.CloseCurrentPane { confirm = true } },
119 122 mods = 'CTRL|SHIFT',
120 123 action = wez.action.PasteFrom 'Clipboard',
122 - {
123 - key = 'v',
124 - mods = 'LEADER',
125 - action = wez.action.SplitHorizontal { domain = 'CurrentPaneDomain' },
126 - },
127 - {
128 - key = 's',
129 - mods = 'LEADER',
130 - action = wez.action.SplitVertical { domain = 'CurrentPaneDomain' },
131 - },
133 126 key = 't',
134 127 mods = 'LEADER',

wezterm/bugabinga/neovim_zen_mode.lua

Modified
1 -local wez = require'wezterm'
3 -wez.on('user-var-changed', function(window, pane, name, value)
4 - local overrides = window:get_config_overrides() or {}
5 - if name == "ZEN_MODE" then
6 - local incremental = value:find("+")
7 - local number_value = tonumber(value)
8 - if incremental ~= nil then
9 - while (number_value > 0) do
10 - window:perform_action(wez.action.IncreaseFontSize, pane)
11 - number_value = number_value - 1
1 +return function( wez )
2 + wez.on('user-var-changed', function(window, pane, name, value)
3 + print "zen"
4 + local overrides = window:get_config_overrides() or {}
5 + if name == "ZEN_MODE" then
6 + local incremental = value:find("+")
7 + local number_value = tonumber(value)
8 + if incremental ~= nil then
9 + while (number_value > 0) do
10 + window:perform_action(wez.action.IncreaseFontSize, pane)
11 + number_value = number_value - 1
12 + end
13 + overrides.enable_tab_bar = false
14 + elseif number_value < 0 then
15 + window:perform_action(wez.action.ResetFontSize, pane)
16 + overrides.font_size = nil
17 + overrides.enable_tab_bar = true
18 + else
19 + overrides.font_size = number_value
20 + overrides.enable_tab_bar = false
13 - overrides.enable_tab_bar = false
14 - elseif number_value < 0 then
15 - window:perform_action(wez.action.ResetFontSize, pane)
16 - overrides.font_size = nil
17 - overrides.enable_tab_bar = true
18 - else
19 - overrides.font_size = number_value
20 - overrides.enable_tab_bar = false
22 - end
23 - window:set_config_overrides(overrides)
24 -end)
23 + window:set_config_overrides(overrides)
24 + end)
25 +end

wezterm/wezterm.lua

Modified
2 2 local wez = require 'wezterm'
3 3 local nugu = require 'bugabinga.nugu'
5 5 local key_binds = require 'bugabinga.key_binds'
6 -local dark_mode = require 'bugabinga.dark_mode'
6 +local auto_dark_mode = require 'bugabinga.auto_dark_mode'
7 7 -- local workspaces = require 'bugabinga.workspaces'
8 8 require 'bugabinga.status'
9 -require 'bugabinga.neovim_zen_mode'
9 +local zen_mode = require 'bugabinga.neovim_zen_mode'
10 +zen_mode(wez)
11 12 local hostname = wez.hostname()
12 13 local enable_wayland = false
16 17 if hostname == 'x230' then
17 18 font_size = 13
18 19 enable_wayland = true
19 -elseif hostname == 'pop-os' then
20 - font_size = 15
21 20 elseif hostname == 'NB-00718' then
22 - font_size = 15
21 + font_size = 19
25 24 return {
26 25 -- logs key presses
27 26 -- debug_key_events = true,
28 + default_cwd = wez.home_dir,
29 + default_prog = { 'nu', '--login' },
30 + default_cursor_style = 'SteadyBlock',
29 32 font = font,
30 33 font_size = font_size,
31 34 freetype_load_target = 'Light',
32 35 freetype_render_target = 'HorizontalLcd',
33 36 underline_position = "-2pt",
34 37 warn_about_missing_glyphs = false,
35 - color_scheme = dark_mode,
39 + color_scheme = auto_dark_mode,
36 40 color_schemes = nugu,
37 - default_cwd = wez.home_dir,
38 - default_prog = { 'nu' },
39 - default_cursor_style = 'SteadyBlock',
40 41 cursor_blink_rate = 0,
42 + -- https://github.com/wez/wezterm/issues/2635
43 + force_reverse_video_cursor = true,
41 44 -- cursor_thickness = '1cell',
42 45 window_decorations = window_decorations,
46 + enable_wayland = enable_wayland,
43 47 enable_tab_bar = true,
44 48 -- if this is hidden, we cannot see the right status area
45 49 hide_tab_bar_if_only_one_tab = false,
46 50 use_fancy_tab_bar = false,
47 51 check_for_updates = false,
48 52 show_update_window = false,
49 - win32_system_backdrop = "Mica",
50 53 audible_bell = 'Disabled',
51 54 visual_bell = {
52 55 fade_in_duration_ms = 69,
58 61 brightness = 0.69,
60 63 tab_max_width = 42,
61 - enable_wayland = enable_wayland,
62 64 window_padding = {
63 65 left = 2,
64 66 right = 2,
65 67 top = 2,
66 68 bottom = 0,
68 71 disable_default_key_bindings = true,
69 72 leader = key_binds.leader,
70 73 keys = key_binds.keys,