diff --git a/home-modules/calendar.nix b/home-modules/calendar.nix index c728d35..a9bc358 100644 --- a/home-modules/calendar.nix +++ b/home-modules/calendar.nix @@ -40,13 +40,13 @@ read-only = true; type = "ics"; } - { - name = "Handball Männer"; - url = "http://i.cal.to/ical/108/dhb/handball-nationalmannschaft/c687e97f.bc7c3eb6-11a0e356.ics"; - color = "#880023"; - read-only = true; - type = "ics"; - } + # { + # name = "Handball Männer"; + # url = "http://i.cal.to/ical/108/dhb/handball-nationalmannschaft/c687e97f.bc7c3eb6-11a0e356.ics"; + # color = "#880023"; + # read-only = true; + # type = "ics"; + # } ]; default_set = { # name = diff --git a/home-modules/chatterino.nix b/home-modules/chatterino.nix index 2c81f7d..96478bb 100644 --- a/home-modules/chatterino.nix +++ b/home-modules/chatterino.nix @@ -16,7 +16,6 @@ let "LEC" "lol_nemesis" "NASA" - "NNOPrime" "NoWay4u_Sir" "OfficialMikeShinoda" "Rekkles" diff --git a/home-modules/hyprland.nix b/home-modules/hyprland.nix index 50aaa01..78df2cb 100644 --- a/home-modules/hyprland.nix +++ b/home-modules/hyprland.nix @@ -349,7 +349,7 @@ in { "SUPER SHIFT, F1, movetoworkspace, 100" # "SUPER, F2," # "SUPER, F3, toggleopaque" - # "SUPER, F4," + "SUPER, F4, exec, rm /tmp/caldav_event_cache.json && notify-send Saved event deleted!" "SUPER, F5, exec, nx_gcal_event force-lookup" "SUPER SHIFT, F5, exec, nx_gcal_event reauthenticate" "SUPER, F6, exec, ${terminal-exec}'htop'" diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix index 1f55cc7..c175115 100644 --- a/home-modules/yazi.nix +++ b/home-modules/yazi.nix @@ -34,8 +34,8 @@ { on = ""; run = "arrow 100%"; desc = "Move cursor down one page"; } { on = ""; run = "arrow -100%"; desc = "Move cursor up one page"; } { on = ""; run = "arrow 100%"; desc = "Move cursor down one page"; } - { on = [ "g" "g" ]; run = "arrow -99999999"; desc = "Move cursor to the top"; } - { on = [ "g" "e" ]; run = "arrow 99999999"; desc = "Move cursor to the end"; } + { on = [ "g" "g" ]; run = "arrow down"; desc = "Move cursor to the top"; } + { on = [ "g" "e" ]; run = "arrow up"; desc = "Move cursor to the end"; } { on = [ "g" "h" ]; run = "cd ~"; desc = "Go to the home directory"; } { on = [ "g" "n" ]; run = "cd ~/nix-dots"; desc = "Go to the Nix-Dotfiles directory"; } { on = [ "g" "n" ]; run = "cd /nix/store"; desc = "Go to the Nix-Store"; } @@ -205,38 +205,38 @@ { run = ''unzip "$1"''; desc = "unzip"; } ]; "image" = [ - { run = ''imv "$@"''; desc = "imv"; } - { run = ''gimp "$@"''; desc = "gimp"; } + { run = ''imv "$@"''; desc = "imv"; orphan = true; } + { run = ''gimp "$@"''; desc = "gimp"; orphan = true; } { run = ''swww img --transition-type wipe --transition-angle 60 --transition-step 120 --transition-fps 120 "$@"''; desc = "swww wallpaper"; } { run = ''exiftool "$@"; echo "Press enter to exit"; read''; desc = "View Exif Data"; } { run = ''for f in "$@"; do magick "$f" -auto-orient "''${f%.*}.pdf"; done''; desc = "Convert to PDF"; } ]; "svg" = [ - { run = ''inkscape "$@"''; desc = "inkscape";} - { run = ''firefox "$@"''; desc = "firefox";} + { run = ''inkscape "$@"''; desc = "inkscape"; orphan = true; } + { run = ''firefox "$@"''; desc = "firefox"; orphan = true; } ]; "font" = [ - { run = ''fontpreview "$@"''; desc = "fontpreview"; } - { run = ''fontforge "$@"''; desc = "fortforge"; } + { run = ''fontpreview "$@"''; desc = "fontpreview"; orphan = true; } + { run = ''fontforge "$@"''; desc = "fortforge"; orphan = true; } ]; "document" = [ - { run = ''zathura "$@"''; desc = "zathura"; orphan = true; } - { run = ''xournal "$@"''; desc = "xournal"; orphan = true; } - { run = ''firefox "$@"''; desc = "firefox"; } + { run = ''zathura "$@"''; desc = "zathura"; orphan = true; } + { run = ''xournal "$@"''; desc = "xournal"; orphan = true; } + { run = ''firefox "$@"''; desc = "firefox"; orphan = true; } { run = ''nxgs flip "$@"''; desc = "nxgs flip"; } { run = ''nxgs rotate "$@"''; desc = "nxgs rotate"; } { run = ''nxgs interactive-merge "$@"''; block = true; desc = "nxgs merge"; } ]; "browser" = [ - { run = ''firefox "$@"''; desc = "firefox"; } - { run = ''zen "$@"''; desc = "zen"; } - { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "chromium"; } + { run = ''firefox "$@"''; desc = "firefox"; orphan = true; } + { run = ''zen "$@"''; desc = "zen"; orphan = true; } + { run = ''chromium --enable-features=UseOzonePlatform --ozone-platform=wayland "$@"''; desc = "chromium"; orphan = true; } { run = ''w3m "$@"''; desc = "w3m"; } { run = ''lynx "$@"''; desc = "lynx"; } ]; "office" = [ - { run = ''libreoffice "$@"''; desc = "libreoffice"; } - { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; } + { run = ''libreoffice "$@"''; desc = "libreoffice"; orphan = true; } + { run = ''libreoffice --view "$@"''; desc = "libreoffice read-only"; orphan = true; } ]; "shell" = [ { run = ''bash -c "$@"''; desc = "bash -c"; } diff --git a/system-modules/calendar-dicos.nix b/system-modules/calendar-dicos.nix index e34c8da..ac91913 100644 --- a/system-modules/calendar-dicos.nix +++ b/system-modules/calendar-dicos.nix @@ -13,11 +13,11 @@ systemd.services."nx_cal_dicos" = { script = let nx_cal_dicos = (pkgs.writers.writePython3Bin "nx_cal_dicos" { - libraries = with pkgs.python3Packages; [ - ics - ]; - flakeIgnore = [ "E302" "E305" "E226" "E501" ]; - } /*python */ '' + libraries = with pkgs.python3Packages; [ + ics + ]; + flakeIgnore = [ "E302" "E305" "E226" "E501" ]; + } /* python */ '' import os from glob import glob from ics import Calendar diff --git a/system-modules/nx2site.nix b/system-modules/nx2site.nix index b8526f3..193b5f1 100644 --- a/system-modules/nx2site.nix +++ b/system-modules/nx2site.nix @@ -29,191 +29,78 @@ let dns-user = "cloudflare"; in Unit = "dynamic-dns.service"; }; }; - services."dynamic-dns" = let - u = let - account_id = secrets.email.gmail-online.mail; - zone_id = "33fecab36e060f49d492127345ea95a0"; - record_id = { # curl --request GET --url https://api.cloudflare.com/client/v4/zones/33fecab36e060f49d492127345ea95a0/dns_records --header 'Content-Type: application/json' --header 'X-Auth-Email: @gmail.com' --header "X-Auth-Key: " -s | jq - base = "58d3412e8d88889d1a611b3669f0700f"; - base6 = "d1b90e21d2d747dcb30448bd65312927"; - sub = "fc861353142bc05d5dbad1799178e6a1"; - sub6 = "b8082b7afe9e80971fc9f9dda16ec284"; - ssh = "c0f14f17f32d6595c202f041dd836eb3"; - ssh6 = "f1ecb2d9d0522d4eec06437688ca76da"; - }; - passord-file-path = config.sops.secrets."nx2site/cloudflare/global-api-key".path; - log-file-path = "/var/log/couldflare.log"; - count-file-path = "/var/log/cloudflare-count.txt"; - in pkgs.writers.writePython3Bin "dyn_dns" { - libraries = with pkgs.python311Packages; [ requests ]; - flakeIgnore = [ "E501" "E305" "E701" "E704" "E302" "E114" "F841" "E121" "E261" "E303" ]; - } /* python */ '' - import requests - import subprocess - # from datetime import datetime + services."dynamic-dns" = { + script = let + dyn-dns = let + account_id = secrets.email.gmail-online.mail; + zone_id = "33fecab36e060f49d492127345ea95a0"; + record_id = { # curl --request GET --url https://api.cloudflare.com/client/v4/zones/33fecab36e060f49d492127345ea95a0/dns_records --header 'Content-Type: application/json' --header 'X-Auth-Email: @gmail.com' --header "X-Auth-Key: " -s | jq + base = "58d3412e8d88889d1a611b3669f0700f"; + base6 = "d1b90e21d2d747dcb30448bd65312927"; + sub = "fc861353142bc05d5dbad1799178e6a1"; + sub6 = "b8082b7afe9e80971fc9f9dda16ec284"; + ssh = "c0f14f17f32d6595c202f041dd836eb3"; + ssh6 = "f1ecb2d9d0522d4eec06437688ca76da"; + }; + passord-file-path = config.sops.secrets."nx2site/cloudflare/global-api-key".path; + in pkgs.writers.writePython3Bin "dyn_dns" { + libraries = with pkgs.python3Packages; [ requests ]; + flakeIgnore = [ "E302" "E305" "E226" "E501" "E261" ]; + } /* python */ '' +import requests +import subprocess - def get_public_ip(ipv6=False): - return subprocess.run(['${pkgs.curl}/bin/curl', '-s', '-6' if ipv6 else '-4', 'https://ifconfig.me'], capture_output=True, text=True).stdout.strip() +def get_public_ip(ipv6: bool = False) -> str: + return subprocess.run(['${pkgs.curl}/bin/curl', '-s', '-6' if ipv6 else '-4', 'https://ifconfig.me'], capture_output=True, text=True).stdout.strip() - def main(): - my_ip = get_public_ip() - my_ip6 = get_public_ip(ipv6=True) +def update_record(record_id: str, record_name: str, ip: str, type: str, proxied: bool, pw: str) -> None: + return requests.patch( + f'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/{record_id}', + headers={ + 'Content-Type': 'application/json', + 'X-Auth-Email': '${account_id}', + 'X-Auth-Key': pw + }, + json={ + "comment": "Domain verification record", + "name": record_name, + "proxied": proxied, + "settings": {}, + "tags": [], + "ttl": 1, # automatic + "content": ip, + "type": type + } + ) - # with open("${count-file-path}", "r") as f: - # content = f.read() - # if content == "": count = 0 - # else: count = int(content) - # count += 1 - # with open("${count-file-path}", "w") as f: - # f.write(str(count)) +def main(): + my_ip = get_public_ip() + my_ip6 = get_public_ip(ipv6=True) - # 4 - with open("${passord-file-path}", 'r') as pw_file: - pw = pw_file.read().strip() + with open("${passord-file-path}", 'r') as pw_file: + pw = pw_file.read().strip() - # Perform DNS updates - # https://developers.cloudflare.com/api/operations/dns-records-for-a-zone-update-dns-record - resp_base = requests.patch( - 'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.base}', - headers={ - 'Content-Type': 'application/json', - 'X-Auth-Email': '${account_id}', - 'X-Auth-Key': pw - }, - json={ - "comment": "Domain verification record", - "name": "${domain}", - "proxied": True, - "settings": {}, - "tags": [], - "ttl": 1, # automatic - "content": my_ip, - "type": "A" - } - ) + # Perform DNS updates + # https://developers.cloudflare.com/api/operations/dns-records-for-a-zone-update-dns-record + r = update_record(record_id="${record_id.base}", record_name="${domain}", ip=my_ip, type="A", proxied=True, pw=pw) + _ = update_record(record_id="${record_id.sub}", record_name="*.${domain}", ip=my_ip, type="A", proxied=True, pw=pw) + _ = update_record(record_id="${record_id.ssh}", record_name="ssh.${domain}", ip=my_ip, type="A", proxied=False, pw=pw) - resp_subd = requests.patch( - 'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.sub}', - headers={ - 'Content-Type': 'application/json', - 'X-Auth-Email': '${account_id}', - 'X-Auth-Key': pw - }, - json={ - "comment": "Domain verification record", - "name": "*.${domain}", - "proxied": True, - "settings": {}, - "tags": [], - "ttl": 1, # automatic - "content": my_ip, - "type": "A" - } - ) + if r.status_code != 200: + print(r.text) - resp_sshd = requests.patch( - 'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.ssh}', - headers={ - 'Content-Type': 'application/json', - 'X-Auth-Email': '${account_id}', - 'X-Auth-Key': pw - }, - json={ - "comment": "Domain verification record", - "name": "ssh.${domain}", - "proxied": False, - "settings": {}, - "tags": [], - "ttl": 1, # automatic - "content": my_ip, - "type": "A" - } - ) + r = update_record(record_id="${record_id.base6}", record_name="${domain}", ip=my_ip6, type="AAAA", proxied=True, pw=pw) + _ = update_record(record_id="${record_id.sub6}", record_name="*.${domain}", ip=my_ip6, type="AAAA", proxied=True, pw=pw) + _ = update_record(record_id="${record_id.ssh6}", record_name="ssh.${domain}", ip=my_ip6, type="AAAA", proxied=False, pw=pw) - if resp_base.status_code != 200: - print(resp_base.text) + if r.status_code != 200: + print(r.text) - - # now_str = datetime.now().strftime('%Y/%m/%d-%R') - # log_entry = f"At {now_str} - to {my_ip} - Response {resp_base.status_code}\n" - # print(log_entry, end="") - # with open("${log-file-path}", 'a') as log_file: - # log_file.write(log_entry) - - # Perform DNS updates - # https://developers.cloudflare.com/api/operations/dns-records-for-a-zone-update-dns-record - resp_base = requests.patch( - 'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.base6}', - headers={ - 'Content-Type': 'application/json', - 'X-Auth-Email': '${account_id}', - 'X-Auth-Key': pw - }, - json={ - "comment": "Domain verification record", - "name": "${domain}", - "proxied": True, - "settings": {}, - "tags": [], - "ttl": 1, # automatic - "content": my_ip6, - "type": "AAAA" - } - ) - - resp_subd = requests.patch( - 'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.sub6}', - headers={ - 'Content-Type': 'application/json', - 'X-Auth-Email': '${account_id}', - 'X-Auth-Key': pw - }, - json={ - "comment": "Domain verification record", - "name": "*.${domain}", - "proxied": True, - "settings": {}, - "tags": [], - "ttl": 1, # automatic - "content": my_ip6, - "type": "AAAA" - } - ) - - resp_sshd = requests.patch( - 'https://api.cloudflare.com/client/v4/zones/${zone_id}/dns_records/${record_id.ssh6}', - headers={ - 'Content-Type': 'application/json', - 'X-Auth-Email': '${account_id}', - 'X-Auth-Key': pw - }, - json={ - "comment": "Domain verification record", - "name": "ssh.${domain}", - "proxied": False, - "settings": {}, - "tags": [], - "ttl": 1, # automatic - "content": my_ip6, - "type": "AAAA" - } - ) - - if resp_base.status_code != 200: - print(resp_base.text) - - # now_str = datetime.now().strftime('%Y/%m/%d-%R') - # log_entry = f"At {now_str} - to {my_ip6} - Response {resp_base.status_code}\n" - # print(log_entry, end="") - # with open("${log-file-path}", 'a') as log_file: log_file.write(log_entry) - - if __name__ == "__main__": - main() - ''; - in { - script = '' - set -eu - ${u}/bin/dyn_dns +if __name__ == "__main__": + main() + ''; in /* bash */ '' + set -e + ${dyn-dns}/bin/dyn_dns ''; serviceConfig = { Type = "oneshot"; @@ -221,19 +108,19 @@ let dns-user = "cloudflare"; in }; }; }; - networking.hosts = { # docker network inspect nx2site_default | grep -E "Name|IPv4" | tr "\n" " " | sed -r 's- +- -g;s-\n?"Name": -\n-g' | sed -r '1d;2d;s-"(.+?)", "IPv4Address": "(.+)/16",- "\2" = [ "\1.docker" ];-g' + # networking.hosts = { # docker network inspect nx2site_default | grep -E "Name|IPv4" | tr "\n" " " | sed -r 's- +- -g;s-\n?"Name": -\n-g' | sed -r '1d;2d;s-"(.+?)", "IPv4Address": "(.+)/16",- "\2" = [ "\1.docker" ];-g' # "172.1.2.1" = [ "staticweb.docker" ]; # "172.1.3.1" = [ "matrix.docker" ]; # "172.1.0.9" = [ "matrixdb.docker" ]; # "172.1.4.1" = [ "matrix-ss.docker" ]; # "172.1.0.7" = [ "matrix-ssdb.docker" ]; # "172.1.5.1" = [ "pw.docker" ]; - "172.1.6.1" = [ "git.docker" ]; + # "172.1.6.1" = [ "git.docker" ]; # "172.1.0.10" = [ "gitdb.docker" ]; # "172.1.7.1" = [ "nn.docker" ]; # "172.1.8.1" = [ "llm.docker" ]; # "172.1.9.1" = [ "proxy.docker" ]; # "172.1.10.1" = [ "share.docker" ]; # "172.1.11.1" = [ "odq.docker" ]; - }; + # }; } diff --git a/system-modules/nx2site/radicale.nix b/system-modules/nx2site/radicale.nix index 65619f5..b98635d 100644 --- a/system-modules/nx2site/radicale.nix +++ b/system-modules/nx2site/radicale.nix @@ -1,7 +1,7 @@ { config, domain, ... }: { sops.secrets = { - "nx2site/radicale-htpasswd" = { + "nx2site/radicale/htpasswd" = { owner = "radicale"; }; }; @@ -20,7 +20,7 @@ ]; auth = { type = "htpasswd"; - htpasswd_filename = config.sops.secrets."nx2site/radicale-htpasswd".path; + htpasswd_filename = config.sops.secrets."nx2site/radicale/htpasswd".path; htpasswd_encryption = "bcrypt"; }; };