From 00149ec2720ac14b6f7b1e6ab198ff572fbe6243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Dudr?= Date: Fri, 8 Jul 2022 14:11:10 +0200 Subject: [PATCH] sync --- dot_config/containers/containers.conf.tmpl | 6 +- .../herbstluftwm/executable_panel-generator | 9 ++- dot_config/jesseduffield/lazygit/config.yml | 4 +- dot_config/nginx/nginx.conf.tmpl | 3 +- dot_config/nginx/ssl/localhost.crt | 70 +++++++++---------- dot_config/nginx/ssl/localhost.key | 52 +++++++------- 6 files changed, 74 insertions(+), 70 deletions(-) diff --git a/dot_config/containers/containers.conf.tmpl b/dot_config/containers/containers.conf.tmpl index a359a31..0b6d1a9 100644 --- a/dot_config/containers/containers.conf.tmpl +++ b/dot_config/containers/containers.conf.tmpl @@ -261,7 +261,7 @@ default_sysctls = [ # Before changing this value all containers must be stopped otherwise it is likely that # iptables rules and network interfaces might leak on the host. A reboot will fix this. # -#network_backend = "" +network_backend = "netavark" # Path to directory where CNI plugin binaries are located. # @@ -483,7 +483,7 @@ runtime = "crun" # Default location for storing temporary container image content. Can be overridden with the TMPDIR environment # variable. If you specify "storage", then the location of the # container/storage tmp directory will be used. -image_copy_tmp_dir="{{.chezmoi.homeDir}}/.local/tmp" +image_copy_tmp_dir="{{ .chezmoi.homeDir }}/.local/tmp" # Number of seconds to wait without a connection # before the `podman system service` times out and exits @@ -509,7 +509,7 @@ image_copy_tmp_dir="{{.chezmoi.homeDir}}/.local/tmp" # Examples: # rootless "unix://run/user/$UID/podman/podman.sock" (Default) # rootfull "unix://run/podman/podman.sock (Default) -# remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock +# remote rootless ssh://engineering.lab.company.com/run/user/{{ .chezmoi.uid }}/podman/podman.sock # remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock # # uri = "ssh://user@production.example.com/run/user/1001/podman/podman.sock" diff --git a/dot_config/herbstluftwm/executable_panel-generator b/dot_config/herbstluftwm/executable_panel-generator index 716e170..b90a1ae 100644 --- a/dot_config/herbstluftwm/executable_panel-generator +++ b/dot_config/herbstluftwm/executable_panel-generator @@ -48,10 +48,13 @@ while : do # shellcheck source=/sys/class/power_supply/BAT0/uevent # most likely #. /sys/class/power_supply/$batt_name/uevent - read -r batt_perc < /sys/devices/platform/smapi/BAT0/remaining_percent - read -r ac < /sys/devices/platform/smapi/BAT0/state + if [[ -e /sys/devices/platform/smapi/BAT0/ ]] + then + read -r batt_perc < /sys/devices/platform/smapi/BAT0/remaining_percent + read -r ac < /sys/devices/platform/smapi/BAT0/state + fi + [[ -e "/sys/devices/platform/coretemp.0/hwmon/" ]] && read -r temp < /sys/devices/platform/coretemp.0/hwmon/hwmon?/temp1_input read -r load _ < /proc/loadavg - read -r temp < /sys/devices/platform/coretemp.0/hwmon/hwmon?/temp1_input update ac "$ac" diff --git a/dot_config/jesseduffield/lazygit/config.yml b/dot_config/jesseduffield/lazygit/config.yml index 9ce7909..460a282 100644 --- a/dot_config/jesseduffield/lazygit/config.yml +++ b/dot_config/jesseduffield/lazygit/config.yml @@ -1,11 +1,11 @@ reporting: "off" startuppopupversion: 1 git: - pull: + pull: mode: rebase customCommands: - key: '' context: files command: | - php-cs-fixer fix --rules '{"@Symfony":true,"array_syntax":{"syntax":"short"},"binary_operator_spaces":{"default":"align_single_space_minimal"},"fully_qualified_strict_types":false}' {{.SelectedFile.Name}} + php-cs-fixer fix --rules '{ "@Symfony":true, "nullable_type_declaration_for_default_null_value":true, "array_syntax":{"syntax":"short"}, "binary_operator_spaces":{ "default":"single_space", "operators": { "=":"align_single_space_minimal", "??=":"align_single_space_minimal", "^=":"align_single_space_minimal", "|=":"align_single_space_minimal", "+=":"align_single_space_minimal", "%=":"align_single_space_minimal", "&=":"align_single_space_minimal", "**=":"align_single_space_minimal", "*=":"align_single_space_minimal", "-=":"align_single_space_minimal", ".=":"align_single_space_minimal", "/=":"align_single_space_minimal", "<<=":"align_single_space_minimal", "<=":"align_single_space_minimal", ">=":"align_single_space_minimal", ">>=":"align_single_space_minimal" } }, "fully_qualified_strict_types":false }' {{.SelectedFile.Name}} diff --git a/dot_config/nginx/nginx.conf.tmpl b/dot_config/nginx/nginx.conf.tmpl index 95587fa..03358a0 100644 --- a/dot_config/nginx/nginx.conf.tmpl +++ b/dot_config/nginx/nginx.conf.tmpl @@ -56,7 +56,8 @@ http { add_header "Access-Control-Allow-Origin" "*"; access_log off; - client_body_temp_path /tmp/nginx; + client_body_temp_path /run/user/{{ .chezmoi.uid }}/nginx/body; + fastcgi_temp_path /run/user/{{ .chezmoi.uid }}/nginx/fastcgi; server { diff --git a/dot_config/nginx/ssl/localhost.crt b/dot_config/nginx/ssl/localhost.crt index 7604a09..695b2cf 100644 --- a/dot_config/nginx/ssl/localhost.crt +++ b/dot_config/nginx/ssl/localhost.crt @@ -1,37 +1,37 @@ -----BEGIN CERTIFICATE----- -MIIGcjCCBNqgAwIBAgIQTHRR9StwfbGRzpCJIS27+zANBgkqhkiG9w0BAQsFADBT -MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExFDASBgNVBAsMC3ZsYWRp -bWlyQHdzMRswGQYDVQQDDBJta2NlcnQgdmxhZGltaXJAd3MwHhcNMjIwNTEzMTIw -NzEwWhcNMjQwODEzMTIwNzEwWjA/MScwJQYDVQQKEx5ta2NlcnQgZGV2ZWxvcG1l -bnQgY2VydGlmaWNhdGUxFDASBgNVBAsMC3ZsYWRpbWlyQHdzMIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEArS7apG3j0iufJaEaDRElRkAeWc+HEda0YZXZ -d3n2Lua8k6d03CsuZrQr1tC7IVaBWNfQpTviSd5f6qR22K1spatENX3s33L3POIv -ZmS6b5s5z3zplXKkjIkHszFontvDQLXzoC50rX4vXWbHrJl34r5fN7LwqgCIPq78 -OwKuBMOZmAhm/fT/FkT74elQnhlKtqp+EmyYwfywGlGQMW54LOOdxGxCGmmjejJj -4MF4mU5Y/NF0PnslDRJJjZu/nA4NfvGDqnRmXIkdmwHt/ifR714se5qm9H4emwxl -DBzGvBMElppM2pKhyeMOyQA2EIklzDT+rAEM3hDNvWbVQKe0RQIDAQABo4IC1DCC -AtAwDgYDVR0PAQH/BAQDAgWgMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB8GA1UdIwQY -MBaAFFFEv3spV2s0q4mVQ9mDZ31GSQ1zMIIChgYDVR0RBIICfTCCAnmCCWxvY2Fs -aG9zdIIQZGppbm4xLmxvY2FsaG9zdIIQKi5nZHByLmxvY2FsaG9zdIIRKi51cDEy -My5sb2NhbGhvc3SCESouY2F2ZXMubG9jYWxob3N0gg8qLmVuby5sb2NhbGhvc3SC -EyouYWRtaW5lci5sb2NhbGhvc3SCFyoubGF5YS1zZXJ2ZXIubG9jYWxob3N0ghEq -LmVzaG9wLmxvY2FsaG9zdIIWKi50ZWFzdGFydGVyLmxvY2FsaG9zdIISKi5haWtp -ZG8ubG9jYWxob3N0ghYqLnRyYWlsZ3VpZGUubG9jYWxob3N0ghMqLm15dGFuZ28u -bG9jYWxob3N0ghUqLmludm9pY2luZy5sb2NhbGhvc3SCEyoubGF5YXdlYi5sb2Nh -bGhvc3SCESouYXNxaXgubG9jYWxob3N0ghUqLnN0YXRpc3RpeC5sb2NhbGhvc3SC -EyouYm9va2luZy5sb2NhbGhvc3SCEioua290bWVsLmxvY2FsaG9zdIIZKi5iYXRl -cmllLWdyb2hlLmxvY2FsaG9zdIIVKi56ZHJhdm90bmlyZWdpc3RyLmN6ghQqLmth -dGFsb2d5LmxvY2FsaG9zdIIWKi52aXppdC1jb3JlLmxvY2FsaG9zdIIRKi52aXpp -dC5sb2NhbGhvc3SCHSoudml6aXRwcmVzZW50YXRpb24ubG9jYWxob3N0ghgqLmJv -b2tpbmctY29yZS5sb2NhbGhvc3SCFCoubmljZXJpY2UubG9jYWxob3N0ghsqLmpv -cGl4ZWwtc3VwcG9ydC5sb2NhbGhvc3SCGSouZW5vLXN0YXRpc3RpeC5sb2NhbGhv -c3QwDQYJKoZIhvcNAQELBQADggGBAI8U9qnAjV5QL8GL+Ow165aTjTFxAMMEq0Yc -yuxz+B7K8C/9zpmgbVPFyYe0hLUSEEm0nLnq3eYvuD29t4f8WdvJCeM6caPKsrV5 -aApwj8BdsfeuACCFVdnWC8dsaPCGwL2ZKvLKYzIWJaJedQE9dphjllBz0NKwgI+e -AZRO0dyREe9nKujPXrz0gZvPezhPc4kzWLjSTQX7jIA8kCXfnYwKvU0U6DVrR62B -VI6UeJCJA0urxAdonB7ucvq/HNZE59rKsI0mN9ZuN8xoN3U8w98S6UnW9kLLJJhD -kIKodWdSdyIvl4VVjL+amOaKpjXHCniYWHxr9mXgUhxW3cezPguSi5E2F9H+6Fzj -BZQTZO0SHCnje4cb+CU2vGawFAhDZRxRjoUSQ9SsoAjm1JIHRn5B3rgm35FpE1x8 -q+p++cGiOadtmNy6cy/L2XtCaVA9N85T6YFfp0+l2qe2OR17zwRUFruI2xsvEvOF -rnoBhBOegiaChCyP4an7viITJu7l3g== +MIIGhTCCBO2gAwIBAgIRAPFbKVHRoQ7QpkDpWdtgRiMwDQYJKoZIhvcNAQELBQAw +UzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRQwEgYDVQQLDAt2bGFk +aW1pckB3czEbMBkGA1UEAwwSbWtjZXJ0IHZsYWRpbWlyQHdzMB4XDTIyMDYwNzEy +NDgwOFoXDTI0MDkwNzEyNDgwOFowPzEnMCUGA1UEChMebWtjZXJ0IGRldmVsb3Bt +ZW50IGNlcnRpZmljYXRlMRQwEgYDVQQLDAt2bGFkaW1pckB3czCCASIwDQYJKoZI +hvcNAQEBBQADggEPADCCAQoCggEBANVyWrumPF8yB7sIfp9fs+6gYBKUIHSyQOBu +nq7tWHbbmACFo2Sn0r+V5pTMi+Q2GXZUFvvKUfI+/bXLwQbQ3Du+J3OP3vgKfPzM +FqtS18wl7ofX2R2FhD+NCthj4SWpI1cJhtQxM5R/3cqIK34jbfvi/b8+ZQXfEQDN +HxbAyzhzskX9vp2cCOZz+yArqB6qWpxE1lnuxBiPYRfd9A0vqBTQIy8Uu6R/dpU3 +cXQTpMTqfav8iG5sq7zr7EjXaPuM/1c5LICbz71MWz66guAsGD5bDSKrUfj4X7Fv +/HU24kmw7QMJ7JKzBymEv4vk4uG0l4Vqp/bQ+6tCB0PtfCVUkH0CAwEAAaOCAuYw +ggLiMA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAfBgNVHSME +GDAWgBRRRL97KVdrNKuJlUPZg2d9RkkNczCCApgGA1UdEQSCAo8wggKLgglsb2Nh +bGhvc3SCEGRqaW5uMS5sb2NhbGhvc3SCECouZ2Rwci5sb2NhbGhvc3SCESoudXAx +MjMubG9jYWxob3N0ghEqLmNhdmVzLmxvY2FsaG9zdIIPKi5lbm8ubG9jYWxob3N0 +ghMqLmFkbWluZXIubG9jYWxob3N0ghcqLmxheWEtc2VydmVyLmxvY2FsaG9zdIIR +Ki5lc2hvcC5sb2NhbGhvc3SCFioudGVhc3RhcnRlci5sb2NhbGhvc3SCEiouYWlr +aWRvLmxvY2FsaG9zdIIWKi50cmFpbGd1aWRlLmxvY2FsaG9zdIITKi5teXRhbmdv +LmxvY2FsaG9zdIIVKi5pbnZvaWNpbmcubG9jYWxob3N0ghMqLmxheWF3ZWIubG9j +YWxob3N0ghEqLmFzcWl4LmxvY2FsaG9zdIIQKi5lbml4LmxvY2FsaG9zdIIVKi5z +dGF0aXN0aXgubG9jYWxob3N0ghMqLmJvb2tpbmcubG9jYWxob3N0ghIqLmtvdG1l +bC5sb2NhbGhvc3SCGSouYmF0ZXJpZS1ncm9oZS5sb2NhbGhvc3SCFSouemRyYXZv +dG5pcmVnaXN0ci5jeoIUKi5rYXRhbG9neS5sb2NhbGhvc3SCFioudml6aXQtY29y +ZS5sb2NhbGhvc3SCESoudml6aXQubG9jYWxob3N0gh0qLnZpeml0cHJlc2VudGF0 +aW9uLmxvY2FsaG9zdIIYKi5ib29raW5nLWNvcmUubG9jYWxob3N0ghQqLm5pY2Vy +aWNlLmxvY2FsaG9zdIIbKi5qb3BpeGVsLXN1cHBvcnQubG9jYWxob3N0ghkqLmVu +by1zdGF0aXN0aXgubG9jYWxob3N0MA0GCSqGSIb3DQEBCwUAA4IBgQC0mdvttXhK +/NwV7Q4REYstJ1PoDioBjrBRHcq+qYFQAXeGNE2kK/RzlKra9kY63YLk1GIVPrxS +WWXdX5r8W0kF3dUfovDv7mcs6CIZpwipYOusRqJkxmIhTcbSfSjLg9iQgNThjrVf +KVJM06lXrFreayBiZ6AC/f1PWt+a7MI0Q1/mHHE4a4pasFFh2NPGBcRUyvm/m1Qw +c32BYXqGk1M+MFIJTBUTg6nas6ps2JAgODHoKCvE7ikfX/jyBMYdcOgSUuo+097Y +oyGEbOo4eObprS9NkBxHelDdG4ZuXNnQ3pe8CwZ0wS6s9dup+/2YYIwl84FNNpBD +l/t4mEHe64lI6/va1Be78nOxa9enJpdZvRabPQ2fu6o6yTv20E144gOndbWBPaCA +V5dK1UeYynBZpLjk8vpFGGabjw2o1qB0N7Peh8R+Mz/Agr45q5zRxRzkIXwkhFrI +ufCFG8ayYvHLT5YbnwRhpM9dPNp7OYV06DJ/ojR5YyS65qqOFzdkiv0= -----END CERTIFICATE----- diff --git a/dot_config/nginx/ssl/localhost.key b/dot_config/nginx/ssl/localhost.key index c4b5a41..232f9e7 100644 --- a/dot_config/nginx/ssl/localhost.key +++ b/dot_config/nginx/ssl/localhost.key @@ -1,28 +1,28 @@ -----BEGIN PRIVATE KEY----- -MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCtLtqkbePSK58l -oRoNESVGQB5Zz4cR1rRhldl3efYu5ryTp3TcKy5mtCvW0LshVoFY19ClO+JJ3l/q -pHbYrWylq0Q1fezfcvc84i9mZLpvmznPfOmVcqSMiQezMWie28NAtfOgLnStfi9d -ZsesmXfivl83svCqAIg+rvw7Aq4Ew5mYCGb99P8WRPvh6VCeGUq2qn4SbJjB/LAa -UZAxbngs453EbEIaaaN6MmPgwXiZTlj80XQ+eyUNEkmNm7+cDg1+8YOqdGZciR2b -Ae3+J9HvXix7mqb0fh6bDGUMHMa8EwSWmkzakqHJ4w7JADYQiSXMNP6sAQzeEM29 -ZtVAp7RFAgMBAAECggEAaTLm+a8PDuIUoIUGEB30KIJWbXPUto9Xr1eZbCwX0VG0 -B3VXVU6dtyGG58yPf6bOl6sxQM3pnbmJRj11PBXMw64PlvbRZsKtULyM0oQphBYk -vddBBNlI/11V4hIHXUhdiPd98DWIBsN5/iCq9jubSY8ew/TcoEgGex1MdoQgNR+j -8D9r+zNoif5/2qsD+/xBR1nimv0L7ho/4kQuNk0hvCWzoz4yakxyExAYH0Au15nX -SdV31QJWAqf5j1OecYoxAAtYBB4/18qvZJsOKkHykMl0Z19nNamHXZBG6dwJKzms -9c7Um+CymwKul+N0t84Ox/X2gnl9R4oOKekWDSiQQQKBgQDfexR3cxzrixzse7vF -i9i2mDzhHcDxWd1mpQVPkQEht9irN//XkfK5TS5pE99Nw/9uX3KinQY/51oX2bRO -8bgBBb7mVPRq38sIw6KJCGmDjvB3bBI40XiZ3BmyTsquOiKSXPzV34sZpsu5eW5V -Dqr9bUB9BzDllCvoCO461hKpTQKBgQDGYh+566P6TRUKIaX++1ukn0ak79ZFCagG -sWW23lGie9ZIXVB76wbAM020ZyZ40wO82B1va5stD2fWMA603Duqyrwcs2jvgB8f -ouWBPvKvID0cQ/6bZqc9eb6sCbw0usRYJWYYWBjDNb6K9q/AWEoSQzjIba13/EGJ -ofS5zwX62QKBgHAy8/CQm5lqK2hTKs+gSXpK7m27KW5CxtRMz2DGFUJfcelsYQdS -oAEGTeG1d2wsleZNB1m66jNVLLdCtrLXyqDAyLoNNvUdTGsnBUg1L/w73GCoonFi -QWFFzqTlx/4287p18v5RkB2dzzRcUddkWNaJblIXNSZeALkrGqfxaEcVAoGBAKl2 -gqGAIDgdhn58Fd+Felha0q7sTX317Lmi6j9XFCcXYAm65JimQMMIUDVt89g8cTHs -7uAR7KGGSm4V6Uon4zRXMG/X9ii4ql2M+j34trhQcsNldeXrv6rtB6rQOhxU+opN -kDP1dVmz3Eu6xJErGkMVdzkHL6qSKq3WUkYzCWmpAoGAPuxKxa/MLBR1TaBRUNGj -WxHsFdIrkjp8CMDM3RCRHgCKeWdm6sTMsZuDbVZw59KH+447fHdSwENn5WQSw/RR -Qc9dpjUrC3nj8U2jlDhpDXFGvtvWhcbm/uyo/9TWT8P2cOCWxXWe1mkMDz+cB6uE -G66R3gQvbws786udZMgD5f0= +MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDVclq7pjxfMge7 +CH6fX7PuoGASlCB0skDgbp6u7Vh225gAhaNkp9K/leaUzIvkNhl2VBb7ylHyPv21 +y8EG0Nw7vidzj974Cnz8zBarUtfMJe6H19kdhYQ/jQrYY+ElqSNXCYbUMTOUf93K +iCt+I2374v2/PmUF3xEAzR8WwMs4c7JF/b6dnAjmc/sgK6geqlqcRNZZ7sQYj2EX +3fQNL6gU0CMvFLukf3aVN3F0E6TE6n2r/IhubKu86+xI12j7jP9XOSyAm8+9TFs+ +uoLgLBg+Ww0iq1H4+F+xb/x1NuJJsO0DCeySswcphL+L5OLhtJeFaqf20PurQgdD +7XwlVJB9AgMBAAECggEAVQzl/pO0xrHmxq4R1muKBPG+lmiTrixBEazCai2E7Id/ +v+WAP+FnZpPSd0QyEdNEvhOvvNDXalGTQtdXqOGcf+m7Sp7vV6LGPu0Ls2SlPGF4 +9IQbrVnAYppO0f6qfhkxTcMsCG06gleZBtTPj8mKT64ZMhUop/hEjC8vzh8wWuN0 +Ss/EVPrxTV2ZzD5Gj0yAU/Q0HlSyu62TErFCUoKIBTd9M5ewVIRAJZpIT7tjoFf1 +qFYwx7aRLyiZ5D5Y0GragbTpUfW0XH+anmf/cshLpiU6XPtHKkP0VpmK4CKrtWMd +bUnlLksPk00/lDJiOOqe5HGnuDnLC/cUKyKH6ie++QKBgQDZ0kVxPRNOZOWUMb5g +2OPyXmIkjZohQ9ABmKgY3vmN6f29xXEYAEJereJxUyu3iB/fRwa0La4EPpK11ZMz +rc+sRrMTUrbVsTU5XexultHgbXve2TeAUquLp2XL6wV0ANjdpBdIB1stxOp26sac +tWOqb+01rlVfgmTIT67L/6yWowKBgQD628oxDuaAviaONFKgIfakd8wlgnInHID1 +bIq42iGHq9EZGBt5VD00Wpfv+QeT39eFClxhAf3CHyRnC80q8avip+j7kK5Fm6r+ +Dqh+zNXF4Q7bwwPnjesfu97YWojWX8F3LrkN6C1D+DDuIcaDE8fDE6RD71ZshMIH +78SMxUFOXwKBgQCK/BFVLOxZtCWNBqR8NUhVSQYEXtn+6b8alaaEoBnKBIjkgswj +zV6L/RWky7X0WIZFuJM9enwztx1zqsBPVFNTkJUI+lkxRu44GYcYFWH7esB0NFOm +rJlK9dgNYnvLRhMacW5thkwWizQ0BqAOM+tRQDOycfeFhrT532YgQpaEUwKBgAoi +x1CkIXwiMrycMJp3xNdwX7dERgh+hldkQ1akuaYZsyEocDO+y5pJ7smrbjrzWGnv +uTvSMMafK4FeYLPTf/ZwgmFnvyLg30/Ul8pHzHtqVIdcodPBUDbACIkFX3IJ/G8s +XB3Lu8h7Rr7YboTtT6z6JjD4gq1vz8cyUOa/MZxRAoGAcn16jap33rV2qjffxL/O +VIzaTH7rBaxImK30FtJCH8OU5h+uR3MTvd8Q4zswLyaEcwHHWzMQPPrk/xM9SeQt +ZZ1Av8YGZ+D6H9vnd1SnW4VVPANWxSWCD/xNKET9q5F9qZh0hP18gg4aVjSd9iq2 +j4arL4vmcHhuHvap7udWd/c= -----END PRIVATE KEY-----