mirror of
https://github.com/shokinn/.files.git
synced 2025-10-15 18:58:32 +00:00
Compare commits
5 commits
70829ef446
...
ff420ab52f
Author | SHA1 | Date | |
---|---|---|---|
ff420ab52f | |||
78e02218be | |||
5d48c8c0b2 | |||
641b71513d | |||
d99efa3a28 |
6 changed files with 1811 additions and 2528 deletions
|
@ -3,7 +3,8 @@ config:
|
||||||
create: true
|
create: true
|
||||||
dotpath: dotfiles
|
dotpath: dotfiles
|
||||||
variables:
|
variables:
|
||||||
ageidentity: ${{HOME}}/.age/phg-age-dotfiles
|
ageidentity: "{{@@ env['HOME'] @@}}/.age/phg-age-dotfiles"
|
||||||
|
ageidentity_pub: "{{@@ ageidentity@@}}.pub"
|
||||||
SHELL_ERR_MESSAGE: \033[41;30m
|
SHELL_ERR_MESSAGE: \033[41;30m
|
||||||
SHELL_RESET_COLOR: \033[0m
|
SHELL_RESET_COLOR: \033[0m
|
||||||
trans_install:
|
trans_install:
|
||||||
|
@ -11,7 +12,7 @@ trans_install:
|
||||||
[[ -f {{@@ ageidentity @@}} ]] && age --decrypt -i {{@@ ageidentity @@}} -o {1} {0} || ([[ ! -f {{@@ _dotfile_abs_dst @@}} ]] && (echo "{{@@ SHELL_ERR_MESSAGE @@}}Missing age identity file {{@@ ageidentity @@}}, cannot decrypt {0}, creating empty file instead{{@@ SHELL_RESET_COLOR @@}}"; echo "" > {1}) || (echo "{{@@ SHELL_ERR_MESSAGE @@}}Missing age identity file {{@@ ageidentity @@}}, cannot decrypt {0}{{@@ SHELL_RESET_COLOR @@}}"; cp {{@@ _dotfile_abs_dst @@}} {1}))
|
[[ -f {{@@ ageidentity @@}} ]] && age --decrypt -i {{@@ ageidentity @@}} -o {1} {0} || ([[ ! -f {{@@ _dotfile_abs_dst @@}} ]] && (echo "{{@@ SHELL_ERR_MESSAGE @@}}Missing age identity file {{@@ ageidentity @@}}, cannot decrypt {0}, creating empty file instead{{@@ SHELL_RESET_COLOR @@}}"; echo "" > {1}) || (echo "{{@@ SHELL_ERR_MESSAGE @@}}Missing age identity file {{@@ ageidentity @@}}, cannot decrypt {0}{{@@ SHELL_RESET_COLOR @@}}"; cp {{@@ _dotfile_abs_dst @@}} {1}))
|
||||||
trans_update:
|
trans_update:
|
||||||
_encrypt: |
|
_encrypt: |
|
||||||
[[ -f {{@@ ageidentity @@}}.pub ]] && cat {0} | age -a -R {{@@ ageidentity @@}}.pub > {1} || echo "{{@@ SHELL_ERR_MESSAGE @@}}Missing age identity file {{@@ ageidentity @@}}.pub, cannot encrypt {0}{{@@ SHELL_RESET_COLOR @@}}"
|
[[ -f {{@@ ageidentity_pub @@}} ]] && cat {0} | age -a -R {{@@ ageidentity_pub @@}} > {1} || echo "{{@@ SHELL_ERR_MESSAGE @@}}Missing age identity file {{@@ ageidentity_pub @@}}, cannot encrypt {0}{{@@ SHELL_RESET_COLOR @@}}"
|
||||||
actions:
|
actions:
|
||||||
oh-my-zsh: |
|
oh-my-zsh: |
|
||||||
[[ ! -d ${{HOME}}/.oh-my-zsh ]] && sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" "" --unattended || echo "do nothing" >/dev/null
|
[[ ! -d ${{HOME}}/.oh-my-zsh ]] && sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" "" --unattended || echo "do nothing" >/dev/null
|
||||||
|
|
File diff suppressed because it is too large
Load diff
1707
config/Firefox/sidebery-data.json.age
Normal file
1707
config/Firefox/sidebery-data.json.age
Normal file
File diff suppressed because it is too large
Load diff
|
@ -148,6 +148,61 @@ zi () {
|
||||||
__zoxide_zi "$@"
|
__zoxide_zi "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#######################################
|
||||||
|
# Runs dotdrop installed by uv with the cfg option set to my dotdrop config file in my .files repo
|
||||||
|
# Globals:
|
||||||
|
# None
|
||||||
|
# Arguments:
|
||||||
|
# n arguments for using / configuring dotdrop
|
||||||
|
# Outputs:
|
||||||
|
# None
|
||||||
|
# Returns:
|
||||||
|
# None
|
||||||
|
#######################################
|
||||||
|
dotdrop() {
|
||||||
|
{{@@ env['HOME'] @@}}/.local/bin/dotdrop --cfg={{@@ env['HOME'] @@}}/.files/config.yaml ${@}
|
||||||
|
}
|
||||||
|
|
||||||
|
#######################################
|
||||||
|
# Age encryption for my dotfiles.
|
||||||
|
# Globals:
|
||||||
|
# None
|
||||||
|
# Arguments:
|
||||||
|
# - source file (unencrypted)
|
||||||
|
# - target file (encrypted)
|
||||||
|
# Outputs:
|
||||||
|
# age encrypted file
|
||||||
|
# Returns:
|
||||||
|
# None
|
||||||
|
#######################################
|
||||||
|
adenc() {
|
||||||
|
if [ -z "${1}" ] || [ -z "${2}" ]; then
|
||||||
|
echo "Usage: adencrypt <source file> <target file>"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
age -a -R {{@@ ageidentity_pub @@}} -o "${2}" "${1}"
|
||||||
|
}
|
||||||
|
|
||||||
|
#######################################
|
||||||
|
# Age decryption for my dotfiles.
|
||||||
|
# Globals:
|
||||||
|
# None
|
||||||
|
# Arguments:
|
||||||
|
# - source file (encrypted)
|
||||||
|
# - target file (unencrypted)
|
||||||
|
# Outputs:
|
||||||
|
# age decrypted file
|
||||||
|
# Returns:
|
||||||
|
# None
|
||||||
|
#######################################
|
||||||
|
addec() {
|
||||||
|
if [ -z "${1}" ] || [ -z "${2}" ]; then
|
||||||
|
echo "Usage: addecrypt <source file> <target file>"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
age -d -i {{@@ ageidentity @@}} -o "${2}" "${1}"
|
||||||
|
}
|
||||||
|
|
||||||
{%@@ if distro == 'macos' @@%}
|
{%@@ if distro == 'macos' @@%}
|
||||||
#######################################
|
#######################################
|
||||||
# Shows a netstat -tulpn styled output on mac.
|
# Shows a netstat -tulpn styled output on mac.
|
||||||
|
@ -360,21 +415,6 @@ confv6() {
|
||||||
return 5
|
return 5
|
||||||
}
|
}
|
||||||
|
|
||||||
#######################################
|
|
||||||
# Runs dotdrop installed by uv with the cfg option set to my dotdrop config file in my .files repo
|
|
||||||
# Globals:
|
|
||||||
# None
|
|
||||||
# Arguments:
|
|
||||||
# n arguments for using / configuring dotdrop
|
|
||||||
# Outputs:
|
|
||||||
# None
|
|
||||||
# Returns:
|
|
||||||
# None
|
|
||||||
#######################################
|
|
||||||
dotdrop() {
|
|
||||||
{{@@ env['HOME'] @@}}/.local/bin/dotdrop --cfg={{@@ env['HOME'] @@}}/.files/config.yaml ${@}
|
|
||||||
}
|
|
||||||
|
|
||||||
{%@@ endif @@%}{%@@ if vw == true @@%}
|
{%@@ endif @@%}{%@@ if vw == true @@%}
|
||||||
setProxyEnv() {
|
setProxyEnv() {
|
||||||
local HIGHLIGHT='\033[36;1m'
|
local HIGHLIGHT='\033[36;1m'
|
||||||
|
|
|
@ -1,39 +1,46 @@
|
||||||
-----BEGIN AGE ENCRYPTED FILE-----
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBkLzR6VlpqZkhDRnNlcjBv
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBNU3JSVU80TzFUYzRvaWFl
|
||||||
M2ludFRKQ0xFTjIrZjVUVzAvVzdsUmgvK3lvCjlqTldLTStJMDZRTEgxKy9yKzQx
|
R3ZFb0g0V3V4eDFPRTUzNmF0Ump0TGtWU1JRCmtCZzZ2Q2pxZWt1YjBTaXFzUUlB
|
||||||
aGJYZ2phRzMyaEx3eCt2SkZoNFVNVHMKLS0tIFJDbktibkIyQmdSVHMybmR5SHdU
|
S1hqN3h0V3FuOEtwQmNMTndGVk40KzQKLS0tIEZPQ21YaXhBdzRhQzljMzV1MGd6
|
||||||
THpNOTB1VEdLRHYxYkhlNElObjFKdXcKSbYUfFsU633qN8RnrgYXDQHIsDtJyp4u
|
K1RDNzVrUnpOTkwxZmR2Q0lxUFVmSTQK+LcZvZj7WY7JX+fQW0aoG9rapBKgMlxP
|
||||||
3HCT6BX6JVCmh+Z3olaQKcK6VJZzjt1CzlUKPyNiYPtDqv45Nee4mQB90Lur6L8v
|
4E2Xx+bBMR4JiGln3w+aTCAAjg3T7yydYglqzN6h8hXZvh2KVP0Vz5ydZLgvCoE4
|
||||||
HiFsONNBljGJRBEiJIEEBj/rjus1BnJmAKS5gVVtcnZ/GZ3b3QuUEjZmKzGpHwSE
|
LKDSWPakIy1ntfUFeBGGAYn5z0kUe9yOcZ8h6XHufTZNo5lFqlQw2muSbcS0PVam
|
||||||
Z9kmJ0qPN8fedZUpBoH4FRZy1rPwOU9X1CilsQIcWsyPi31FWPPuvuutG/A7vodg
|
SZmFJ0dtiRll+VxwjyA/LBfdzR75QNlalQa9fIvOvO+oV1ovVtbeKWxxCNREADRl
|
||||||
9WIqnDZJ45mSofO0NQgHHkTCDFpxI0RYC0kZys5hXYfJpawZY4NwiglE6Tz0RwPV
|
4IXHTQvPunrj5VlMeHcPonapdFzO60oYC0qJZ8Xjvx1K56zCOLmcksKGHALvpEpL
|
||||||
V2y7E282KiQJPGV0Ilbc36kch28EdwQTXVWt/kj2vYJCBQSVh1r3xNWtIUooTtDW
|
7X5yRJhqQpXI41XeK4s6yM4nO151aW6tpKI6Amo8lx1dvvawEtLGMqBDowcmssQc
|
||||||
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
|
||||||
PLOFm5sHnL7o22HSaV9VuPHO03YJyQ==
|
oTIrS82QiZa2jlYRd8N5OYr73ErjpiqU75Ntt/7zUg6aIBX4TB6cEPorVt0HWF+U
|
||||||
|
Y5dK/ytfr5SxRYY/f0cwc/WTtXWjJD6XiHUKohbA5uVcyBWfS1inhW9m38qMwPMy
|
||||||
|
bzt8AbzUWmj3EYNlAbSmpPo0INOFcLfMX+5jA5RXtHF0AYeFvzZpSx2h9yKXPMOU
|
||||||
|
khON8+iTjw9AYV8KosTUHKnlvyibGFfztMLUlAIjJusqqreFrhUKjI1gqOJmma4o
|
||||||
|
dMR+weH6zFYiI1NbEuNMU4F7RriPdQXZ9+mCzwjZ93zAt6f3qXk42PHJniCF0H03
|
||||||
|
8QV4JMiIxHyJlmlRMgE3u3a1D9ZQA+VIGuc5ufYBnpObhZOTjHCuwsn9AtSakB3X
|
||||||
|
fSsjj9yc+yGP3ZGj0ZxY9zxAiTafr6FBLAk+35QxnFlxJ7pAwuAPC5pys8iHiJd5
|
||||||
|
/++FTbZxRj5M1tFNasTYwcUXUw==
|
||||||
-----END AGE ENCRYPTED FILE-----
|
-----END AGE ENCRYPTED FILE-----
|
||||||
|
|
|
@ -184,8 +184,8 @@ alias agenix='RULES='\''./secrets/secrets.nix'\'' agenix'
|
||||||
alias agenix-edit="agenix -i {{@@ env['HOME'] @@}}/.ssh/identities/agenix-phg -e"
|
alias agenix-edit="agenix -i {{@@ env['HOME'] @@}}/.ssh/identities/agenix-phg -e"
|
||||||
alias ane='agenix-edit'
|
alias ane='agenix-edit'
|
||||||
alias cane="EDITOR='code -w' agenix-edit"
|
alias cane="EDITOR='code -w' agenix-edit"
|
||||||
alias ade='age-edit -t /tmp/ -M -a {{@@ env['HOME'] @@}}/.age/phg-age-dotfiles'
|
alias ade='age-edit -t /tmp/ -M -a {{@@ ageidentity @@}}'
|
||||||
alias cade='age-edit -e "${HOME}/.local/bin/codew" -t /tmp/ -M -a {{@@ env['HOME'] @@}}/.age/phg-age-dotfiles'
|
alias cade='age-edit -e "${HOME}/.local/bin/codew" -t /tmp/ -M -a {{@@ ageidentity @@}}'
|
||||||
alias du="duf"
|
alias du="duf"
|
||||||
alias ssh-no-check="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
|
alias ssh-no-check="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
|
||||||
alias ssh-strongbox-keys="SSH_AUTH_SOCK=~/Library/Group\ Containers/group.strongbox.mac.mcguill/agent.sock ssh-add -l"
|
alias ssh-strongbox-keys="SSH_AUTH_SOCK=~/Library/Group\ Containers/group.strongbox.mac.mcguill/agent.sock ssh-add -l"
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue