chore: minor changes (formatting, switch to gopass, etc)

This commit is contained in:
winston 2022-10-13 09:47:51 +02:00
parent 00f5c9cefd
commit f11d3d040e
Signed by: winston
GPG key ID: 3786770EDBC2B481
7 changed files with 103 additions and 133 deletions

View file

@ -1,16 +1,14 @@
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
hF4Dt852JJsu9zQSAQdA/A+ep8XtO5CmUVsTReTRTwcekGyYT5rYVLHfp+0wZHIw hF4Dt852JJsu9zQSAQdAerrFel14Ro6jBiqripo7B0roAyHmeJqSy+tUcczA+z0w
ReGpYdfjRu8/fyxHAXuu8bjfoLeowpwt2UWl+7NIOXvDlNB4N65hm52OCFYWBRJf VJN40hhGF27lhy9T3BM9cfm5WjyX59YhyZi7UB3Vz6oG505iJwZ32HrDObQgFgog
0sEAAc3clPjQia5ZeqEqNUWc/lhg0xmfuq6bWmmr9gC1jinhCB+RcpUKIFcHxBmx 0sCtAQA0CBePNasSMI+dK2+kDTXWB4irxKiERcB4i/P9vExaTBiPmpBbKwnkrLXO
UxO6TjKz/oQVGubQju15AzjE2w3DmiZXTnPBTD7Pnu68wBCPcoVQZYVxlPpappc+ an1DRUW9iQSxLR4K0fQfy/jr5LT/FAbtOQmIB4fbzpAcEYXURVu0yue1iPEFy5FO
E/mI2xrIg6riES+QZkajQPJvsI7sSCyQVct3y3eAv/UX+7NDHujtEcrEIPvR5MBW xsBfPTsbDPzUi9M1rznEYGDkjxPEBveGidxgRFVZjiW5bnRmsaHtdZs5IrHFyOp8
1/OCE8rQlqzqwxL1DazaIuISRF6QVCdic0VEHTCSZzoxxIkAca8vJvK0gSshgyhv WXsQGnEuyHUDL/5jpNvIopFN4VPnitm+OQv0iiyxqaXlgrSbuexz/FRytJHLgT0D
mBjR2EhJFcW7nwP4LfSuOGRVyr4+lXeoNFE1Hj4m0JJHZ0bs63tFClLUHL3SuLfs cwPptnlUo4nBYlU1/12hUdqn3907NOWf/NF6xRL+5gFTYUrw5IlTikMPEfuDb+Ik
VG9ii6PZCN0sgfS00VKyv9fc6PHIV6hg5Pg6q+RijLQ+cFJKl6y8kgSx5xWzjpAY huJUwCPZP4QtbnuLW52cSZKwKKk6XPPGdy+RhJjKwodXJU2tvR4HaRPaA4PU1nm5
HlNxtwOMe5Zz+gGkEZrBnq0IgWOBL5wM7WjHsxxU4/QvqB8wzzfzOTSQQd0T76pq V3A5SODZzGg8KxwkHj53ak63uWWWZJE7YLEEn4n+qtfOMnYw8tsOiel9ajdor7N2
rd/IH/phCf+CA9jTvxPICD822BgoIwqOKGlh65RBuA/+5qn0MbEvuW+tQkaB2pR8 Y8eJUgIS56Vtjn6Qlbx/NjDNki9UsqnSrVe6f3T4/50=
pkGVl5wGMfaXLb8U8PEKQVNxi8f6gw4JSLIvxAlz8re++pOhr5FyHCb7i1GJHfGp =vw1H
I5dlbQ4/XaH7OiorM94CCZGDug==
=TMnT
-----END PGP MESSAGE----- -----END PGP MESSAGE-----

View file

