From 1cadfda410d3242dc05c3f93fec50633ea902882 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 25 Feb 2025 15:48:18 -0500 Subject: [PATCH 1/4] backup: don't send ntfy notification --- hosts/chunk/default.nix | 3 --- hosts/ytnix/default.nix | 3 --- modules/backup.nix | 18 ------------------ 3 files changed, 24 deletions(-) diff --git a/hosts/chunk/default.nix b/hosts/chunk/default.nix index 826b128..e565100 100644 --- a/hosts/chunk/default.nix +++ b/hosts/chunk/default.nix @@ -31,9 +31,6 @@ "borg/rsyncnet" = { sopsFile = ../../secrets/borg/chunk.yaml; }; - "services/ntfy" = { - sopsFile = ../../secrets/services/ntfy.yaml; - }; "rclone/config" = { sopsFile = ../../secrets/rclone.yaml; }; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index c329115..440c30f 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -17,9 +17,6 @@ "borg/rsyncnet" = { sopsFile = ../../secrets/borg/yt.yaml; }; - "services/ntfy" = { - sopsFile = ../../secrets/services/ntfy.yaml; - }; "rsyncnet/id_ed25519" = { sopsFile = ../../secrets/zh5061/yt.yaml; }; diff --git a/modules/backup.nix b/modules/backup.nix index 52913b4..2715deb 100644 --- a/modules/backup.nix +++ b/modules/backup.nix @@ -6,7 +6,6 @@ }: let cfg = config.my.backup; - hostname = config.networking.hostName; defaultPaths = [ "/root" "/home" @@ -97,23 +96,6 @@ in ]; # warnings are often not that serious failOnWarnings = false; - postHook = '' - invocationId=$(systemctl show -p InvocationID --value borgbackup-job-${cfg.jobName}.service) - title="${hostname}: backup completed with exit code: $exitStatus" - msg=$(journalctl -o cat _SYSTEMD_INVOCATION_ID=$invocationId) - - if [ "$exitStatus" -eq 0 ]; then - tag="v" - else - tag="rotating_light" - fi - - ${pkgs.curl}/bin/curl -sL -u $(cat ${config.sops.secrets."services/ntfy".path}) \ - -H "Title: $title" \ - -H "Tags: $tag" \ - -d "$msg" \ - https://ntfy.cything.io/backups > /dev/null - ''; prune.keep = { within = "2d"; From 8b53c43e26392481f432f024df56f01949349fce Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 25 Feb 2025 15:49:07 -0500 Subject: [PATCH 2/4] rm newsboat, add syncthingtray and cleanup unused stuff --- home/yt/ytnix.nix | 46 +---------------------------------------- hosts/ytnix/default.nix | 4 ---- 2 files changed, 1 insertion(+), 49 deletions(-) diff --git a/home/yt/ytnix.nix b/home/yt/ytnix.nix index c3a0414..ddb2212 100644 --- a/home/yt/ytnix.nix +++ b/home/yt/ytnix.nix @@ -19,30 +19,6 @@ }; programs.home-manager.enable = true; - systemd.user.startServices = "sd-switch"; - - # keep this commented when using plasma - # otherwise "system settings" in KDE will not function - # qt = { - # enable = true; - # platformTheme.name = "kde"; - # style.name = "breeze-dark"; - # style.package = pkgs.kdePackages.breeze; - # }; - - # this one too - # gtk = { - # enable = true; - # theme = { - # package = pkgs.adw-gtk3; - # name = "adw-gtk3-dark"; - # }; - # iconTheme = { - # package = pkgs.adwaita-icon-theme; - # name = "Adwaita"; - # }; - # }; - home.pointerCursor = { package = pkgs.bibata-cursors; name = "Bibata-Modern-Classic"; @@ -56,7 +32,6 @@ ungoogled-chromium librewolf bitwarden-desktop - bitwarden-cli fastfetch nwg-look kdePackages.gwenview @@ -67,11 +42,6 @@ signal-desktop pavucontrol btop - grim - slurp - rofi-wayland - rofimoji - cliphist jq bash-language-server sqlite @@ -88,7 +58,6 @@ pwgen lua-language-server gnumake - foot minisign unzip lm_sensors @@ -125,7 +94,6 @@ radare2 p7zip qbittorrent - # vscodium nil pkg-config gtk2 @@ -147,28 +115,16 @@ localsend scrcpy syncthing + syncthingtray obsidian ]; - programs.waybar.enable = true; programs.feh.enable = true; xdg.configFile = { - rofi.source = ../rofi; - waybar.source = ../waybar; mpv.source = ../mpv; }; - programs.newsboat = { - enable = true; - extraConfig = '' - urls-source "miniflux" - miniflux-url "https://rss.cything.io/" - miniflux-login "cy" - miniflux-passwordfile /run/secrets/newsboat/miniflux - ''; - }; - programs.direnv = { enable = true; nix-direnv.enable = true; diff --git a/hosts/ytnix/default.nix b/hosts/ytnix/default.nix index 440c30f..296335c 100644 --- a/hosts/ytnix/default.nix +++ b/hosts/ytnix/default.nix @@ -20,10 +20,6 @@ "rsyncnet/id_ed25519" = { sopsFile = ../../secrets/zh5061/yt.yaml; }; - "newsboat/miniflux" = { - sopsFile = ../../secrets/newsboat.yaml; - owner = "yt"; - }; "tailscale/auth" = { sopsFile = ../../secrets/services/tailscale.yaml; }; From 87c369e48f7d4aeea7cef2dcd53345fe75605f5a Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 25 Feb 2025 15:58:53 -0500 Subject: [PATCH 3/4] workflow: don't build titan --- .github/workflows/build-machines-and-homes.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml index e276cbf..908806f 100644 --- a/.github/workflows/build-machines-and-homes.yml +++ b/.github/workflows/build-machines-and-homes.yml @@ -10,7 +10,6 @@ jobs: machine: - chunk - ytnix - - titan os: - ubuntu-latest runs-on: ${{ matrix.os }} From f59a8f3fec6c8957d09b1adb4c2550373d9ffe67 Mon Sep 17 00:00:00 2001 From: cy Date: Tue, 25 Feb 2025 16:01:37 -0500 Subject: [PATCH 4/4] flake update Signed-off-by: cy --- flake.lock | 188 ++++++++++++----------------------------------------- 1 file changed, 43 insertions(+), 145 deletions(-) diff --git a/flake.lock b/flake.lock index 2042b1e..0a3fb3c 100644 --- a/flake.lock +++ b/flake.lock @@ -204,27 +204,6 @@ "type": "github" } }, - "devshell": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1735644329, - "narHash": "sha256-tO3HrHriyLvipc4xr+Ewtdlo7wM1OjXNjlWRgmM7peY=", - "owner": "numtide", - "repo": "devshell", - "rev": "f7795ede5b02664b57035b3b757876703e2c3eac", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -462,32 +441,6 @@ "type": "github" } }, - "git-hooks_2": { - "inputs": { - "flake-compat": [ - "nixvim", - "flake-compat" - ], - "gitignore": "gitignore_3", - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1737465171, - "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -533,28 +486,6 @@ "type": "github" } }, - "gitignore_3": { - "inputs": { - "nixpkgs": [ - "nixvim", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -562,11 +493,11 @@ ] }, "locked": { - "lastModified": 1740318342, - "narHash": "sha256-fjr9+3Iru6O5qE+2oERQkabqAUXx4awm0+i2MBcta1U=", + "lastModified": 1740494361, + "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=", "owner": "nix-community", "repo": "home-manager", - "rev": "b5ab2c7fdaa807cf425066ab7cd34b073946b1ca", + "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17", "type": "github" }, "original": { @@ -623,11 +554,11 @@ ] }, "locked": { - "lastModified": 1739186342, - "narHash": "sha256-2j+sln9RwQn+g7J4GmdFFgvqXnLkvWBNMaUzONlkzUE=", + "lastModified": 1740440383, + "narHash": "sha256-w8ixbqOGrVWMQZFFs4uAwZpuwuGMzFoKjocMFxTR5Ts=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "3bdeebbc484a09391c4f0ec8a37bb77809426660", + "rev": "6321bc060d757c137c1fbae2057c7e941483878f", "type": "github" }, "original": { @@ -683,11 +614,11 @@ "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1740318097, - "narHash": "sha256-lCRwHfZqpXO/Q98WCTD0eOWvKpA2J4ANLxrDzd3aWJw=", + "lastModified": 1740502011, + "narHash": "sha256-H5itHYNtWHzM1nlZozYfLvN+CHRL3A95uO8qKBNx7Xo=", "ref": "refs/heads/main", - "rev": "aaab224bea76cc6882884f9223b4bec2a781ebd4", - "revCount": 17460, + "rev": "ffe2dd40f4fae2d8f0ff94063c8522efddc2a3e6", + "revCount": 17493, "type": "git", "url": "https://git.lix.systems/lix-project/lix" }, @@ -763,11 +694,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1740326457, - "narHash": "sha256-C1tiPRIXI6Z5vd3pz26/JQ/p+VaG2eKD6PNk8ZqFW1E=", + "lastModified": 1740480783, + "narHash": "sha256-5l/WnJ4BELbckzTd1rmTlEGbcqBf71K2tx6pCNb2xM8=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "23b0234ac1b03709a0cec40e84d293f083859dc9", + "rev": "0da1abb83ef2a37fd885de79730759486a407c41", "type": "github" }, "original": { @@ -779,16 +710,16 @@ "niri-stable": { "flake": false, "locked": { - "lastModified": 1736614405, - "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=", + "lastModified": 1740117926, + "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "owner": "YaLTeR", "repo": "niri", - "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5", + "rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "type": "github" }, "original": { "owner": "YaLTeR", - "ref": "v25.01", + "ref": "v25.02", "repo": "niri", "type": "github" } @@ -796,11 +727,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1740251548, - "narHash": "sha256-53kgDwNYEPIZadX5SEk7+OoTXycHm1QUF7x2XCoo9+U=", + "lastModified": 1740476031, + "narHash": "sha256-8YuYgIzExIAenYMaSQTP7zYBzaJPN83pGRrcwQCochY=", "owner": "YaLTeR", "repo": "niri", - "rev": "bca65452882e1e616045e21a0a9a4a0b7024239b", + "rev": "c153349c62ed44762bf2ae8be6d5812faa9d5c6d", "type": "github" }, "original": { @@ -850,27 +781,6 @@ "type": "github" } }, - "nix-darwin": { - "inputs": { - "nixpkgs": [ - "nixvim", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1738743987, - "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", - "owner": "lnl7", - "repo": "nix-darwin", - "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", - "type": "github" - }, - "original": { - "owner": "lnl7", - "repo": "nix-darwin", - "type": "github" - } - }, "nix-filter": { "locked": { "lastModified": 1731533336, @@ -916,11 +826,11 @@ ] }, "locked": { - "lastModified": 1739790836, - "narHash": "sha256-ksegG5wSllKmBqId/BtHVje9E5s0I+uCWgiFeLv2RzM=", + "lastModified": 1740390822, + "narHash": "sha256-UnMANgi2Zf4gf4p49cXM4fDRrPEpN6oJJMXT4Z2BW/U=", "owner": "nix-community", "repo": "nix-ld", - "rev": "36420e7b304b5071da5eedd176c0a567fd821861", + "rev": "4c86e9f94553bceba004c48be6f2691971d2a6f7", "type": "github" }, "original": { @@ -1027,11 +937,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1740162160, - "narHash": "sha256-SSYxFhqCOb3aiPb6MmN68yEzBIltfom8IgRz7phHscM=", + "lastModified": 1740339700, + "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "11415c7ae8539d6292f2928317ee7a8410b28bb9", + "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195", "type": "github" }, "original": { @@ -1091,11 +1001,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740301968, - "narHash": "sha256-eDAiNagpMExcLoSIgjdef2ZYyvjuy1VTF8r9OZXCMGc=", + "lastModified": 1740500346, + "narHash": "sha256-4fO8s2ptZODefFbdyCuxR3MaqZs7U9A+Q1wak0SkJ4o=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b7fe81518095c48a8ba94fc7cfe5c0fc8370851b", + "rev": "d4d7eaf04bb369b178ad6eab68e356056aeaa952", "type": "github" }, "original": { @@ -1107,32 +1017,20 @@ }, "nixvim": { "inputs": { - "devshell": "devshell", - "flake-compat": [ - "flake-compat" - ], "flake-parts": [ "flake-parts" ], - "git-hooks": "git-hooks_2", - "home-manager": [ - "home-manager" - ], - "nix-darwin": "nix-darwin", "nixpkgs": [ "nixpkgs" ], - "nuschtosSearch": "nuschtosSearch", - "treefmt-nix": [ - "treefmt" - ] + "nuschtosSearch": "nuschtosSearch" }, "locked": { - "lastModified": 1739902813, - "narHash": "sha256-BgOQcKKz7VNvSHIbBllHisv32HvF3W3ALF9sdnC++V8=", + "lastModified": 1740432393, + "narHash": "sha256-uXlB7bTlrl0q2jryKMSRlU+GptkVJN7PTsqdKkaFg1M=", "owner": "nix-community", "repo": "nixvim", - "rev": "0ab9947137cd034ec64eb5cd9ede94e53af21f50", + "rev": "53f9d242ffdf0997109d0b5b8bbbcc67a4296077", "type": "github" }, "original": { @@ -1313,11 +1211,11 @@ ] }, "locked": { - "lastModified": 1740277845, - "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=", + "lastModified": 1740450604, + "narHash": "sha256-T/lqASXzCzp5lJISCUw+qwfRmImVUnhKgAhn8ymRClI=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "f933070c29f9c1c5457447a51903f27f76ebb519", + "rev": "5961ca311c85c31fc5f51925b4356899eed36221", "type": "github" }, "original": { @@ -1409,11 +1307,11 @@ ] }, "locked": { - "lastModified": 1740275623, - "narHash": "sha256-LQ9hq3hKwWqm+dzBhgsIkr2KO6Bb0aU+yO/TtI7hXXo=", + "lastModified": 1740448507, + "narHash": "sha256-4NsNG5lxS+r5LQ9QmT8xC2VQCN6BeMBnWzxTF/0r14U=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "35ff5dce04469e7b4e56a9d997e5201bfce52ae3", + "rev": "b0bb3351351155e341033b05fffe0a0c9b342ee4", "type": "github" }, "original": { @@ -1425,16 +1323,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1730166465, - "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=", + "lastModified": 1739246919, + "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98", + "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.5", + "ref": "v0.5.1", "repo": "xwayland-satellite", "type": "github" }