From 15afff222e3039facd5acbb56c6e347802a52edd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 14:20:49 +0200 Subject: [PATCH 01/18] hyprland desktop: change scaling to 0.75 --- modules/applications/hyprland.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index e9e25d4..fd8275c 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -51,7 +51,7 @@ flake.homeModules.hyprland-desktop = _: { wayland.windowManager.hyprland.settings = { monitor = [ - ", highres@highrr, auto, 1" + ", highres@highrr, auto, 0.75" ]; }; }; From 3f5291cbaf25cd18a2b610cb4afa986edc7a4a3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 16:42:52 +0200 Subject: [PATCH 02/18] desktop: add games --- flake.nix | 2 ++ modules/hosts/desktop.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/flake.nix b/flake.nix index 735da26..bd83a3e 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,8 @@ "hplip" "nvidia-x11" "nvidia-settings" + "steam" + "steam-unwrapped" "cheatsheet.nvim" ]; mkUnfreePredicate = pkg: diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index 29be295..99a61cf 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -27,6 +27,7 @@ documentation disk # this only installs some disk utilities. disko will format the drives fonts + games hardware-configuration-desktop hdd hyprland From f28a6af58195bcc9b8cdc4d2daeaf99875a05b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 16:48:51 +0200 Subject: [PATCH 03/18] desktop: fix lock --- modules/applications/caelestia.nix | 22 ++++++++++++++++++++++ modules/hosts/desktop.nix | 1 + 2 files changed, 23 insertions(+) diff --git a/modules/applications/caelestia.nix b/modules/applications/caelestia.nix index ed78607..5c05b2b 100644 --- a/modules/applications/caelestia.nix +++ b/modules/applications/caelestia.nix @@ -10,6 +10,28 @@ quickshell # we have it but adding it there solves "WARN qt.qpa.services: Failed to register with host portal QDBusError("org.freedesktop.portal.Error.Failed", "Could not register app ID: App info not found for 'org.quickshell'")" ]; }; + flake.homeModules.caelestia-desktop = {lib, ...}: { + # for some reason nvidia drivers or I don't know what break the lock. (activate even when use, crash, etc.) + programs.caelestia.settings.general.idle = { + lockBeforeSleep = lib.mkForce false; + inhibitWhenAudio = true; + timeouts = lib.mkForce [ + { + timeout = 180000; + idleAction = "lock"; + } + { + timeout = 300; + idleAction = "dpms off"; # what's that? + returnAction = "dpms on"; + } + { + timeout = 600; + idleAction = ["systemctl" "suspend-then-hibernate"]; + } + ]; + }; + }; flake.homeModules.caelestia = _: let sisyphe = ../../assets/sisyphe.gif; pepe-music = ../../assets/pepe-music.gif; diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index 99a61cf..2d4aed0 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -53,6 +53,7 @@ inputs.caelestia-shell.homeManagerModules.default anki caelestia + caelestia-desktop cursor development eza From d32a0e5948a6b1beb4a4c0f32240b493217fc6fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 20:12:38 +0200 Subject: [PATCH 04/18] nixpkgs: add master branch in flake.nix --- flake.nix | 4 +++- modules/hosts/desktop.nix | 2 +- modules/hosts/laptop.nix | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index bd83a3e..2dcc54e 100644 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages nixos-grub-themes.url = "github:jeslie0/nixos-grub-themes"; + nixpkgs-master.url = "github:nixos/nixpkgs/master"; # used with precaution as they are untested and not cached # This one is only used when testing some packaging. You must change the path to the correct nixpkgs clone #nixpkgs-local.url = "path:/home/tomasr/devel/fugit2-gpgme"; @@ -67,8 +68,9 @@ pkgs-unstable = mkPkgs inputs.nixpkgs-unstable; pkgs-local = mkPkgs inputs.nixpkgs-unstable; #pkgs-local = mkPkgs inputs.nixpkgs-local; + pkgs-master = mkPkgs inputs.nixpkgs-master; in { - inherit pkgs pkgs-unstable pkgs-local; + inherit pkgs pkgs-unstable pkgs-local pkgs-master; }; } // (inputs.import-tree ./modules)); diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index 2d4aed0..9d978a1 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -7,7 +7,7 @@ flake.nixosConfigurations.desktop = inputs.nixpkgs.lib.nixosSystem { #system = "x86_64-linux"; specialArgs = { - inherit (self) pkgs-unstable; + inherit (self) pkgs-unstable pkgs-master; }; modules = with self.nixosModules; [ # important do not remove diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index df4a91d..df6e5e4 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -6,7 +6,7 @@ flake.nixosConfigurations.laptop = inputs.nixpkgs.lib.nixosSystem { #system = "x86_64-linux"; specialArgs = { - inherit (self) pkgs-unstable pkgs-local; + inherit (self) pkgs-unstable pkgs-local pkgs-master; }; modules = with self.nixosModules; [ # important do not remove From 579f832afed2ee1cbebe049f4e5742f992448f71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 20:19:04 +0200 Subject: [PATCH 05/18] hypr-dynamic-cursor: use nixpkgs master --- flake.lock | 339 ------------------------------ modules/applications/hyprland.nix | 4 +- modules/hosts/desktop.nix | 2 +- modules/hosts/laptop.nix | 2 +- 4 files changed, 4 insertions(+), 343 deletions(-) delete mode 100755 flake.lock diff --git a/flake.lock b/flake.lock deleted file mode 100755 index 586697c..0000000 --- a/flake.lock +++ /dev/null @@ -1,339 +0,0 @@ -{ - "nodes": { - "caelestia-cli": { - "inputs": { - "caelestia-shell": [ - "caelestia-shell" - ], - "nixpkgs": [ - "caelestia-shell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779768519, - "narHash": "sha256-2n/447oNfAZrl1yncafLPgXMx5tuTF6T2B+zI/zFYkI=", - "owner": "caelestia-dots", - "repo": "cli", - "rev": "64a5507e74f6c7d0c29f9131964412f8f8c4dd89", - "type": "github" - }, - "original": { - "owner": "caelestia-dots", - "repo": "cli", - "type": "github" - } - }, - "caelestia-shell": { - "inputs": { - "caelestia-cli": "caelestia-cli", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "quickshell": "quickshell" - }, - "locked": { - "lastModified": 1780196414, - "narHash": "sha256-iXmyWULTZuRd68xRL79e9GyYL9FZ6gfh6zl1PPlWX2A=", - "owner": "caelestia-dots", - "repo": "shell", - "rev": "63bb82762bb29ac9b7fcd5b97839abae721ce860", - "type": "github" - }, - "original": { - "owner": "caelestia-dots", - "repo": "shell", - "type": "github" - } - }, - "disko": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780290312, - "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", - "owner": "nix-community", - "repo": "disko", - "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "disko", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1778716662, - "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1780361225, - "narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "e28654b71096e08c019d4861ca26acb646f583d8", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-26.05", - "repo": "home-manager", - "type": "github" - } - }, - "import-tree": { - "locked": { - "lastModified": 1778781969, - "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", - "owner": "vic", - "repo": "import-tree", - "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", - "type": "github" - }, - "original": { - "owner": "vic", - "repo": "import-tree", - "type": "github" - } - }, - "microPlugins-vivify": { - "flake": false, - "locked": { - "lastModified": 1770382657, - "narHash": "sha256-yWmIgT90mC9PhzyH/itDbRMmRTiZiwW+Yo0dsHW7ni8=", - "ref": "refs/heads/main", - "rev": "3c5cb25facf3fc4143bfea9323a60eda65ef8485", - "revCount": 8, - "type": "git", - "url": "https://codeberg.org/gibbert/micro-vivify" - }, - "original": { - "type": "git", - "url": "https://codeberg.org/gibbert/micro-vivify" - } - }, - "nixos-grub-themes": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1769794759, - "narHash": "sha256-1doG74WkbtUpawduk9f8szyzWsw3Liblrh2z+2jQnw4=", - "owner": "jeslie0", - "repo": "nixos-grub-themes", - "rev": "5e75f9b3ea9061dca6c53d34e166e08bf9ebc7c7", - "type": "github" - }, - "original": { - "owner": "jeslie0", - "repo": "nixos-grub-themes", - "type": "github" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1702151865, - "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1777168982, - "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, - "nixpkgs-notifier": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1780489272, - "narHash": "sha256-hMWKTal0SqG2OdtT/wB6wj9jLaES40yJlUQAjtbjTpA=", - "owner": "tomasriveral", - "repo": "nixpkgs-notifier", - "rev": "276b61aecaf9c2700e7c3cb7310bac5c6a9e5b5a", - "type": "github" - }, - "original": { - "owner": "tomasriveral", - "repo": "nixpkgs-notifier", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1780453794, - "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "notewrapper": { - "inputs": { - "flake-utils": [ - "flake-utils" - ], - "nixpkgs": [ - "nixpkgs-unstable" - ] - }, - "locked": { - "lastModified": 1780404062, - "narHash": "sha256-XZziB7gcLwkhNyMoH8xDpwFktxBtzHx7zULyE4dHQfo=", - "owner": "tomasriveral", - "repo": "notewrapper", - "rev": "0f9ec32bfcfc4c111eaefe9e44d416afc79940ee", - "type": "github" - }, - "original": { - "owner": "tomasriveral", - "repo": "notewrapper", - "type": "github" - } - }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "caelestia-shell", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1779430452, - "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=", - "ref": "refs/heads/master", - "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00", - "revCount": 819, - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - }, - "original": { - "type": "git", - "url": "https://git.outfoxxed.me/outfoxxed/quickshell" - } - }, - "root": { - "inputs": { - "caelestia-shell": "caelestia-shell", - "disko": "disko", - "flake-parts": "flake-parts", - "flake-utils": "flake-utils", - "home-manager": "home-manager", - "import-tree": "import-tree", - "microPlugins-vivify": "microPlugins-vivify", - "nixos-grub-themes": "nixos-grub-themes", - "nixpkgs": "nixpkgs_2", - "nixpkgs-notifier": "nixpkgs-notifier", - "nixpkgs-unstable": "nixpkgs-unstable", - "notewrapper": "notewrapper" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index fd8275c..91fe532 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -55,7 +55,7 @@ ]; }; }; - flake.homeModules.hyprland = {pkgs-unstable, ...}: let + flake.homeModules.hyprland = {pkgs-unstable, pkgs-master, ...}: let wallpaper = ../../assets/wallpaper1.jpg; in { #refer to https://wiki.hypr.land/Nix/Hyprland-on-Home-Manager/ @@ -66,7 +66,7 @@ wayland.windowManager.hyprland.plugins = [ #pkgs-unstable.hyprlandPlugins.hyprspace # currently broken #self.packages.${pkgs-unstable.system}.hypr-dynamic-cursors-manual - #pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors # currently broken + pkgs-master.hyprlandPlugins.hypr-dynamic-cursors # currently broken ]; wayland.windowManager.hyprland.configType = "hyprlang"; wayland.windowManager.hyprland.settings = { diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index 9d978a1..d66941e 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -104,7 +104,7 @@ useUserPackages = true; extraSpecialArgs = { - inherit (self) pkgs-unstable; + inherit (self) pkgs-unstable pkgs-master; inherit self; }; }; diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index df6e5e4..1f5d426 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -104,7 +104,7 @@ useUserPackages = true; extraSpecialArgs = { - inherit (self) pkgs-unstable pkgs-local; + inherit (self) pkgs-unstable pkgs-local pkgs-master; inherit self; }; }; From 933478d820fde7057ca98a698cbd17a436a25d26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:36:17 +0200 Subject: [PATCH 06/18] hypr-dynamic-cursor: use nixpkgs unstable --- modules/applications/hyprland.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index 91fe532..b873802 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -55,7 +55,7 @@ ]; }; }; - flake.homeModules.hyprland = {pkgs-unstable, pkgs-master, ...}: let + flake.homeModules.hyprland = {pkgs-unstable, ...}: let wallpaper = ../../assets/wallpaper1.jpg; in { #refer to https://wiki.hypr.land/Nix/Hyprland-on-Home-Manager/ @@ -65,8 +65,7 @@ home.sessionVariables.NIXOS_OZONE_WL = "1"; wayland.windowManager.hyprland.plugins = [ #pkgs-unstable.hyprlandPlugins.hyprspace # currently broken - #self.packages.${pkgs-unstable.system}.hypr-dynamic-cursors-manual - pkgs-master.hyprlandPlugins.hypr-dynamic-cursors # currently broken + pkgs-unstable.hyprlandPlugins.hypr-dynamic-cursors ]; wayland.windowManager.hyprland.configType = "hyprlang"; wayland.windowManager.hyprland.settings = { From 9e5cac3a2dbbc1cd76a7cf9253baa69337b7e6c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 14:00:10 +0200 Subject: [PATCH 07/18] hyprland: exec on launch ngcp --- modules/applications/hyprland.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index b873802..3c9f9fa 100644 --- a/modules/applications/hyprland.nix +++ b/modules/applications/hyprland.nix @@ -278,6 +278,7 @@ #"custom-obsidianbackup" # backups the obsidian notes to kdrive and to a timed hidden dir (~/.Notes.backup/) #"QS-notifycache" # builds the cache that will be used for the notification history "sleep 4 & caelestia-shell" #works better if it sleeps a bit before + "sleep 20 && ngcp pull --automatic" # see github.com/tomasriveral/nix-git-cherry-picker /* We stopped using that ######################### maybe we should desactivate those scripts # login autostart From c2305331bbfd6fa88934b353e983ac2b01c896d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 14:02:25 +0200 Subject: [PATCH 08/18] ngcp: forgot home-module --- modules/hosts/desktop.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/hosts/desktop.nix b/modules/hosts/desktop.nix index d66941e..b46a235 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -65,6 +65,7 @@ librewolf mullvad neovim + nix-git-cherry-picker-desktop notewrapper oh-my-zsh ripgrep From ac11171bbf43a22b1b8e7ac46a5b01735aef906d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 15:55:16 +0200 Subject: [PATCH 09/18] remove lock --- flake.lock | 374 +++++++++++++++++++++++++++++ modules/applications/caelestia.nix | 16 +- 2 files changed, 375 insertions(+), 15 deletions(-) create mode 100644 flake.lock diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..7047fb7 --- /dev/null +++ b/flake.lock @@ -0,0 +1,374 @@ +{ + "nodes": { + "caelestia-cli": { + "inputs": { + "caelestia-shell": [ + "caelestia-shell" + ], + "nixpkgs": [ + "caelestia-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780375472, + "narHash": "sha256-Q8RAJoYlakA6B2I5DVcuxzNbhCNU1nnIjqQZYP1KGrM=", + "owner": "caelestia-dots", + "repo": "cli", + "rev": "d1c8c8fc09738d1b40576e97c274b4a11a2e0ac7", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "cli", + "type": "github" + } + }, + "caelestia-shell": { + "inputs": { + "caelestia-cli": "caelestia-cli", + "m3shapes": "m3shapes", + "nixpkgs": [ + "nixpkgs-unstable" + ], + "quickshell": "quickshell" + }, + "locked": { + "lastModified": 1780907625, + "narHash": "sha256-YH1LHLhoAlSmXmVz9qhY+QLFWbLVFJWSaPJ3ORr5grQ=", + "owner": "caelestia-dots", + "repo": "shell", + "rev": "66a9f2f220a9cc6a29ce4b66691f0117bdd35704", + "type": "github" + }, + "original": { + "owner": "caelestia-dots", + "repo": "shell", + "type": "github" + } + }, + "disko": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780894562, + "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=", + "owner": "nix-community", + "repo": "disko", + "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "disko", + "type": "github" + } + }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1778716662, + "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780883961, + "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-26.05", + "repo": "home-manager", + "type": "github" + } + }, + "import-tree": { + "locked": { + "lastModified": 1778781969, + "narHash": "sha256-Jjuz5CmSkur8KvLDoGa+vylEp+RkQtv4mt/qcMznpH0=", + "owner": "vic", + "repo": "import-tree", + "rev": "d321337efd0f23a9eb14a42adb7b2c29313ab274", + "type": "github" + }, + "original": { + "owner": "vic", + "repo": "import-tree", + "type": "github" + } + }, + "m3shapes": { + "flake": false, + "locked": { + "lastModified": 1777812556, + "narHash": "sha256-E5nqOucRQBWKuT31AMekmfgMywRdHgSbU86R7t4BKKA=", + "owner": "soramanew", + "repo": "m3shapes", + "rev": "356825d31f16052a782735cce264331cba0cb71b", + "type": "github" + }, + "original": { + "owner": "soramanew", + "repo": "m3shapes", + "rev": "356825d31f16052a782735cce264331cba0cb71b", + "type": "github" + } + }, + "microPlugins-vivify": { + "flake": false, + "locked": { + "lastModified": 1770382657, + "narHash": "sha256-yWmIgT90mC9PhzyH/itDbRMmRTiZiwW+Yo0dsHW7ni8=", + "ref": "refs/heads/main", + "rev": "3c5cb25facf3fc4143bfea9323a60eda65ef8485", + "revCount": 8, + "type": "git", + "url": "https://codeberg.org/gibbert/micro-vivify" + }, + "original": { + "type": "git", + "url": "https://codeberg.org/gibbert/micro-vivify" + } + }, + "nixos-grub-themes": { + "inputs": { + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1769794759, + "narHash": "sha256-1doG74WkbtUpawduk9f8szyzWsw3Liblrh2z+2jQnw4=", + "owner": "jeslie0", + "repo": "nixos-grub-themes", + "rev": "5e75f9b3ea9061dca6c53d34e166e08bf9ebc7c7", + "type": "github" + }, + "original": { + "owner": "jeslie0", + "repo": "nixos-grub-themes", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1702151865, + "narHash": "sha256-9VAt19t6yQa7pHZLDbil/QctAgVsA66DLnzdRGqDisg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "666fc80e7b2afb570462423cb0e1cf1a3a34fedd", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib": { + "locked": { + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixpkgs-master": { + "locked": { + "lastModified": 1780925806, + "narHash": "sha256-VHDhcCRPix1FlJpC/d3SSyb+QNLQLPDe1vcLdzIXqL0=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "ffe438e12d4a6643dcde460affbe82af0daa69c6", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-notifier": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1780489272, + "narHash": "sha256-hMWKTal0SqG2OdtT/wB6wj9jLaES40yJlUQAjtbjTpA=", + "owner": "tomasriveral", + "repo": "nixpkgs-notifier", + "rev": "276b61aecaf9c2700e7c3cb7310bac5c6a9e5b5a", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "nixpkgs-notifier", + "type": "github" + } + }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1780747962, + "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1780734595, + "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "notewrapper": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1780908812, + "narHash": "sha256-syxEJP0NNgVZYHp/zRVuz32VYf+ULD9itZk7V06SCos=", + "owner": "tomasriveral", + "repo": "notewrapper", + "rev": "e670ef935f0dd87dc8a8c6982147a9b8dce7565e", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "notewrapper", + "type": "github" + } + }, + "quickshell": { + "inputs": { + "nixpkgs": [ + "caelestia-shell", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1780303737, + "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=", + "ref": "refs/heads/master", + "rev": "b66495fcc5022681b56b61f928c7acbe910e722c", + "revCount": 821, + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + }, + "original": { + "type": "git", + "url": "https://git.outfoxxed.me/outfoxxed/quickshell" + } + }, + "root": { + "inputs": { + "caelestia-shell": "caelestia-shell", + "disko": "disko", + "flake-parts": "flake-parts", + "flake-utils": "flake-utils", + "home-manager": "home-manager", + "import-tree": "import-tree", + "microPlugins-vivify": "microPlugins-vivify", + "nixos-grub-themes": "nixos-grub-themes", + "nixpkgs": "nixpkgs_2", + "nixpkgs-master": "nixpkgs-master", + "nixpkgs-notifier": "nixpkgs-notifier", + "nixpkgs-unstable": "nixpkgs-unstable", + "notewrapper": "notewrapper" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/modules/applications/caelestia.nix b/modules/applications/caelestia.nix index 5c05b2b..f9a276b 100644 --- a/modules/applications/caelestia.nix +++ b/modules/applications/caelestia.nix @@ -15,21 +15,7 @@ programs.caelestia.settings.general.idle = { lockBeforeSleep = lib.mkForce false; inhibitWhenAudio = true; - timeouts = lib.mkForce [ - { - timeout = 180000; - idleAction = "lock"; - } - { - timeout = 300; - idleAction = "dpms off"; # what's that? - returnAction = "dpms on"; - } - { - timeout = 600; - idleAction = ["systemctl" "suspend-then-hibernate"]; - } - ]; + timeouts = lib.mkForce []; }; }; flake.homeModules.caelestia = _: let From 95d14041cc2fc30d8b206208e770bd903e23eec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:26:52 +0200 Subject: [PATCH 10/18] nix-git-cherry-picker: init --- modules/utilities/nixGitCherryPicker.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 modules/utilities/nixGitCherryPicker.nix diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix new file mode 100644 index 0000000..f1dc079 --- /dev/null +++ b/modules/utilities/nixGitCherryPicker.nix @@ -0,0 +1,18 @@ +{inputs, ...}: { + flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: { + home.packages = [ + inputs.nix-git-cherry-picker.packages.${pkgs.system}.default + ]; + home.file.".config/nix-git-cherry-picker/config.json" = { + enable = true; + text = '' + { + "localBranch": "desktop", + "remoteBranch": "laptop", + "nixConfigPath": "/home/tomasr/nixos/" + } + ''; + force = true; + }; + }; +} From 6d5ab8d831a4fdaac3c4d817cf2291bc6fb94d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:06:19 +0200 Subject: [PATCH 11/18] readd nix-git-cherry-picker to flake.nix --- flake.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/flake.nix b/flake.nix index 2dcc54e..49139ac 100644 --- a/flake.nix +++ b/flake.nix @@ -26,6 +26,11 @@ inputs.flake-utils.follows = "flake-utils"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; + nix-git-cherry-picker = { + url = "github:tomasriveral/nix-git-cherry-picker"; + inputs.flake-utils.follows = "flake-utils"; + inputs.nixpkgs.follows = "nixpkgs-unstable"; + }; caelestia-shell = { # based on quickshell. See https://github.com/caelestia-dots/shell url = "github:caelestia-dots/shell"; From 2ad6d8c16511574979ea4c8f140f433962c71ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:07:39 +0200 Subject: [PATCH 12/18] flake.lock change --- flake.lock | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/flake.lock b/flake.lock index 7047fb7..1e6a5c0 100644 --- a/flake.lock +++ b/flake.lock @@ -172,6 +172,29 @@ "url": "https://codeberg.org/gibbert/micro-vivify" } }, + "nix-git-cherry-picker": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1780927444, + "narHash": "sha256-VZnepj4G15sfpjM+CNgcPXMUpVkQ/cV7sKwP0ylgNfo=", + "owner": "tomasriveral", + "repo": "nix-git-cherry-picker", + "rev": "8e68a8473c04ae99650ab19408589628ee583290", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "nix-git-cherry-picker", + "type": "github" + } + }, "nixos-grub-themes": { "inputs": { "nixpkgs": "nixpkgs" @@ -345,6 +368,7 @@ "home-manager": "home-manager", "import-tree": "import-tree", "microPlugins-vivify": "microPlugins-vivify", + "nix-git-cherry-picker": "nix-git-cherry-picker", "nixos-grub-themes": "nixos-grub-themes", "nixpkgs": "nixpkgs_2", "nixpkgs-master": "nixpkgs-master", From 4ee868fbc6fc882955922dc7ec26acabe2c272f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:16:51 +0200 Subject: [PATCH 13/18] test commit from desktop --- test | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 0000000..6e946b7 --- /dev/null +++ b/test @@ -0,0 +1,8 @@ +I am testing the tool ngcp i created. If this file disapears. It means I coded it wrong. + + +The problem before was that it did: +1. cherry pick +2. push + +I didn't pulled changed before cherry picking From 2419bc4f82c66d5673157d5e0afe86fd00dd1ce0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:17:23 +0200 Subject: [PATCH 14/18] removed unused file --- todo | 59 ----------------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 todo diff --git a/todo b/todo deleted file mode 100644 index 6b9bdff..0000000 --- a/todo +++ /dev/null @@ -1,59 +0,0 @@ -audacity.x86_64 -dolphin.x86_64 may be customized or nautilus cust -ollama.x86_64 -plymouth.x86_64 -quickshell.x86_64 -raylib-devel.x86_64 -some notification daemon 0.12-32.fc43 -tor.x86_64 -torbrowser-launcher.noarch -maybe configure a bit ripgrep? majuscules - -organize packages in pkgs list - -why frameworktooltui settings dont apply? - -things to do? -(maybe something periodic) deadnix and aljandra to clean up the repo - -Review windowrules when only one window - -setup lsp in neovim - -Setup obsidian (plugsins, etc.) - -setup kdrive as a git remote - -setup tampermonkey - - -with quickshell: - fix player control icons - give battery percentage - maybe modify some of the images (like the notification body) - do a full bar (no ugly empty space at top) - add brightness slider - maybe change sound icon by volume level - maybe incorpore the fast fourier transform code - - - - maybe write some notification center -- done. needs some style - - battery dashboard https://www.reddit.com/r/hyprland/comments/1rkiajd/a_beautiful_battery_system_dashboard_on_hyprland/ - - have a small terminal popup for some usages (like custom-launch) - - some meteo center with dates, etc - - show name of the app - - make the connection tray prettier? Maybe with a full rewrite - - maybe some kind of overview? - - show battery percentage - - see what people did with quickshell and take inspiration - - work on quickshell color palette to match gruvbox From d8982fab43162950447bbd6861012e952ee90fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:27:33 +0200 Subject: [PATCH 15/18] snapshot pre-autoupdate-2026-06-08T14-27-33Z From 9a4b912e58b095f42e970d5bfed3da79349a1e21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:31:40 +0200 Subject: [PATCH 16/18] flake.lock: autoupdate-2026-06-08T14-27-33Z --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 1e6a5c0..f262f02 100644 --- a/flake.lock +++ b/flake.lock @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1780927444, - "narHash": "sha256-VZnepj4G15sfpjM+CNgcPXMUpVkQ/cV7sKwP0ylgNfo=", + "lastModified": 1780928816, + "narHash": "sha256-s4wU4nfs8xsXvwPtD0yebTPaOgmtDesmEvWuKFES6cE=", "owner": "tomasriveral", "repo": "nix-git-cherry-picker", - "rev": "8e68a8473c04ae99650ab19408589628ee583290", + "rev": "785b747ebca67f3e11b49ef5a85f9d3635bfe85d", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1780925806, - "narHash": "sha256-VHDhcCRPix1FlJpC/d3SSyb+QNLQLPDe1vcLdzIXqL0=", + "lastModified": 1780928217, + "narHash": "sha256-Cvq31DIGCKet/UFsJd20YIwCoZmX91xQBV5oiR1bU1k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffe438e12d4a6643dcde460affbe82af0daa69c6", + "rev": "2ef2f7e4a2999ffaab2ac987e69f5f8e29ec73cf", "type": "github" }, "original": { From 73637ebc1d4432125085839b7667edbf22b8ae6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:36:25 +0200 Subject: [PATCH 17/18] caelestia: separate idle settings per device --- modules/applications/caelestia.nix | 46 ++++++++++++++++-------------- modules/hosts/laptop.nix | 1 + 2 files changed, 25 insertions(+), 22 deletions(-) diff --git a/modules/applications/caelestia.nix b/modules/applications/caelestia.nix index f9a276b..0201499 100644 --- a/modules/applications/caelestia.nix +++ b/modules/applications/caelestia.nix @@ -10,12 +10,33 @@ quickshell # we have it but adding it there solves "WARN qt.qpa.services: Failed to register with host portal QDBusError("org.freedesktop.portal.Error.Failed", "Could not register app ID: App info not found for 'org.quickshell'")" ]; }; - flake.homeModules.caelestia-desktop = {lib, ...}: { + flake.homeModules.caelestia-desktop = _: { # for some reason nvidia drivers or I don't know what break the lock. (activate even when use, crash, etc.) programs.caelestia.settings.general.idle = { - lockBeforeSleep = lib.mkForce false; + lockBeforeSleep = false; inhibitWhenAudio = true; - timeouts = lib.mkForce []; + timeouts = []; + }; + }; + flake.homeModules.caelestia-laptop = _: { + programs.caelestia.settings.general.idle = { + lockBeforeSleep = true; + inhibitWhenAudio = true; + timeouts = [ + { + timeout = 180; + idleAction = "lock"; + } + { + timeout = 300; + idleAction = "dpms off"; # what's that? + returnAction = "dpms on"; + } + { + timeout = 600; + idleAction = ["systemctl" "suspend-then-hibernate"]; + } + ]; }; }; flake.homeModules.caelestia = _: let @@ -109,25 +130,6 @@ ]; criticalLevel = 3; }; - idle = { - lockBeforeSleep = true; - inhibitWhenAudio = true; - timeouts = [ - { - timeout = 180; - idleAction = "lock"; - } - { - timeout = 300; - idleAction = "dpms off"; # what's that? - returnAction = "dpms on"; - } - { - timeout = 600; - idleAction = ["systemctl" "suspend-then-hibernate"]; - } - ]; - }; }; background = { desktopClock = { diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index 1f5d426..106acb8 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -53,6 +53,7 @@ inputs.caelestia-shell.homeManagerModules.default anki caelestia + caelestia-laptop cursor development eza From eaa0698bc0c63a4fca6e2f2b5928fac92dab1829 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:52:50 +0200 Subject: [PATCH 18/18] matrix: changed all notif message to new unencrypted room --- modules/applications/kdrive.nix | 2 +- modules/utilities/autoCleanup.nix | 8 ++++---- modules/utilities/autoUpdate.nix | 8 ++++---- modules/utilities/communicationAndNotification.nix | 2 +- modules/utilities/development.nix | 2 +- modules/utilities/gitBackup.nix | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/modules/applications/kdrive.nix b/modules/applications/kdrive.nix index 356e006..e7cac9a 100644 --- a/modules/applications/kdrive.nix +++ b/modules/applications/kdrive.nix @@ -73,7 +73,7 @@ notify-send "rclone kdrive failed" "$output" matrix-commander-rs --verbose -m "rclone kdrive failed.
Error: 
$output

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" fi ''; }; diff --git a/modules/utilities/autoCleanup.nix b/modules/utilities/autoCleanup.nix index 9bf673d..4cd52a7 100644 --- a/modules/utilities/autoCleanup.nix +++ b/modules/utilities/autoCleanup.nix @@ -150,7 +150,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup. Everything OK.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Nix auto cleanup" "No changes" git -C "$FLAKE_DIR" push @@ -163,7 +163,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME" fi @@ -220,7 +220,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup. Everything OK.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Nix auto cleanup" "No changes" git -C "$FLAKE_DIR" push @@ -233,7 +233,7 @@ matrix-commander-rs --verbose -m "Nix auto cleanup failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-cleanup-$TIME" fi diff --git a/modules/utilities/autoUpdate.nix b/modules/utilities/autoUpdate.nix index 7bd8929..3c4fa78 100644 --- a/modules/utilities/autoUpdate.nix +++ b/modules/utilities/autoUpdate.nix @@ -130,7 +130,7 @@ matrix-commander-rs --verbose -m "Flake rebuild succesfull.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Flake autoupdate" "No changes" git -C "$FLAKE_DIR" push @@ -143,7 +143,7 @@ matrix-commander-rs --verbose -m "Flake rebuild failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME" fi @@ -191,7 +191,7 @@ matrix-commander-rs --verbose -m "Flake rebuild succesfull.
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" else notify-send "Flake autoupdate" "No changes" git -C "$FLAKE_DIR" push @@ -204,7 +204,7 @@ matrix-commander-rs --verbose -m "Flake rebuild failed.
Error: 
$ERROR_MSG