@ -1,16 +1,16 @@
-----BEGIN PGP MESSAGE----- -----BEGIN PGP MESSAGE-----
hF4Dt852JJsu9zQSAQdAr6x9smVwC0vNXosdEHRQ3D+zshds/N/d6Wv62b+5EkIw hF4Dt852JJsu9zQSAQdAbTyKtNYMlxhO70zXcZYz/7jAbxxdB1H7F1wjP4DPRy4w
CkmC4Qj05zRSBcXCUVfZtfCRBxlWvQEUIZm3H18qB68CIple/PTWESCpomhQJJj2 l19sqCYbPXEgB3kqfC6PVPR6WZBVZ/CclVZ5+Rcam5PkSscNhMjTerq5kav0PtkX
0sEQAXEpC88xeApS6NupmlDyamvOEfRXiBXhaozM58qUnBDsfkiqzdFEct7wmLBR 0sEYAbfJBiGtON5aEIHBZucw0rT2lFUO4RryJZA9+6H/Eg7Ohguy7FRqg3KQyqov
Z+H8gDjaUialyzXcnSFOhJkNU4bnH7zFjIn1lgXn0/6K6FISo63kpsq7K5cwfp7a ihcGYicH+09kVLVZmXnGd76d6D2bkXir/Iq5nt8RZht3hMSo3U+bklVpqB/niguz
TZVkjTxjFbzKSUlUHjoyevhidZEWcnA/cNgv2MTjHNINRkUS85yAuuuVJL3oX8mh P0Xm40Vc8uTF4QLo+Hm7lL+MbKSSCOJk0+Nmss7Td2mBfrPTNLajA43UsPCABQ/+
X6aSGSdTRZTAFNcCOCNQ/901sC0rzfGyLFaiwZyN/hsq9/CwjZuGPXHJMnWoFY1v JM6ZCe6wCOHpYhJOn/4N0Ddf18EIChZ33O9I8MTXmspYaMmxW/5wAac0dzc+C5d2
U/l+Gv/fH8CpGHYSSyHzvwbnq7yxICrWvnDhws/BxoT03Qm2CJWUp64ut2h7qC8G 49xAMSUCXA4VZjy8mBJN+eYXUOZ8LHMHinAc5bbsI7hvCk6f7iZB+zlociAqI4QN
34KtLIuiuttAxk3D6ZUvD0Lyk9xdEN58Vvw0r4uTw1fsdm/PgBCiEMdPBF/3iRjw qQqOaHYB87nFqo8pDuSdVJon0UHtWRL7oEVx7958V0/I/3A7HZs7ssLcKS24MPoP
fpAhDLxJUAmTdcH3sYPU9hgr1Igu7IMupFTfCNDkMbNXgdHnw1D/+fLLf+AMEjLw wkKl3SZ+okfmlQQnFwyfNqpDBdWPvXeSEx6531O9Sy2cFbTr9pvoEI6Xa8oP184e
Uh4dDicCPdkWhx3c9UncVatoVIYub11/ExdrInvs7VDX3HZZmKWLuFGosdmtTjNr KaQExiKiOM0/fZjUwVn6qArnfzXIZokVida8z91HeVRNcILsxjRzo7wMO/6JxWS3
7m0yf57SuIr+98skB8BF4XJ9R1PsMMU5MQbWFGWIqsCp3B6pcn+mtimO0YokkBPI H5Hcj3+19Yby8RbzcMpjw3Ho7d0l0LuBB37UTuFzbtawFeIu1hJdm+AxbjNV8pSY
Y6wc9Bm5EFN3jcPzvGAx7CVIoxdYXQ9X7F0wH1oxCb6KuNg= QYccVtgRnkPOOJW/YFNZ7aW4Nxj4Chl/pTRJYCOGrBxwdQl2L5DdpE4+dw==
=RU6n =zzIt
-----END PGP MESSAGE----- -----END PGP MESSAGE-----

View file

@ -6,7 +6,6 @@
email = hey@winston.sh email = hey@winston.sh
signingkey = A476C39610E53A689A57BD0D0B89BC45007EE9CC signingkey = A476C39610E53A689A57BD0D0B89BC45007EE9CC
; using 'pass' as the password manager
[credential] [credential]
helper = gopass helper = gopass
useHttpPath = true useHttpPath = true

View file

