diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml index d00963e..5924262 100644 --- a/.chezmoiexternal.toml +++ b/.chezmoiexternal.toml @@ -1,3 +1,8 @@ +["themes.gitconfig"] + type = "file" + url = "https://raw.githubusercontent.com/dandavison/delta/main/themes.gitconfig" + refreshPeriod = "168h" + [".vim/autoload/plug.vim"] type = "file" url = "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" diff --git a/.chezmoiignore b/.chezmoiignore index bd92c5f..0a4386b 100644 --- a/.chezmoiignore +++ b/.chezmoiignore @@ -1,14 +1,8 @@ README.md install.sh +install.log scripts utils {{- if ne .chezmoi.hostname "ecole" }} .config/gtk-3.0 {{- end }} -.gnupg/.#* -.gnupg/.gpg-v*.lock -.gnupg/gpg-agent.conf -.gnupg/pubring.kbx -.gnupg/pubring.kbx~ -.gnupg/random_seed -.gnupg/trustdb.gpg diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl new file mode 100644 index 0000000..8569c6d --- /dev/null +++ b/dot_gitconfig.tmpl @@ -0,0 +1,22 @@ +[user] + email = thomas@hexasec.io + name = tombdf + signingkey = A047E76CC4582988 +[init] + defaultBranch = main +[commit] + gpgsign = true + template = /home/thomas/.gitmessage +[core] + pager = delta +[include] + path = /home/thomas/themes.gitconfig +[interactive] + diffFilter = delta --color-only +[delta] + features = gruvmax-fang + hyperlinks = true + navigate = true # use n and N to move between diff sections + side-by-side = true +[merge] + conflictstyle = zdiff3 diff --git a/dot_gitmessage.tmpl b/dot_gitmessage.tmpl index d193a85..613308d 100644 --- a/dot_gitmessage.tmpl +++ b/dot_gitmessage.tmpl @@ -18,16 +18,6 @@ type(scope): concise description # secret : Changes to encrypted content # script : Changes to shell scripts or automation -# Chezmoi-specific scope examples: -# (nvim) : Neovim configuration -# (shell) : Shell configurations (bash, zsh, fish) -# (kitty) : Kitty terminal configuration -# (hypr) : Hyprland configuration -# (waybar) : Waybar configuration -# (scripts) : Shell scripts and utilities -# (secrets) : Encrypted files and secrets -# (external): External dependencies - # Closes/Fixes/Resolves: #123 (if applicable) # Co-authored-by: Name (if applicable) # Target-Host: hostname (if change is specific to a certain machine) diff --git a/private_dot_config/chezmoi/chezmoi.toml.tmpl b/private_dot_config/chezmoi/chezmoi.toml.tmpl new file mode 100644 index 0000000..a592c0d --- /dev/null +++ b/private_dot_config/chezmoi/chezmoi.toml.tmpl @@ -0,0 +1,85 @@ +encryption = "age" +[age] + identity = "{{ .chezmoi.homeDir }}/.age/key.txt" + recipient = "age1w8ms9vszzf20ln5tmztwmmrseecjywh7k36rt0lcep62nqk76f7sa3l4pt" + +[data] + hostname = {{ .chezmoi.hostname | quote }} + {{- if eq .chezmoi.os "linux" }} + {{- if (.chezmoi.kernel.osrelease | lower | contains "arch") }} + distro = "arch" + {{- else if (.chezmoi.kernel.osrelease | lower | contains "debian") }} + distro = "debian" + {{- end }} + {{- end }} + +[diff] +{{- if lookPath "delta" }} + command = "delta" + pager = "delta" +{{- else }} + command = "diff" + pager = "less" +{{- end }} + +[edit] +{{- if lookPath "nvim" }} + command = "nvim" +{{- else if lookPath "vim" }} + command = "vim" +{{- else }} + command = "nano" +{{- end }} + +[git] + autoCommit = true + autoPush = true + commitMessageTemplate = """\ + {{ "{{-" }} $path := list {{ "}}" }} + {{ "{{-" }} range .files {{ "}}" }} + {{ "{{-" }} $path = append $path .path {{ "}}" }} + {{ "{{-" }} end {{ "-}}" }} + {{ "{{-" }} $firstFile := index $path 0 {{ "-}}" }} + {{ "{{-" }} $dir := dir $firstFile {{ "-}}" }} + + {{ "{{-" }} if contains "encrypted_" $firstFile {{ "-}}" }} + security(secret): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple encrypted files{{ "{{" }} end {{ "}}" }} + {{ "{{-" }} else if contains "scripts/" $firstFile {{ "-}}" }} + script({{ "{{" }} $dir {{ "}}" }}): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple script files{{ "{{" }} end {{ "}}" }} + {{ "{{-" }} else if contains "exact_" $firstFile {{ "-}}" }} + chore(external): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update external dependencies{{ "{{" }} end {{ "}}" }} + {{ "{{-" }} else {{ "-}}" }} + chore({{ "{{" }} $dir {{ "}}" }}): {{ "{{" }} if eq (len .files) 1 {{ "}}" }}update {{ "{{" }} base $firstFile {{ "}}" }}{{ "{{" }} else {{ "}}" }}update multiple files{{ "{{" }} end {{ "}}" }} + {{ "{{-" }} end {{ "}}" }} + + {{ "{{-" }} if gt (len .files) 1 {{ "}}" }} + + Modified files: + {{ "{{-" }} range .files {{ "}}" }} + {{ "- {{" }} .path {{ "}}" }} + {{ "{{-" }} end {{ "}}" }} + {{ "{{-" }} end {{ "-}}" }} + """ + +[git.commit] + gpgsign = true + signoff = true + +[git.push] + followTags = true + +{{- if stat (joinPath .chezmoi.sourceDir "hooks/pre-commit") }} +[git.hooks] + pre-commit = "{{ .chezmoi.sourceDir }}/hooks/pre-commit" + commit-msg = "{{ .chezmoi.sourceDir }}/hooks/commit-msg" + post-commit = "{{ .chezmoi.sourceDir }}/hooks/post-commit" +{{- end }} + +[merge] +{{- if lookPath "nvim" }} + command = "nvim" + args = ["-d", "{{ "{{ .Destination }}" }}", "{{ "{{ .Source }}" }}", "{{ "{{ .Target }}" }}"] +{{- else if lookPath "vimdiff" }} + command = "vimdiff" + args = ["{{ "{{ .Destination }}" }}", "{{ "{{ .Source }}" }}", "{{ "{{ .Target }}" }}"] +{{- end }} diff --git a/private_dot_gnupg/encrypted_dot_#lk0x000055c610fe2b30.student-laptop.59424.age b/private_dot_gnupg/encrypted_dot_#lk0x000055c610fe2b30.student-laptop.59424.age deleted file mode 100644 index 26ef5a9..0000000 --- a/private_dot_gnupg/encrypted_dot_#lk0x000055c610fe2b30.student-laptop.59424.age +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3SEFQenFBK200RnFvb2ZU -YTlNRk1CMFVrbWg0RTN2TkIyeFdOa3RSYzJFCncyNk8vSkZXcDBTcW4rZ0JieWoz -UkNudHpEN282UkY3cDhxNFAxZGxZV3cKLS0tIGxOUE5PMGFtb213ZlVHVmMzU1pB -dEFOaDRJNmFPeSs5Q3FGRXEzTnYzTzgKlKsD9z6TA/1rKjXu0+r2kIlBmb/VNfrh -Dmd4xjM8UGPqRHJiSDd9AWm5HKRMYNIi+I9bN2GD22bF8A== ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/encrypted_private_random_seed.age b/private_dot_gnupg/encrypted_private_random_seed.age deleted file mode 100644 index 4114dbb..0000000 --- a/private_dot_gnupg/encrypted_private_random_seed.age +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB1UW00eW4zUkplK285Mmxh -TUIyRmxpUEMwTGR5bnB6eWJhT1lHRzhXSzNvCmJFZ2pEc0txMU1IbCs4bEtQZDc2 -elhLSklMY0wvOElhQTJGVGJzMi9KQXMKLS0tIFg3QWp1ZjV1YVprNkhuY00raHFO -RnZ3SFJSZVFkb21iTHV1VTM5a2xnaTgK+4pr2lQOYxKTeCv5Ot5H6avqsyiTLzuD -tagstCg6ChMJI+m8NNTpkCVUDWYcbBN0KHkjZIhUPTqh41eqWHNo7HU1mAXinrkp -FV2Ixha425rzX79ASxcJqBLJrhfd4/Oozu4ZQ+TbCTq9A77Zw3A7l9dMbTlmlp/y -TWYUTSE98lsjCt2DjTesz0ebbUw0Ozxsbs0ikolbTd59oCiKUjMqVEsMPxKeQa9Z -K6BzxyD6R8iikPHgA4oKxRmYABQTuwJjstcJOIuzqtNVJiMsAxmQGCp+Muu0RJC4 -Kpwqb1mKmmYp9ysjgI/G/kan4n+kv8yUDJOuUCJ4DCVCSROfIOCDgw87GpLsdXlj -d8sCqi62k1sQsb9C3EcHyCMe5inrlFs0Zys8ZqBlGg9d4pL0eR0/zqjGc6+mWofI -9Ol4TKNP1DVVbR0iPyzIBKfsAf00Q0XOpQkcrvRiF83pVn4APb2bs+m05C62ZjGS -+TLYyTdCxlnCas9qWSHyyR9Mv26KD5/UtUutTs2oQha4liDFN2F6KUAB0QDCbh+A -lWaBgGNIMnNw7AdumJ+f+Hwj7dY4MtOnJX/REBPsVDdapmXs7/cmyZfFthO00ixL -copeXzECiFGd+AWouZdYFGjwSvSK3RtUdX2vEFzKM07mbSnzv2Mr511D9KUaXjdv -PS37aHj2l8f3wVgF6FwGO7XYCF016l6rmQ0XmMFiH9hlPmpiBo6KhlHKg31KU6i9 -+30KRlGBJgpSHr//k3Q8HvJ58Gb55f/XfsUOgrWWBsQKGSxS8SR53iT4KgdYpnwj -aUxSAFe44GjpZasfzqBnRQILFjRKOLVPDcNE9Llqv5Q= ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/encrypted_private_trustdb.gpg.age b/private_dot_gnupg/encrypted_private_trustdb.gpg.age deleted file mode 100644 index 4059974..0000000 --- a/private_dot_gnupg/encrypted_private_trustdb.gpg.age +++ /dev/null @@ -1,33 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSmMrWVVCM3o5RzFHMCtY -eXlFcitVTkR3cXJvSDBJVTcrMzUrY05YVUZ3ClhHbk9sOWRQazMzVkczdEpicVN3 -b2FraUtjQUIraUhSR1F5a2dxcmsva28KLS0tIHRUT0lMalZ5QkNzMHlFSTc0VGkr -cGhvRGxXMExlT2p4OUF3ZnFXRGxibzgKH0s8a4t5AjMyrBm+fRpUPX40uJqhx02k -BeiSsUMn8tN5aPbU5xf0n6tSSulVlrWcypJFMkr0FVNcXpY9PROctjGOd94p9GYl -TU7E2yM0+7SByYCfBuWGbsM6j3ljK/0eAgX//GKMTLOnnQYxi+S/QGQLI618iM6V -PKEEHZLM5BYGcRmyHW05KeWNly2nughuichNEaxXApR/PzfX68d1Y2RIMvqxgbSd -kTxDqHDE5Ox1LlVtI2/WFOO+wj61onSerqku1rase8ezcN78x4dMI4Dkl2SNTiUK -TW356VHw9CPW4+m2DQXr6yV+4bpj+0cqCfqzoEg3bksQA1DjTfZzv6K2gtFSRN8m -CO2euPCeVg6f1m8vrX/u6ObSgc4QiWoGAe9kBf/DeaEEGcCmXeOCk739Kks/UIK4 -4T5CD7ZwYl2fuEsRRNZU4Pbi2GLH8IrL1FFS47jNwLvbUKmWNe2pXHgW7O68VTSg -AnSrtv69K1i5t+0I3RfmygWWEQSIyBEiZWgdp4T0urYKl3J7J5MbFZJ6xMHcscKs -4Fn+wPL4u0rgwx6TyzlV8SZ32WqceDgrkOPIeir1S15+Ni6KIJAhg9JLcxTGDumT -4nk+1UnUYwBFVmpG6Vzt9nFjrni+JmiRuF3XWJjwJlFgsSSh2al8JxL+Ag2D+u4W -L9mcGcIlzMf0e/MPVq3dCEuQ7tmNgnzgByV9hUTwijs80+FNNUdHH3I2alkcv6n4 -miN61koRUzAXhCIo5ih45bD/R1MmtMfkL4d4tJIYUj2TqM+COg2QL2gA2n9t1gXE -nVGemUm8luZehVZCZORtXmS3jqgmS6se+PQ5S1jMq8Pzb8OwgXRF8qw8KKAMtI2e -wtKhWpSQM9rsojJm1WJ9c/pUHFPPot5ZKNLKYjZ51ox2J6GIEdXGMH6MoxxMIRC6 -AOcwuwf2IbPyI+Z/0lQ94JzxZIYGk8aJarwqUcBv90BQgbz0hczV0i5jqNxgqDHA -Zb1Z3fGmtyFAIoq+BVdDIGKRgD9HsXCHGUfZf23f4d0rXU14Gk9fI/xEzFPlWvXO -h9FmoJAquu3MXU1b2YSu66W3eNeZaOYatE6OM+eH7LWKWoDhETUT85PQQ3PdTFqi -VDpwtoAlAsjxfkUmzg+Y9uvobiS1b6KdFDd+jJ+CmXZTf6i1fcKYQ/D6jGaaxdGK -EJ3D4BP45EteUHwVslJ1RiGvk3I0HjLl5Z2a6pggE8DmJI2qIekaw8PGBf/RpiJA -uEiWCtV5IIR03vZZR7Gs5R1wY2bu4hPyivyh5VwpNtGNytGakQXK01fibtcf54ol -9Y7dGCTuRgEv87whZwGwn0vL70GhiPMpP0bFv7I2Wa/ouc4Kq7TJQqRRgQj1cXzG -RBlYaAsIQ9CqzzS5Hdj/WD8/MCLWbRNDpuSh6Zp8BLtause8HCPN0qrtInChOE2v -YoCCIeiuCHu+0R25Laosg3PpHDhwwLkDrL5NaqznJeWwCJi6KwOPRO0rXdSyVo+1 -AgLMpjU/R1zACtCxFZ5bw5Mf9W+1j00bHvaIcMBnPWTXiC6KIHpqTrwzpuUXq5e4 -9ICwb8ivId2PJZVcoAKSGez0GsVsR0lX2d5Mi6LcWKBG5llRxEh96Y37r9J7Zutj -9XDmzTE3Iy4g3FlNE+tQr2fwm4qnEaSRF7jC7useCSWz4g+/vqHMeuJ7lUYZYcDC -fzEKOFH6/cWNKCm4zDqX5QUrjkYoNUzmLw1ZmVlSEj3RQByxToUTCw== ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/encrypted_pubring.kbx.age b/private_dot_gnupg/encrypted_pubring.kbx.age deleted file mode 100644 index 88eff5b..0000000 --- a/private_dot_gnupg/encrypted_pubring.kbx.age +++ /dev/null @@ -1,59 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBoZmkzSW8wZUJsQ3FXcjN4 -OUw0dTFUaS9wODZER05TN3YwbjZPZXBSa0EwCnV5d3NKbUR5dE94NVFqYWVkY0pH -ZWM3YW5zcEw2RXo2M2d0ME44dFlnZFkKLS0tIFhHQWd1M0NQTkxUWWlNUnZvNUE2 -Y2dCcUdQRVBQOTZPUDR1YlBCK0wyMmcK7QoE6LHwo7XQdNBLCa2eBySCf7WS+ywr -ZkxOmTxyHyGOainSKceQUlj1fIpqftiv1lN0GHlL8T7E2Ku+gpU7cjM3G6Wklfhl -85F2qujod5TmhrTlSddBfjYRvdRqRyL03oWHPjXYUzxc/cs5hqxXxpLD8Hnr4bMx -c+zX6CPN8iOQsZEkgUXCMXbApLd+eH75YbqByBr89YbaYTtpvcGbczIEqXbFcq6s -NmKNl2AZSA+uwudWtnSdr6Jrt6C3skxveKJy4nRI5JYQLmi5GbCZXz9845xOTsBA -Kvo7aKSanHXgs6Dvj9CupTp7GkuuZZOwPj7yKPk17YWASbK2MVUvnZGQWsxKrPkl -xaKaeqFVSoofSHXj21z4yurYeBULzfsWrIhSXpZoxlYfExhpXj8qJyEud+rSuEAW -AKZzNGnk5aA7HBQmlsHTs1rlJu/ZFJGMUT2R7R8D1kk8lPQKXL7kDgIzGh76sxmg -DRP3RcFjwrJFAE20SmY5KKcuoelu2PeRnU/VqAp25EM9v46hDhUk12suey8KFDZc -B7BDUGk7qMrQxs+FHV/nSQCKd3nL+R35xwv8HZHU96K+lqfr6Ko7obHZ7C6MWOlN -/SjYIGmipWK5pNoldWhYU2F9I6LyxsfY/tZbY0TB6MSGYhbh8MfQWORnRpw1LeVp -0GlJutwlhYqSYwt4DvwUDXXItBw6mlN3hea2/vqIodD/JZx3hL8Ml6JbLDIZWcRD -X6L6JuUIa7Dx6hLKxGKCiNxGq4c8LpqWnXw+sli/a8C8eeqKOtM074Lksmbc/xc0 -7/7Q7VDOT+dtPE1XwIYhygNUS19PnlLO4+CHUGI8nKkeEmPNSp8MFx7ZohglkyzZ -i9EYWWjpQYAlmYdAYy/l9gYmVTV7y9FEDlK3lvKdYUJ/+0eDnlYTK4CYyx/xs14L -cwJ8rDPjJ1ieifCUfDR9sMAEvUiTm6/CeFOaH6QXJscxkdm7SEjYzK8x1Z1bLEgu -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 ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/encrypted_pubring.kbx~.age b/private_dot_gnupg/encrypted_pubring.kbx~.age deleted file mode 100644 index 0400a9e..0000000 --- a/private_dot_gnupg/encrypted_pubring.kbx~.age +++ /dev/null @@ -1,19 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSArZkdLbjM4Q0E3OUtCbWRo -QjNVN2dUMHFpMW9NY1pPODJuR2tvaUVlbGdVCjVnLy9hQlhrWUYvSWI1M3lJOCtE -ZTFlMEdUbncvenVkM012SmVrd0ZzN0EKLS0tIFlEZEY2YWhsUW5iMWx2UWtFaURt -Z2xWdDdwQXJJeDUxOHFEVTJ5a05jN3cKAvAHKh/jWRMvqaBwVWd3r8LfeyTfZPA/ -fL9Hrun2MwLbPug0lifHeAqdNgK+4SMpxdsDtqd5mKU6LuXIfy3pTFuuplE2Xybh -XRSOQQcsIHkfCdYSkZsZAHWA9iHL4VDuOs20naNDo8vTYDgUsyjpB7jp/gSe5UKN -J7iTirCt5Z9sRXxoGMhPS2vc4bYEHPJF2ZnxiX+0c3n/eDYXviBBSgcr7LDC50hu -fOudj2cXgw5EaEd/KQIaS9Ri9J5xC1kvFxpVjzC5gifa7leQ53D+JTvSFezi7D3P -F6ll+xkYKSIqcq5pR4jDJ9xPcPtYKEf3ycQT5sUgxDEFNV6IrmCyGeLoW+sOuUTm -62fp0d0TYHc1g9/JH0GcxorD0YkI3WO4YG/2i1hOQA+VLlyGf4/UTHXft17svf6z -L9YzUCl+YZG+f2ewKxC/j4gL0Cx5n+oURt1tchU4UF6ExZPB9j9pbLoZw25VPUN0 -crSuWjxo0T7waixaCV851MUybQsXWQQWAF9oA8cGUtruVEXc7C9FxFJ5ClAQR3Ty -XorjvHEBg05xiGgm+asuBWIDexSjfCoE9/P/WGKUQ8nXRKmnhmtcczGJd2Arq3JR -4WNTX+1W2ilyjJW1c0Q21ShGfQJmhC0UkFszub6NVl4iRJqk79eQGITbsDkBVYf1 -H6ia+iOvN2T4tywjo6ChVo7MqrldznPA7H0JQDTB12QZEOb7lthRCX0RDeqye/Ux -LHbSGyMK9SucRi1CzevtDdPaht59HKJND0q0ZnCN5Tr13WXFQk0NjLXR6hM2Mpqv -v/XMCQs= ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/private_openpgp-revocs.d/encrypted_private_8E53AC1843F817584637FA5FA047E76CC4582988.rev.age b/private_dot_gnupg/private_openpgp-revocs.d/encrypted_private_8E53AC1843F817584637FA5FA047E76CC4582988.rev.age deleted file mode 100644 index eb9dce6..0000000 --- a/private_dot_gnupg/private_openpgp-revocs.d/encrypted_private_8E53AC1843F817584637FA5FA047E76CC4582988.rev.age +++ /dev/null @@ -1,41 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBVkZRODJoRGNVUzI2dzh1 -MjRRQ09UUjhscFRTNVZPUjY5ZnJ4MThJUUVBCnc1bjhKV1JXRVJwS05VcmJzc1ls -R2RIQUFPeXdUUlJXVEV1b1FFcVJpcUEKLS0tIG5VSHNtMjd4eWNycTlIeU5CT1Ev -S05uUDF1eGwrQ1ViVXFMR2lPZXMvaWMKL5s92un/hUHP4Q/RsHLSxKY7S71/yPM9 -qlFcy+IcKKEefjYmlmfG/KpZqwwz2bn/68ZZo3WxSQxzaR/+amThd39arsKeIjEL -4KbTtM6sbtfYZ8JaqBJSTb72TKcgPz2YPy5et0+hn6gWkgk6hS/IMimSfmnrKyUP -jhHkC3+Yvnj3rvFxUl+bgmjjiD7uT6uqYqq4PRSWn20bDkoDvSIaujJzQi5EJXIa -QkFjLYKF7wKm8FPKfFNd8OvkkOyd/wjG9tdQWuXMqFrJHVRrnhfe8jReFpEi9uw4 -gfK9vj75jMrH5u3zYsDgHDGOylk/+u7eCwjs0sqaWDQOtFc3iyaNM7BGvEvSug+E -aWsZcBkMpQmf7UPZzj+im0yRHO5AGBcgwvJJuZxKzNVxFn48fvq9OhC9Dju819UY -QifYDRiDDsnD9pSwpw3Qf6ybalDRpHMWRo8szCL3LE948Dj1PoXpEiI1ox5J/uUX -CBmv+TIAyeHLWycnAvKCxc0UioZUW/+/LLmfeS636VotS8OO+ce6zukds9W29tgZ -kldmhEm+s80p0Y8UGpQ35lKzzJExKI5oDLnSAZN2Z4V3RXxx90ichoBZ2+Ygw34+ -4taIBqqjJewIocQkqLe81OulYwASjkDzjGPlPdOChcm3YD4iNbG6qYQAk+f6NpoV -UIqKMkq/+QBV/e9wO74mgoEbcHwLVLp1qa7vPytHCEJwr6/s7lSEC/81vSdvMxxk -DGP4bAWNTGfp0aaWEsLOiQQLaDPi6EU1KVc8qIbZ82bK4DtjfCRj1Bn92icus1st -/tBFYHr/DVIbjqAieHP/u8UbShpw9srzdD6I10mJsh8OVyjsbcg44y3frBqogBfa -1qfQcjrYB4dcuvZ2H/HEhJ7lkKv3AXqtlJK3YLylMcufKYGl4h6rzF4hNlGSxxxY -bw2obJyYlzQa85i9oQnOAh3zV+gL5n0uCdei1E9h+8W9cTAG81JTDwaCkIg2cap/ -lvmuWYcPK/J2QNcRpciRereEDTdIuARkVUEyKTTCM0k00BDEFhANQ4OxktOmNmia -gz6SH0y+qQ6kEIJO+kmgTqNvss7hJDOLoji+fxYED7qcDwhLrT5G7XPK2gUlnRgK -blOErSg1zGRCZa9LAwV2vAHoryqOjKh6MdUVEfmpyQwesUapE5mvSTpp9TzUT++2 -Za3M6l4B7orB6XdruGrdBSBsP/W770HmIOsg+p9GmPAh+tah16mlOXJc7ReDjXTj -viYTaElxF9klaGvxaz9hBCH3yZ7/rCzX58+rrJVl+2yE0drzMMWUcBmCLIQ55kFg -SLxA1HeVFMn/XPpOMGHyeJNMzyvR5Ymg15hEpkEZkj4/A8DDWpBeBrl4bFJlUDHG -N/BogO5cgTA0QEw8XNTwA5RImfGhqP0/mZP9Bjhx4Nsjz+sgi6lHHJz1RQKzLm2N -7RXzzJALqsNbMDmG5je6AMsNvA+s7+XV8BXP/wTDfJQNUJEMfglyX8PIHCxKrQNl -EpO0rfphXyD3WszKz1DNxX9BqOjwJnWoycjgwVFx2aIBZLNu+4clrc9SEFupQvqc -XZLAvSz19ZdnU3y00Ma7dD9S0j42j7ltru9bKjRMzmbh+q7fPFNlvL0UUG5QXlv5 -Ap6cTRs3jiSbgkUuETRwgh4yjnpqaku6A1QVYXVV3692jBQ3sQu4b4v3WlSA/Y2b -6k84efr50jDXZY8W6+Q8RyMlzQcutyxkJAEmUDIbVR0upAJ2nYLiWajjSHOdszi0 -aJYCenn5dKIfh1tVax1GcW9UqZbCyfyx87Eo8lZVxO7+2CjFVVccneNsMBGVTYuv -nGrnI4YedfXBTxmrXYULvnJD44q0LcEVBmrA8rkNOgKl9bMd4jGcjLoQZbIfZOfG -EnuwwolPvJCpKHfLuv+3d/zAaJsGRikDjfoMqY7xQJA5RuV5bKvLFt+8BrbNkG3Q -8jQvaMHXJ6j/30W+ncVaj+4lrRKw7+dhsPruEZn7kj/W0ZsMQp6IPNR0YSLwBbuk -3PnQz7CWQSeqT75jdDXdMllfd7aFkTuKlavL3MXdYGVG7KRRcHkMalumT+KClasZ -Ittw3YBndcaJzFhLS2uwsRQlHGIwHKQSRbIIfZps1ZctD2ezmWiKDvE5MGqfDyHr -8JjsLBnKPxNo7qOMOO9TtiF+QS7967s7M5bkwfRPdZdF1m/vBsEJb14S8UjhQCQn -w9LioN0= ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/private_private-keys-v1.d/encrypted_private_67ED6581E6212A0308C3D3CE33AC57BD7979635D.key.age b/private_dot_gnupg/private_private-keys-v1.d/encrypted_private_67ED6581E6212A0308C3D3CE33AC57BD7979635D.key.age deleted file mode 100644 index 1f6553e..0000000 --- a/private_dot_gnupg/private_private-keys-v1.d/encrypted_private_67ED6581E6212A0308C3D3CE33AC57BD7979635D.key.age +++ /dev/null @@ -1,71 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBZRDJkaVVhbXdBa1F6d05H -K3BiZlhHWnllZEFXYkNVUDJKSmg4NGJlV1Y0CkpRMUNyNVM0ZHRJMWxGZGhTMEFC -VmRZaFR1VGFnZVFtem9mMmRoV3dHK3cKLS0tIFVITVcwdVVNNkJpYmJtUzRmUllq -dUxkdFJ6M2pmRkVIeGMwNC9MNm1LUzQKf2cabfxMoJSZtWJBnMzn0KYxfSE5L7+f -YChH1vBsgzMM7zkpUCXht3IqRQ9uCys0XGWoekCVzTmcxsSTm9wkhkkDV68wq+/7 -y1S/HXFfmYLASyImtPik8l8ed68em3R1tnjYyQ9u/Q3j5vbxtT9dvVmooalncw36 -SK0ql4MdIphSVYC/EUbO5/cYR97TOw2fwJyQvPxlOlKWbycpomdJYTftexKIQrHh -DUosnc2mZSsXPdGfflAUWlN0ngWkLKatCWLHTH1sanbq8/cha1Wm2FgLpOJ8Kj2P -eJHdCuaCCxEAHhs41DNCakAsrV1cSxV5gwl4HnV4AaTuQMl4IdOPrKSuJIaltQvc -9huQI54HmcRid9mFgeApS+o4n7TudE+F3+EWdLlXQLpVfw6tjmU177DVVjsdevoj -w8C69FmEZWrilR9W6uV+QUsD4dS+uzCnIr108C7PAeCK8CRDeuO24hGFaiOt63kJ -HTBiapzF741CSgUu5uTpNu3E4nkbHRZMMv6jPLSJNy4fYA/RGzCiEfDJvovPO4pj -o9jLUXjpRsp4k8kTQfYYv41EbVA4gBtX5bPkrDebGpSSi3HiDtdGtffSAnUCQPPf -a3VpyoJnPMZRle4kgTyjnzEWJH6Bx9sQbPP3V+wW4pqLxt28sh0TWHpF/fN88hpm -xn4jGPma6owXUzsW2HNHgcGxBBzGzYzPkUGnzvwwM3OK3+iLpNLpuAxEvlE6PxT3 -hCxg/N4Dikc3bl8a7Jo6HiDJ615BmApgmtsK6XsZLcvR2qvtf0biwR7mhWKzmsLT -E8eVRUxJfsHFqnCwi9fHItHosSQi8KQTDv1j3tDEWTcsQxMnmMeiK3ihNqXByxZf -BanOK+VwopaljfHD+j1QudCUHyAmB5FJlo/76/c0VJQ2N3lI7TkeJ72WLKaSVfeX -YtIELube6PR/kGzydYi3w+LBquRgMcepVhX8W1bxy6fPeav1xmJ57oFh7TykKxlo -uXuXgR4G957eiaR/17l8KIP0+/bC3Bc0CmFBnKToNrvDTxU06e/jMaXD6JWjclg9 -zPycbQVdKL9wwfmsgUJuaGOisQyDnnnVIxEmWus3P9JeAjc+OhTuB99ckzGBdw8o -KTQoychUbWtwtpSwdUP98z/PASTR/RJ9cEC1s0pq0ZoHXejGaelCq7y0hx+i37LW -/SSqE1nEYPA5kTI2C7p7WlDUOTh/XZgvzdLglHGkOU8EBgn/qoI+sjq3Llc6JHm1 -YbxlrW1li1Wy9wDI7dVyejJRAF3bso+IDH9C8KBoNtIT9mgU2lcrZQvDlAbIh5SR -CtpkRRvTIqspCNmBiyUJTiiuDSyP3pAUCRnsmbU+UZjd71F+KPMvDTxCM1Sv2NcO -eTapimqeL0VbpmJ9CVBshR+A4vNiQ50pSLcpBni5m3H/nmoqSyRLUjKuSB9RtM1e -7OUwWnkGEKilqZBj61+eWhHertqdI/lzCoC6lfFMFey9DD6W4vDQ381OIjjVjyGF -4emX0w5Ou3gRDHDd8/2RKDGJWzJ6OPXx8Txq8iCrZGq8j0C0LoN7EK3s7dTJvOqm -g5CpPYy/i4X2kVtgKsLHMiT0Zjk80ESzFQ9XyUuPtP8zC3003dvJCwBcfXlh7HYP -QfX1RkGXaiospW6W4n0Ps+aFkz4IcURKaxaH0gvw/tpWIbhyISQ1Cn0RdyfVkQfU -IslI9pDds/lKd1V4RmjJ5G+cd5MbQqpleiFYEyP5ivakwiTRBpKGFpOQ84q8KjTt -0F9mk08EGqvDhZURc+cC0V5n4gnZJ1Cm/fp2+uvWmZ9m2uvClW4xyZrQkDLq50Fp -VZcZef6tKzIgQvAiAo+rmKNblpvkGEKhFSq5yBK3GMp/XEP9O4gtttLGN4BQcp/t -LlKhhdgZslaWcqTtQ7jRZ+4ZWo124fgd0WzxifiaUjAiYKbWQJ1131HuZX2m6cn1 -AO7B6LkascF832zFO0AcE0gX8PmF9tyw5Tq2TtxeXy4MeuISF2NyDWFTnuPazrDV -K0VIUb29lpxl75qObLu3nF91uRaGDO/tfXQLCR93L76Mdw3SRYaBWoWK49f32T/W -Voax2I4si+3F0lCWudKaxDwJ/P0c7UeKFtx9DrHB0f0aYYWHQm1zj0SaHI+9chDJ -jxvCLHC4AzdAxkrTggDUcoON/IxATcmRI9SpFA6s83r+KC9jzAe2B3tjmu00cwHK -6qJ7oiKibYHlCW2Pa1XQEKsBfq6RrMva5zJt1kXGMODiIinx2XCjNZV5+QWsN1Fo -nBRbNPLvKf2drZsuMoigWN2/JcoadcbSZi4P+dYCdwHYeWuzPzfB53ND6QvU09T0 -Df90cuPR6dOAShAenYB5esRRV6zVj+AKf3lq91z3sR+Ms1QAFQRhk6sbDq1N8J2S -lAa0BWvcO1u0JyXZUZkobx5GuaI7CpDMp2P0pd5MAowlteJ/rrTLhRHF2beYUnCH -mjEPa1A3loXTZHXs9VD11kzChHJc7AE169QsO7LjOBICjmqOF2OpcQz1t5DapvXf -PT21E7HNmhKe/hlq6Pey1a5TEqc/vAudRnqb4wbnrM36Ycym3+cLZp+usWvWF/bB -E8VYNfMxUGgwYOPxuSPLbwyh0XqmqJalA4ZUSCAWxqadEP6kuhFbPnkAywwA6lzo -8GxZzZYe+B5jhS4N8up1oWwCh+sgAuo56KEMBlBqQjGNA8fsCzkoWjB5zfXF46Eq -mNVQoAnPsP6rJwifBmmSf2FKRVaMxDQI4pSbZXB/UzgJgkt36j+qPve2ocU6FFXa -BEfI3ZCj+0uOAA9wM62+dviZwK3fPB2UNYWJmzWaalzvFeglR1gALq8rxCigUtGA -vrANhGgSPskDKRFpD2WeBQmRa+AAZ8OqP0iIVbhG9dYq1Vh4w7DAkd8X/jpfunjv -nF8C2KWhjaU+cBGzzUL7rHo2eg4lu5PimY06QC5c98jJvr6ESwPTiqpXPwE06ZT1 -zFI4iYYD7KiwCHTcViNkxmCz6IeSiSv5wSRVcwrW5Od2IKCWaI3jnZAVh6/1MzRo -7nV8nKDkkiJan8qGzrUOTnDA9REybEjQq3EtRbsWcjy/QxCE1BTtKGFDPTuUREha -3wUSYQl7O6/rEGXnkrJjeSclXHFb4GDsQfvTwnkV5X26x4xF7T769glLDoVosDap -nZCoUCMiI0MkCktk/f0oJxGpDDQAzGWw/YX56u7V2J7/CYDvztjiHc5bPIeNsE9p -F1fNnx6ntbAb/FUlOteHd+w0a4KhsEY1njU5U4W6Ol8jcE6K/9Z50i9PZP4564/x -O6mOdH0w9JRXsvakb/8rei9Oz/mwN/vNCMywSUY7/xBZP5gi+WrfAg9ki9Rl9ag8 -xm30OG/7rVfHuT4OmRCS/Qm9yvig+xarBgTsEkJjlmqfRcz9e/rBGfbO02f5MoI0 -QT1+eGs1TWoS8FDa2J1wOEzjoWoQhBwsfUMAVW+1lwfs1jhyEZb4Vic1YiDEwsUy -mb4mLK8FHgCqqTgCEejrFe0MHCMxNMv/DJJyHFUUXJpdOWlb+Ewn5xAblQiX/Lsa -lTaLJlup5Qm+3TtX8RhmG+qguQglABCUmhSud4aq1Eqo0ZcXjDvn5VbMJgBE7OHu -dnIClQ8XYUnYbDw4cJlX7N/9b95dSq/Zds5f4HWOa6wmiJyjZuTMVPTOxb6h3f8n -8gB2dVDfeu8urlVhyG/YuIpmwqcngZE/D3PpRtzG9TBRv4qIIAF6sCjptjh49IDr -miGFRrcbU+BUarzsqWknGbe9p33oh0nMPTmW2kRYEObnI6u9uxYs4OhpCGsTyZOW -s8ZC6o+rtiXnntcWM4zMqE21wouSijEtLujPn9JoAQo3QzRDLTY37nUmq5mLrLnP -qXW3WAhO9vsF9979KRPt/DbJpLtz24ku2frFXYoL0ym5HYDmY1Wv44WazkDBWlkO -cKH7KcAi25iA3W5fLEgVzHKezxGv4GmF+N3DfePlHYs+NL2aQxtsFFSsSM/6r9XP -aD/Aq2opZOPwrTDwYymOqFtoL2TqF1ZpSQjJhLDjtn9VLsAo1bc3XOBUNxIqx4Nw -fxugWjp4KaDgIzdAgpMo0uFoTNTP+DtzEULz4ECqgxhTxtwpIh4utEemB8CyWGKD -BZ+BGRGDv7p14UhObjiGCb/mQpDBeSXbSvINCuuJ7sAkOJgEGeDF ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_gnupg/private_private-keys-v1.d/encrypted_private_867A0A3901E5775AE72CF77E2F725DAD20C95ABC.key.age b/private_dot_gnupg/private_private-keys-v1.d/encrypted_private_867A0A3901E5775AE72CF77E2F725DAD20C95ABC.key.age deleted file mode 100644 index 92a35b1..0000000 --- a/private_dot_gnupg/private_private-keys-v1.d/encrypted_private_867A0A3901E5775AE72CF77E2F725DAD20C95ABC.key.age +++ /dev/null @@ -1,71 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBFWFI0N3JYbW1GS2R2SE5Y -UXNkVlpqZ01GS1c0cnBhVDBpY3VJbDNrRmo4Cm1xVklLbGRBYVZwcTU1LzROYzhQ -c2kxNGk1a25aWVJrQ1lnaHM2MlRTT28KLS0tIEFOTzQ4TXVMVmI1dWJZMG91Rm90 -RFNWcHo3ODBJTktja0tJSU1CMlExbHcKrsQ6Trp40E6GWhyU4nWzJn9je2uccNZG -8Q2cS9A4hsiBj6okNTyRMACsAVej8vco4riEj8vyoixIXIehBt9BVSWg0Fryv6XK -GuDRIofx2TuBlMEGKIhC46CDFU4E0GJYsgKDjxcR888ZMq/nH25piu/xltSF8hyY -mgLow7MybaLCmN9rYOnxowvVfSwfO1ZOJi+1oJ1AlusWqets8tW93ehbbNh891kS -Wh71E5dpjL9wkUCmN+Mv9P+zFP/TrcV+QwF1xNUeRtT6MlIqAU8Z+bV3hVwjnHhb -G/1Fk1KbN6gJDKwvBLdT/rcPDD0Co3dLzVXtZbOxmZ2Kl5RCF6dEZk84O1oLycFJ -5MHY17+QeorAA4sFi3/w4I5naO8JsnXpYUy5WTPaBKQcjhVmhbBjYc7pLpmp1I75 -9eCbT9NmPZvg8iuDnKywwyvWqBuZ7tIGp2MHhu3lku3Ca0kykuyXGoGndc98HyrU -8ySpK6F6LiBRw7559vBu0c5px0WgTHGKeZT1jNzWQLG2uLt95eWsFWQwqSLHgwd6 -Y7P7DqwFIAKWU1WK0vWDixb0qTj7qOujk57nD2OJiRuPdC85AKbfl7KV1Pi3dMBI -+VrHYJ0U5rBlsX6rVbGaO0XSrxulmYgEkgbOO0ObrMiYkfj9mnH/vQnRtRuT/LZi -eet+3fv/PHif6hjEY448V2Ku/9fY6eY8FnbhaU0iaWUgUmy8iOh1VBQLJBhZg+cM -goDtldaStUcy9QHwnHcq9KdAmingsJE2RfLe74oHhy6+7+cu10CEiNucSjZ3yNHz -/lTFZpNnUJNj7++P9NCs7bfiZvZR/ICWXb3/rCFFGsPnkxHdq9f1ksp1XqnbHDkU -pBNQnIxUwwKvVGILZCtmrYg2lHMPGIdqks255lbaISrManjh31IpKcs5ux8wBLZZ -5yzRfYkBDZKDZaVsEkjte8Jh1WSdsKMAbsQyv11um2AnmGYfJEXoOQLa8BR0i6UY -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 ------END AGE ENCRYPTED FILE----- diff --git a/private_dot_ssh/encrypted_private_cle_vps_hexasec.age b/private_dot_ssh/encrypted_private_cle_vps_hexasec.age index b575219..388566e 100644 --- a/private_dot_ssh/encrypted_private_cle_vps_hexasec.age +++ b/private_dot_ssh/encrypted_private_cle_vps_hexasec.age @@ -1,15 +1,15 @@ -----BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlK2NEdE40VStSV2dqUk5L -UHlTRGpkR3RpczJCZDlvdGRsZG5jbGZCUEIwCm5HN0xqRXR1eGFEOCtkMmlXUm0v -MlhvTUZJbGp3R0UrcThNTzBNTjR4U1kKLS0tIGxRbGxYcnNDeGtvejJ5b1V3TkhZ -SDVHQ2tqZHdlUjJUSmtnRFJNb1FCZG8KlvBk8VYZ/sV7yezdIccrtYt2RWMqfcQP -/0pZtKBtlMctg3INbfEHksRD+ZdZh0tMqWSb97rOKfOCfy7PApkcNOvRCAP8kmtI -TikPj0EfzaaKJ+OyUosAvg0suPw5HfgYkVUsJ6Ebi3bb9aWpp5FY2i/YzMsd1zUt -tdoJTQR/qBdvIaxlAWCvfoC7w9ZkverqW3VcoOisvTTOP8zr12u8V4uIJbhPz9c7 -dYFTAZSXNIBqOI2IiU2vQpc4gSthakoAfHKtn+H6KFV153gc2fYVZ1hyBoygcWvU -OE1VIAV1RlR6UGXSCTgoDjM2sBKAF6h0TktrxIBZ+1kzxDtgHsyt5CzDhp4yWpjV -kscfS4AhIZQBwZGqiWKcakIp6R849x6HHWU66ovP0ANnP4fUghnmv4EqWSioCnQL -yYLD4k8GOQ1FIusATAJ8CjK+UpMs7bs+JddFl30gWft4mKq0jPfvuvnE2KQVuEqN -FDCKyRUY5dwTR6Lwwo4qYcJfXUorhXZQ90VhNB1cpG/hZ9Ew8LQwYEWsGs1KZXJk -+Ehn23FNmMciVU1+QJ7DLlcrEoRXVpQ= +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBaelpiTFJaaGEwU3pmMS9G +Y1pNMHJhYnhSLy9oTlNvTVAxZm1rdmhub1dVCkFyYWFDSDk5Y3ptZ2ZrdXlzV2tV +WDMwSnFvVEZkcXlDQTZFNlh2R3pUTFEKLS0tIHdmRmpOQjM5VDJvWm95UHAyWklp +L1hKam51c2Iyd1lLdytnRkxISzlZVnMKGOxeIKO3HyRPT5RZiuBow5Fo8dTZTdwz +9Ygu/14aw2ys48r0Qe6XpfXVvEzAo2PT1AksIoI4qHrSVY5HBbKWDUFvM+iDW5re +2VtnF0xeuLpLTkrxlifoiy7tMa9ZQRrTdWOQLQQn4BIKCrU+A5Y3YsABPEWw71Du +0cwYESkOWxBEwBOOkHWXR6IVDnLNeB/9zYekIzV5kE9321PnRRyGSUYdH4Ye+Wys +rmKkBA0OG/RnsYyOM3zg66+yDgvdaNUREwknsQNYAZZFLU5RhekihTy2cKRkNCtH +RKsC/6Lt4uRxgoD5iNVf0Tl9XjEb6uiJpccVGiTj7bYZvG63d4pcl4dOHQQ/mxCI +W5WDfqtTEKcK0CbhpeQ0pUyiXIAOIIoUaol6BJQY2SuZflk0JtwAVmiX3GfnvUAE +J3XtzdXyxvJ2hbHtn1i1D9JV4869cJbEZXM274lGmI5mkeYWfLKJ/ABhH10ztLV6 +aV2S5uuV5BN4qHbEk89C0ONh15QXlaP/KyEeGr84Y2EMxhBelCpHNX+FFrD1NzDn +ocYAfLQtrkPtzw5+gm1z6BhGsD9XvYY= -----END AGE ENCRYPTED FILE----- diff --git a/scripts/shells.sh b/scripts/shells.sh index 7c0ff96..aa656cc 100644 --- a/scripts/shells.sh +++ b/scripts/shells.sh @@ -61,6 +61,10 @@ check_installation "yay -S --noconfirm --needed" "topgrade" echo -e "${BLUE}Installing TLDR (tealdeer)...${DEFAULT}" check_installation "sudo pacman -S --noconfirm --needed" "tealdeer" +# Delta - A viewer for git and diff output +echo -e "${BLUE}Installing Delta...${DEFAULT}" +check_installation "yay -S --noconfirm --needed" "git-delta" + # Changing the default shell to Fish echo -e "${GREEN}Setting Fish as default shell...${DEFAULT}" chsh -s $(which fish) diff --git a/utils/helpers.sh b/utils/helpers.sh index e5f257a..bbbe9de 100644 --- a/utils/helpers.sh +++ b/utils/helpers.sh @@ -68,26 +68,6 @@ function setup_final() { systemctl --user enable --now pipewire.service systemctl --user enable --now pipewire-pulse.service - # Configure git if necessary - if [ -z "$(git config --global user.name)" ]; then - echo -e "${BLUE}Configuring Git...${DEFAULT}" - read -p "Enter your Git name: " git_name - read -p "Enter your Git email: " git_email - git config --global user.name "$git_name" - git config --global user.email "$git_email" - - # Update chezmoi config with git information - chezmoi cd - chezmoi add-template ~/.config/chezmoi/chezmoi.toml </dev/null 2>&1 diff --git a/utils/packages b/utils/packages index 5d1a2f2..faaecde 100644 --- a/utils/packages +++ b/utils/packages @@ -63,3 +63,4 @@ fd sd topgrade tealdeer +git-delta