diff --git a/flake.lock b/flake.lock
index 57f960c..3baaec2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -36,11 +36,11 @@
]
},
"locked": {
- "lastModified": 1784343464,
- "narHash": "sha256-nCbqEHtKdC+K7Nm55s1NtvW8pjMkN/ln9y53DJWnfVY=",
+ "lastModified": 1784950224,
+ "narHash": "sha256-kAblkqaFzElLUXjA1Mh/FAWW2643bF2ZVINJjLx/MA0=",
"owner": "caelestia-dots",
"repo": "cli",
- "rev": "0f20487cba585950de850d76e5ced63628453a36",
+ "rev": "c788ba3ab83767b0fd44dcb323875121c313e674",
"type": "github"
},
"original": {
@@ -59,11 +59,11 @@
"quickshell": "quickshell"
},
"locked": {
- "lastModified": 1784448133,
- "narHash": "sha256-vuElQeGNDrHGiHMRXhLFu6iCeOgbpw1dOc0HXj///Q0=",
+ "lastModified": 1785071012,
+ "narHash": "sha256-LtkywDbgL6555N2NSopGqdKWi9RIEXAEhmRgi6igMsM=",
"owner": "caelestia-dots",
"repo": "shell",
- "rev": "027808004091e1d20f3f2e65b3598357cd52acae",
+ "rev": "71df36cd7d8ad4b776ed23675eba96654905326e",
"type": "github"
},
"original": {
@@ -226,11 +226,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1784432872,
- "narHash": "sha256-n3gKTBIV4ZA5VQpUakffBe3KGu4+mhPoA34rrqS0GkA=",
+ "lastModified": 1784856561,
+ "narHash": "sha256-J+Bx1Z6Oeoj2FgnBhRMKyUhhtDoOpTgXYaVLZpDjW4A=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "fd1462031fdee08f65fd0b4c6b64e22239a77870",
+ "rev": "597283ad8aa0b331c788e97c4c262d58877074ef",
"type": "github"
},
"original": {
@@ -280,11 +280,11 @@
},
"nixpkgs-unstable": {
"locked": {
- "lastModified": 1784555310,
- "narHash": "sha256-/FCliTPgiuV1owejZFNx3Ch9irdvkOfOFl+HHZ+DrtM=",
+ "lastModified": 1784872115,
+ "narHash": "sha256-THPEF2po0fsoH8gNtp+Ae0XFDJH3N/ol7xO3v6VMTJU=",
"owner": "nixos",
"repo": "nixpkgs",
- "rev": "421eebfd0ec7bccd4abe826ce62d7e6e83129493",
+ "rev": "335f0738cb2fa9708f3f428e39d2eae975d1338d",
"type": "github"
},
"original": {
@@ -349,11 +349,11 @@
]
},
"locked": {
- "lastModified": 1783673918,
- "narHash": "sha256-cFG5vnmjJcZRVCSUaqQLOdwkX6iqF6bY8IvvmBSGSRs=",
+ "lastModified": 1784799776,
+ "narHash": "sha256-6AM0doj8hSNav9qkX4dOHOp1LSjegdQ+VmzDz9MnWAs=",
"ref": "refs/heads/master",
- "rev": "4df562dfb2475a9057f0f33a8db75808efad8670",
- "revCount": 830,
+ "rev": "10b439fc6e3fd65c15fe1c486271b31da05ed023",
+ "revCount": 833,
"type": "git",
"url": "https://git.outfoxxed.me/outfoxxed/quickshell"
},
diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix
index 99685ed..fe47806 100644
--- a/modules/applications/hyprland.nix
+++ b/modules/applications/hyprland.nix
@@ -78,7 +78,7 @@
home.sessionVariables.NIXOS_OZONE_WL = "1";
wayland.windowManager.hyprland.plugins = [
#pkgs-unstable.hyprlandPlugins.hyprspace # currently broken
- pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors
+ #pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors
];
wayland.windowManager.hyprland.configType = "hyprlang";
wayland.windowManager.hyprland.settings = {
diff --git a/modules/utilities/autoUpdate.nix b/modules/utilities/autoUpdate.nix
index 882d869..0b716a4 100644
--- a/modules/utilities/autoUpdate.nix
+++ b/modules/utilities/autoUpdate.nix
@@ -52,7 +52,10 @@
};
## desktop
- flake.nixosModules.autoUpdate-desktop = {pkgs, ...}: {
+ flake.nixosModules.autoUpdate-desktop = {pkgs, config,...}: {
+ age.secrets.ntfy = {
+ file = ../../secrets/ntfy.age;
+ };
# Ensure your script is available system-wide
environment.systemPackages = [
self.packages.${pkgs.system}.custom-autoupdate-desktop
@@ -65,6 +68,9 @@
description = "NixOS flake auto update";
serviceConfig = {
+ Environment = [
+ "NTFY_SECRET=${config.age.secrets.ntfy.path}"
+ ];
Type = "oneshot";
ExecStart = "/run/current-system/sw/bin/custom-autoupdate";
@@ -112,7 +118,7 @@
text = ''
# shellcheck disable=SC1090
source "$NTFY_SECRET"
- set -e
+ set -ex
FLAKE_DIR="/home/tomasr/nixos"
FLAKE="$FLAKE_DIR#laptop"
@@ -173,11 +179,14 @@
runtimeInputs = with pkgs; [
git
nixos-rebuild
- matrix-commander-rs
libnotify
+ curl
+ nix
];
text = ''
+ # shellcheck disable=SC1090
+ source "$NTFY_SECRET"
set -e
FLAKE_DIR="/home/tomasr/nixos"
@@ -203,9 +212,12 @@
notify-send "Flake autoupdate" "Rebuild OK"
- matrix-commander-rs --verbose -m "Flake rebuild succesfull.
@notificationbot_0000" \
- --html \
- -r "\!BXRRokBmEdNOyYdfOF:matrix.org"
+ curl \
+ -u ":$NTFY_TOKEN" \
+ -d "Flake rebuild successful" \
+ -H "Title: Flake autoupdate" \
+ "$NTFY_SERVER/Alerts"
+
else
notify-send "Flake autoupdate" "No changes"
git -C "$FLAKE_DIR" push
@@ -216,9 +228,12 @@
notify-send -u critical "Flake autoupdate" "FAILED"
- matrix-commander-rs --verbose -m "Flake rebuild failed.
Error:
$ERROR_MSG