@ -40,14 +40,14 @@ color.error=
color.debug= color.debug=
# Task state # Task state
color.completed= color.completed=green
color.deleted= color.deleted=red
color.active= color.active=blue
color.recurring= color.recurring=yellow
color.scheduled= color.scheduled=magenta
color.until= color.until=yellow
color.blocked= color.blocked=red
color.blocking= color.blocking=red
# Project # Project
color.project.none= color.project.none=
@ -60,7 +60,7 @@ color.uda.priority.M=
# Tags # Tags
color.tag.next= color.tag.next=
color.tag.none= color.tag.none=
color.tagged= color.tagged=cyan
# Due # Due
color.due= color.due=

View file

@ -36,41 +36,4 @@ uda.githubnamespace.type=string
uda.githubnamespace.label=Github Namespace uda.githubnamespace.label=Github Namespace
uda.githubstate.type=string uda.githubstate.type=string
uda.githubstate.label=GitHub State uda.githubstate.label=GitHub State
uda.gitlabtitle.type=string
uda.gitlabtitle.label=Gitlab Title
uda.gitlabdescription.type=string
uda.gitlabdescription.label=Gitlab Description
uda.gitlabcreatedon.type=date
uda.gitlabcreatedon.label=Gitlab Created
uda.gitlabupdatedat.type=date
uda.gitlabupdatedat.label=Gitlab Updated
uda.gitlabduedate.type=date
uda.gitlabduedate.label=Gitlab Due Date
uda.gitlabmilestone.type=string
uda.gitlabmilestone.label=Gitlab Milestone
uda.gitlaburl.type=string
uda.gitlaburl.label=Gitlab URL
uda.gitlabrepo.type=string
uda.gitlabrepo.label=Gitlab Repo Slug
uda.gitlabtype.type=string
uda.gitlabtype.label=Gitlab Type
uda.gitlabnumber.type=string
uda.gitlabnumber.label=Gitlab Issue/MR #
uda.gitlabstate.type=string
uda.gitlabstate.label=Gitlab Issue/MR State
uda.gitlabupvotes.type=numeric
uda.gitlabupvotes.label=Gitlab Upvotes
uda.gitlabdownvotes.type=numeric
uda.gitlabdownvotes.label=Gitlab Downvotes
uda.gitlabwip.type=numeric
uda.gitlabwip.label=Gitlab MR Work-In-Progress Flag
uda.gitlabauthor.type=string
uda.gitlabauthor.label=Gitlab Author
uda.gitlabassignee.type=string
uda.gitlabassignee.label=Gitlab Assignee
uda.gitlabnamespace.type=string
uda.gitlabnamespace.label=Gitlab Namespace
uda.gitlabweight.type=numeric
uda.gitlabweight.label=Gitlab Weight
# END Bugwarrior UDAs # END Bugwarrior UDAs
context=work

View file