@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" git -C "$FLAKE_DIR" reset --hard "pre-autoupdate-$TIME" fi diff --git a/modules/utilities/communicationAndNotification.nix b/modules/utilities/communicationAndNotification.nix index d210a77..a9b845e 100644 --- a/modules/utilities/communicationAndNotification.nix +++ b/modules/utilities/communicationAndNotification.nix @@ -54,7 +54,7 @@ "Set your identity\n or remove this warning by removing the custom-gitnotify line in\n ~/nixos/modules/applications/hyprland.nix" matrix-commander-rs --verbose -m "Git not configured.
Set your identify or remove this warning by removing the custom-gitnotify in ~/nixos/modules/applications/hyprland.nix
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" fi ''; }; diff --git a/modules/utilities/development.nix b/modules/utilities/development.nix index 8ed33c9..d8cec56 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -47,7 +47,7 @@ "localNotify": true, "matrix": { "enable": true, - "room": "!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU", + "room": "!BXRRokBmEdNOyYdfOF:matrix.org", "ping": true, "userPing": "@notificationbot_0000", "userPingServer": "matrix.org" diff --git a/modules/utilities/gitBackup.nix b/modules/utilities/gitBackup.nix index 25eb7c8..08f9070 100644 --- a/modules/utilities/gitBackup.nix +++ b/modules/utilities/gitBackup.nix @@ -69,7 +69,7 @@ notify-send "Git Backup Failed" "$message" matrix-commander-rs --verbose -m "Git Backup Failed: $message
@notificationbot_0000" \ --html \ - -r "\!7j-78_02dHROeLj4Ns8F12eo4IiZGv4zNsQ_1-WlyIU" + -r "\!BXRRokBmEdNOyYdfOF:matrix.org" }