@ -37,6 +37,7 @@ local function get_font(name)
size = fonts[name].size, size = fonts[name].size,
} }
end end
-- }}} -- }}}
-- superscript/subscript {{{ -- superscript/subscript {{{
@ -81,6 +82,7 @@ local function numberStyle(number, script)
end end
return result return result
end end
-- }}} -- }}}
-- custom tab bar {{{ -- custom tab bar {{{
@ -140,7 +142,14 @@ wezterm.on("format-tab-title", function(tab, tabs, panes, config, hover, max_wid
return { return {
{ Background = { Color = s_bg } }, { Background = { Color = s_bg } },
{ Foreground = { Color = s_fg } }, { Foreground = { Color = s_fg } },
{ Text = " " .. tab.tab_index + 1 .. ": " .. tab.active_pane.title .. numberStyle(count, "superscript") .. " " }, {
Text = " "
.. tab.tab_index + 1
.. ": "
.. tab.active_pane.title
.. numberStyle(count, "superscript")
.. " ",
},
{ Background = { Color = e_bg } }, { Background = { Color = e_bg } },
{ Foreground = { Color = e_fg } }, { Foreground = { Color = e_fg } },
{ Text = RIGHT_DIVIDER }, { Text = RIGHT_DIVIDER },
@ -150,15 +159,15 @@ end)
-- custom status {{{ -- custom status {{{
---@diagnostic disable-next-line: unused-local ---@diagnostic disable-next-line: unused-local
wezterm.on('update-status', function(window, pane) wezterm.on("update-status", function(window, pane)
local palette = window:effective_config().resolved_palette local palette = window:effective_config().resolved_palette
local firstTabActive = window:mux_window():tabs_with_info()[1].is_active local firstTabActive = window:mux_window():tabs_with_info()[1].is_active
local RIGHT_DIVIDER = utf8.char(0xe0b0) local RIGHT_DIVIDER = utf8.char(0xe0b0)
local text = '' local text = ""
if window:leader_is_active() then if window:leader_is_active() then
text = '' text = ""
end end
local divider_bg = firstTabActive and palette.ansi[6] or palette.tab_bar.inactive_tab.bg_color local divider_bg = firstTabActive and palette.ansi[6] or palette.tab_bar.inactive_tab.bg_color
@ -254,57 +263,57 @@ return {
-- 'v' to visually select in the current pane -- 'v' to visually select in the current pane
{ key = "v", mods = "LEADER", action = "ActivateCopyMode" }, { key = "v", mods = "LEADER", action = "ActivateCopyMode" },
-- 'r' to rotate panes -- 'r' to rotate panes
{ key = "r", mods = "LEADER", action = act.RotatePanes('Clockwise') }, { key = "r", mods = "LEADER", action = act.RotatePanes("Clockwise") },
{key = ' ', mods = 'LEADER', action = act.QuickSelect}, { key = " ", mods = "LEADER", action = act.QuickSelect },
{ {
key = 'o', key = "o",
mods = 'LEADER', mods = "LEADER",
action = wezterm.action.QuickSelectArgs { action = wezterm.action.QuickSelectArgs({
label = 'open url', label = "open url",
patterns = { patterns = {
'https?://\\S+', "https?://\\S+",
}, },
action = wezterm.action_callback(function(window, pane) action = wezterm.action_callback(function(window, pane)
local url = window:get_selection_text_for_pane(pane) local url = window:get_selection_text_for_pane(pane)
wezterm.log_info('opening: ' .. url) wezterm.log_info("opening: " .. url)
wezterm.open_with(url) wezterm.open_with(url)
end), end),
}, }),
}, },
-- copypasta -- copypasta
{ key = 'Enter', mods = 'ALT', action = act.ToggleFullScreen }, { key = "Enter", mods = "ALT", action = act.ToggleFullScreen },
{ key = '-', mods = 'CTRL', action = act.DecreaseFontSize }, { key = "-", mods = "CTRL", action = act.DecreaseFontSize },
{ key = '-', mods = 'SUPER', action = act.DecreaseFontSize }, { key = "-", mods = "SUPER", action = act.DecreaseFontSize },
{ key = '=', mods = 'CTRL', action = act.IncreaseFontSize }, { key = "=", mods = "CTRL", action = act.IncreaseFontSize },
{ key = '=', mods = 'SUPER', action = act.IncreaseFontSize }, { key = "=", mods = "SUPER", action = act.IncreaseFontSize },
{ key = '0', mods = 'CTRL', action = act.ResetFontSize }, { key = "0", mods = "CTRL", action = act.ResetFontSize },
{ key = '0', mods = 'SUPER', action = act.ResetFontSize }, { key = "0", mods = "SUPER", action = act.ResetFontSize },
{ key = 'c', mods = 'SHIFT|CTRL', action = act.CopyTo 'Clipboard' }, { key = "c", mods = "SHIFT|CTRL", action = act.CopyTo("Clipboard") },
{ key = 'c', mods = 'SUPER', action = act.CopyTo 'Clipboard' }, { key = "c", mods = "SUPER", action = act.CopyTo("Clipboard") },
{ key = 'v', mods = 'SHIFT|CTRL', action = act.PasteFrom 'Clipboard' }, { key = "v", mods = "SHIFT|CTRL", action = act.PasteFrom("Clipboard") },
{ key = 'v', mods = 'SUPER', action = act.PasteFrom 'Clipboard' }, { key = "v", mods = "SUPER", action = act.PasteFrom("Clipboard") },
{ key = 'f', mods = 'SHIFT|CTRL', action = act.Search 'CurrentSelectionOrEmptyString' }, { key = "f", mods = "SHIFT|CTRL", action = act.Search("CurrentSelectionOrEmptyString") },
{ key = 'f', mods = 'SUPER', action = act.Search 'CurrentSelectionOrEmptyString' }, { key = "f", mods = "SUPER", action = act.Search("CurrentSelectionOrEmptyString") },
{ key = 'l', mods = 'SHIFT|CTRL', action = act.ShowDebugOverlay }, { key = "l", mods = "SHIFT|CTRL", action = act.ShowDebugOverlay },
{ key = 'p', mods = 'LEADER', action = act.PaneSelect{ alphabet = 'asdfghjkl;', mode = 'Activate' } }, { key = "p", mods = "LEADER", action = act.PaneSelect({ alphabet = "asdfghjkl;", mode = "Activate" }) },
{ key = 'P', mods = 'LEADER', action = act.PaneSelect{ alphabet = 'asdfghjkl;', mode = 'SwapWithActive' } }, { key = "P", mods = "LEADER", action = act.PaneSelect({ alphabet = "asdfghjkl;", mode = "SwapWithActive" }) },
{ key = 'p', mods = 'SUPER', action = act.PaneSelect{ alphabet = 'asdfghjkl;', mode = 'Activate' } }, { key = "p", mods = "SUPER", action = act.PaneSelect({ alphabet = "asdfghjkl;", mode = "Activate" }) },
{ key = 'P', mods = 'SUPER', action = act.PaneSelect{ alphabet = 'asdfghjkl;', mode = 'SwapWithActive' } }, { key = "P", mods = "SUPER", action = act.PaneSelect({ alphabet = "asdfghjkl;", mode = "SwapWithActive" }) },
{ key = 'R', mods = 'LEADER', action = act.ReloadConfiguration }, { key = "R", mods = "LEADER", action = act.ReloadConfiguration },
-- mostly OS defaults -- mostly OS defaults
{ key = 'n', mods = 'SHIFT|CTRL', action = act.SpawnWindow }, { key = "n", mods = "SHIFT|CTRL", action = act.SpawnWindow },
{ key = 'n', mods = 'SUPER', action = act.SpawnWindow }, { key = "n", mods = "SUPER", action = act.SpawnWindow },
{ key = 't', mods = 'SHIFT|CTRL', action = act.SpawnTab 'CurrentPaneDomain' }, { key = "t", mods = "SHIFT|CTRL", action = act.SpawnTab("CurrentPaneDomain") },
{ key = 't', mods = 'SUPER', action = act.SpawnTab 'CurrentPaneDomain' }, { key = "t", mods = "SUPER", action = act.SpawnTab("CurrentPaneDomain") },
{ key = 'w', mods = 'SHIFT|CTRL', action = act.CloseCurrentTab{ confirm = true } }, { key = "w", mods = "SHIFT|CTRL", action = act.CloseCurrentTab({ confirm = true }) },
{ key = 'w', mods = 'SUPER', action = act.CloseCurrentTab{ confirm = true } }, { key = "w", mods = "SUPER", action = act.CloseCurrentTab({ confirm = true }) },
}, },
-- }}} -- }}}
-- font -- font
@ -332,5 +341,5 @@ return {
-- biggest mistake -- biggest mistake
max_fps = 240, max_fps = 240,
-- scrollbar, currently hidden by default, but better make sure -- scrollbar, currently hidden by default, but better make sure
enable_scroll_bar = false enable_scroll_bar = false,
} }

View file

@ -146,6 +146,7 @@ if [ -x "$(command -v colordiff)" ] && [ -x "$(command -v diff-so-fancy)" ]; the
fi fi
## chezmoi ## chezmoi
alias cm='chezmoi'
alias cma='chezmoi add' alias cma='chezmoi add'
alias cmap='chezmoi apply' alias cmap='chezmoi apply'
alias cmcd='cd $(chezmoi source-path)' alias cmcd='cd $(chezmoi source-path)'