From 55ce1b656997881f8dc8a26f257d53b46f4f2e1b 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 01/17] 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 0a74596..23a0ce0 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"; @@ -64,8 +65,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 e973963..fe127bf 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 68bef6e250b13fbcef7b94df712a525acd943589 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sun, 7 Jun 2026 14:00:02 +0200 Subject: [PATCH 02/17] librewolf: add protondb search engine --- modules/applications/browser.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modules/applications/browser.nix b/modules/applications/browser.nix index fe79cf6..6841165 100644 --- a/modules/applications/browser.nix +++ b/modules/applications/browser.nix @@ -683,6 +683,14 @@ ]; definedAliases = ["on"]; }; + "ProtonDB" = { + urls = [ + { + template = "https://www.protondb.com/search?q={searchTerms}"; + } + ]; + definedAliases = ["pr"]; + }; }; }; }; From 774b7c0a7787e0c3b08102ac09ab97e481408d2a 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 03/17] hypr-dynamic-cursor: use nixpkgs master --- flake.lock | 20 ++++++++++++-------- modules/applications/hyprland.nix | 4 ++-- modules/hosts/desktop.nix | 2 +- modules/hosts/laptop.nix | 2 +- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 98d1feb..b79be45 100755 --- a/flake.lock +++ b/flake.lock @@ -203,16 +203,20 @@ "type": "github" } }, - "nixpkgs-local": { + "nixpkgs-master": { "locked": { - "lastModified": 1780728942, - "narHash": "sha256-NjXPlIssFzJ8vazKaihsW773r/Kq2TTby7FKBlbWIg4=", - "path": "/home/tomasr/devel/fugit2-gpgme", - "type": "path" + "lastModified": 1780855885, + "narHash": "sha256-EN3i7EgqzkNmqAzZ1u2H68mYV3VWzj+Oa/Nc1uVkNwY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a8d1e6ca61f01d3cb57c3b553bea3bccea1ef6be", + "type": "github" }, "original": { - "path": "/home/tomasr/devel/fugit2-gpgme", - "type": "path" + "owner": "nixos", + "ref": "master", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-notifier": { @@ -325,7 +329,7 @@ "microPlugins-vivify": "microPlugins-vivify", "nixos-grub-themes": "nixos-grub-themes", "nixpkgs": "nixpkgs_2", - "nixpkgs-local": "nixpkgs-local", + "nixpkgs-master": "nixpkgs-master", "nixpkgs-notifier": "nixpkgs-notifier", "nixpkgs-unstable": "nixpkgs-unstable", "notewrapper": "notewrapper" diff --git a/modules/applications/hyprland.nix b/modules/applications/hyprland.nix index e9e25d4..91c1cba 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 fe127bf..3342ebe 100644 --- a/modules/hosts/desktop.nix +++ b/modules/hosts/desktop.nix @@ -101,7 +101,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 efe30f4c1d36a55bd5083ef24600ab371678aa07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:08:35 +0200 Subject: [PATCH 04/17] nix-git-cherry-picker: init --- flake.lock | 24 ++++++++++++++++++++++++ flake.nix | 5 +++++ modules/hosts/laptop.nix | 1 + modules/utilities/nixGitCherryPicker.nix | 18 ++++++++++++++++++ 4 files changed, 48 insertions(+) create mode 100644 modules/utilities/nixGitCherryPicker.nix diff --git a/flake.lock b/flake.lock index b79be45..0a85d0e 100755 --- a/flake.lock +++ b/flake.lock @@ -154,6 +154,29 @@ "url": "https://codeberg.org/gibbert/micro-vivify" } }, + "nix-git-cherry-picker": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs-unstable" + ] + }, + "locked": { + "lastModified": 1780916435, + "narHash": "sha256-fVqBAaQroqNEDovWRSILm1GuRhssnd5G+IbZLjlsdUI=", + "owner": "tomasriveral", + "repo": "nix-git-cherry-picker", + "rev": "5ceff7e0a376c45278ad667c97a4dd3e6834eec0", + "type": "github" + }, + "original": { + "owner": "tomasriveral", + "repo": "nix-git-cherry-picker", + "type": "github" + } + }, "nixos-grub-themes": { "inputs": { "nixpkgs": "nixpkgs" @@ -327,6 +350,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", diff --git a/flake.nix b/flake.nix index 23a0ce0..bbdc9c3 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"; diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index 1f5d426..c55f940 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -65,6 +65,7 @@ librewolf mullvad neovim + nixGitCherryPicker-laptop notewrapper oh-my-zsh ripgrep diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix new file mode 100644 index 0000000..50769e6 --- /dev/null +++ b/modules/utilities/nixGitCherryPicker.nix @@ -0,0 +1,18 @@ +{inputs, ...}: { + flake.homeModules.nixGitCherryPicker-laptop = {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": "laptop", + "remoteBranch": "desktop", + "nixConfigPath": "~/nixos/" + } + ''; + force = true; + }; + }; +} From ad9f94fec2900b207b5c046293a9c56be61885e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:19:03 +0200 Subject: [PATCH 05/17] snapshot pre-autoupdate-2026-06-08T11-19-03Z --- modules/utilities/nixGitCherryPicker.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix index 50769e6..7baaf9c 100644 --- a/modules/utilities/nixGitCherryPicker.nix +++ b/modules/utilities/nixGitCherryPicker.nix @@ -9,7 +9,7 @@ { "localBranch": "laptop", "remoteBranch": "desktop", - "nixConfigPath": "~/nixos/" + "nixConfigPath": "/home/tomasr/nixos/" } ''; force = true; From c48d721d6461c2dc946522b926ddec10ebd3e8ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:28:59 +0200 Subject: [PATCH 06/17] flake.lock: autoupdate-2026-06-08T11-19-03Z --- flake.lock | 80 +++++++++++++++++++++++++++++++++--------------------- 1 file changed, 49 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 0a85d0e..d7ee28d 100755 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ ] }, "locked": { - "lastModified": 1779768519, - "narHash": "sha256-2n/447oNfAZrl1yncafLPgXMx5tuTF6T2B+zI/zFYkI=", + "lastModified": 1780375472, + "narHash": "sha256-Q8RAJoYlakA6B2I5DVcuxzNbhCNU1nnIjqQZYP1KGrM=", "owner": "caelestia-dots", "repo": "cli", - "rev": "64a5507e74f6c7d0c29f9131964412f8f8c4dd89", + "rev": "d1c8c8fc09738d1b40576e97c274b4a11a2e0ac7", "type": "github" }, "original": { @@ -27,17 +27,18 @@ "caelestia-shell": { "inputs": { "caelestia-cli": "caelestia-cli", + "m3shapes": "m3shapes", "nixpkgs": [ "nixpkgs-unstable" ], "quickshell": "quickshell" }, "locked": { - "lastModified": 1780196414, - "narHash": "sha256-iXmyWULTZuRd68xRL79e9GyYL9FZ6gfh6zl1PPlWX2A=", + "lastModified": 1780907625, + "narHash": "sha256-YH1LHLhoAlSmXmVz9qhY+QLFWbLVFJWSaPJ3ORr5grQ=", "owner": "caelestia-dots", "repo": "shell", - "rev": "63bb82762bb29ac9b7fcd5b97839abae721ce860", + "rev": "66a9f2f220a9cc6a29ce4b66691f0117bdd35704", "type": "github" }, "original": { @@ -53,11 +54,11 @@ ] }, "locked": { - "lastModified": 1780290312, - "narHash": "sha256-eTAlX0CwgB84Ts3GaBd944A3DRXVMzgA0EqroZBISUo=", + "lastModified": 1780894562, + "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=", "owner": "nix-community", "repo": "disko", - "rev": "115e5211780054d8a890b41f0b7734cafad54dfe", + "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc", "type": "github" }, "original": { @@ -109,11 +110,11 @@ ] }, "locked": { - "lastModified": 1780361225, - "narHash": "sha256-wnV9ttf4fPWNonBIQmvlrSlNpQYgx5HgWWd007mwIFA=", + "lastModified": 1780883961, + "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=", "owner": "nix-community", "repo": "home-manager", - "rev": "e28654b71096e08c019d4861ca26acb646f583d8", + "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa", "type": "github" }, "original": { @@ -138,6 +139,23 @@ "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": { @@ -164,11 +182,11 @@ ] }, "locked": { - "lastModified": 1780916435, - "narHash": "sha256-fVqBAaQroqNEDovWRSILm1GuRhssnd5G+IbZLjlsdUI=", + "lastModified": 1780917521, + "narHash": "sha256-s48uoWp/nOjEruEjmjlsVVjsur0eHrg8zDYvSa7DOD0=", "owner": "tomasriveral", "repo": "nix-git-cherry-picker", - "rev": "5ceff7e0a376c45278ad667c97a4dd3e6834eec0", + "rev": "6a0c9f4d015be6dba476ce8e906f6cab2c9f041d", "type": "github" }, "original": { @@ -228,11 +246,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1780855885, - "narHash": "sha256-EN3i7EgqzkNmqAzZ1u2H68mYV3VWzj+Oa/Nc1uVkNwY=", + "lastModified": 1780916829, + "narHash": "sha256-EnGvOxMut58uth93COby/iWBCGh4JOL1Q+/RISSmHPA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a8d1e6ca61f01d3cb57c3b553bea3bccea1ef6be", + "rev": "5d47015d2d28f27ae1917f0302a9b1510fe42412", "type": "github" }, "original": { @@ -267,11 +285,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", + "lastModified": 1780747962, + "narHash": "sha256-IX7G1dlKrOqPOImfbo7ADDfV5yU1+j+MRChI3TL4tAA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", + "rev": "cbb5cf358f50aa6acc9efd6113b7bcfbc352cd73", "type": "github" }, "original": { @@ -283,11 +301,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1780453794, - "narHash": "sha256-bXMRa9VTsHSPXL4Cw8R6JJLQeY3Y/IP4+YJCYVmQ7FY=", + "lastModified": 1780734595, + "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6b316287bae2ee04c9b93c8c858d930fd07d7338", + "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943", "type": "github" }, "original": { @@ -307,11 +325,11 @@ ] }, "locked": { - "lastModified": 1780404062, - "narHash": "sha256-XZziB7gcLwkhNyMoH8xDpwFktxBtzHx7zULyE4dHQfo=", + "lastModified": 1780908812, + "narHash": "sha256-syxEJP0NNgVZYHp/zRVuz32VYf+ULD9itZk7V06SCos=", "owner": "tomasriveral", "repo": "notewrapper", - "rev": "0f9ec32bfcfc4c111eaefe9e44d416afc79940ee", + "rev": "e670ef935f0dd87dc8a8c6982147a9b8dce7565e", "type": "github" }, "original": { @@ -328,11 +346,11 @@ ] }, "locked": { - "lastModified": 1779430452, - "narHash": "sha256-zTslhsxLqUlRTML506iougTGzyR38Fzhzn7t4KDEuuE=", + "lastModified": 1780303737, + "narHash": "sha256-7HgdJBG4BgAPDyHKKxWtxj7nziqsQo6zQCXtwy+L9fs=", "ref": "refs/heads/master", - "rev": "4b4fca3224ab977dc515ac0bb78d00b3dfa71e00", - "revCount": 819, + "rev": "b66495fcc5022681b56b61f928c7acbe910e722c", + "revCount": 821, "type": "git", "url": "https://git.outfoxxed.me/outfoxxed/quickshell" }, From d0c547d2e0b3049c50bfd5606aef8fe7465de1e7 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 07/17] 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 91c1cba..da4d0fd 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 a5e7dea0539b1748eb0e82f16f138762fcd16dd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:42:02 +0200 Subject: [PATCH 08/17] snapshot pre-autoupdate-2026-06-08T11-42-02Z From 72cee5b89127ea5666b135a5d0bc39ef28308373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 13:42:51 +0200 Subject: [PATCH 09/17] flake.lock: autoupdate-2026-06-08T11-42-02Z --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index d7ee28d..e1e9d8f 100755 --- a/flake.lock +++ b/flake.lock @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1780917521, - "narHash": "sha256-s48uoWp/nOjEruEjmjlsVVjsur0eHrg8zDYvSa7DOD0=", + "lastModified": 1780918439, + "narHash": "sha256-DRWxjChA9dgxnl+hwP45mNqAlFs93p8GGKi5fK5mS3Q=", "owner": "tomasriveral", "repo": "nix-git-cherry-picker", - "rev": "6a0c9f4d015be6dba476ce8e906f6cab2c9f041d", + "rev": "2830e324980f129e762fb1a3806c8b2361b379aa", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1780916829, - "narHash": "sha256-EnGvOxMut58uth93COby/iWBCGh4JOL1Q+/RISSmHPA=", + "lastModified": 1780918212, + "narHash": "sha256-BhmvQG/PYXHq90emIiO3LShOKccarKfiEIY3h35iljE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5d47015d2d28f27ae1917f0302a9b1510fe42412", + "rev": "815e8f98dfe4a7958a29577110a32dc8a42ec8bb", "type": "github" }, "original": { From f28ba6b799a56dcbad1b8ff165a408bb7a01af76 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 10/17] 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 da4d0fd..6dbf98e 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 8207e1502cdb79fb167c6de4c2e26b814c2b047c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:06:55 +0200 Subject: [PATCH 11/17] snapshot pre-autoupdate-2026-06-08T14-06-55Z From 8a7908a5c9c65dfc689a9202ccbaa757fba8741c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:07:33 +0200 Subject: [PATCH 12/17] flake.lock: autoupdate-2026-06-08T14-06-55Z --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e1e9d8f..b788d1c 100755 --- a/flake.lock +++ b/flake.lock @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1780918439, - "narHash": "sha256-DRWxjChA9dgxnl+hwP45mNqAlFs93p8GGKi5fK5mS3Q=", + "lastModified": 1780927444, + "narHash": "sha256-VZnepj4G15sfpjM+CNgcPXMUpVkQ/cV7sKwP0ylgNfo=", "owner": "tomasriveral", "repo": "nix-git-cherry-picker", - "rev": "2830e324980f129e762fb1a3806c8b2361b379aa", + "rev": "8e68a8473c04ae99650ab19408589628ee583290", "type": "github" }, "original": { @@ -246,11 +246,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1780918212, - "narHash": "sha256-BhmvQG/PYXHq90emIiO3LShOKccarKfiEIY3h35iljE=", + "lastModified": 1780926862, + "narHash": "sha256-NvealBhVt7NWU9T7ad0kgStkuex0ebX9UeXoieTZkLA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "815e8f98dfe4a7958a29577110a32dc8a42ec8bb", + "rev": "76b2cdf22fd6fa83c0a21b830e5a40fe9ad6f180", "type": "github" }, "original": { From 6a937f38635659acf6d50a5a39292e21872e5e4d 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 13/17] 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 4bd062032ff28c8045b51d2f366cf5ba2029f15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:27:05 +0200 Subject: [PATCH 14/17] snapshot pre-autoupdate-2026-06-08T14-27-05Z From c128995bea76103fe98dd2f631fff134fa87306b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Mon, 8 Jun 2026 16:27:34 +0200 Subject: [PATCH 15/17] flake.lock: autoupdate-2026-06-08T14-27-05Z --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index b788d1c..f262f02 100755 --- 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": 1780926862, - "narHash": "sha256-NvealBhVt7NWU9T7ad0kgStkuex0ebX9UeXoieTZkLA=", + "lastModified": 1780928217, + "narHash": "sha256-Cvq31DIGCKet/UFsJd20YIwCoZmX91xQBV5oiR1bU1k=", "owner": "nixos", "repo": "nixpkgs", - "rev": "76b2cdf22fd6fa83c0a21b830e5a40fe9ad6f180", + "rev": "2ef2f7e4a2999ffaab2ac987e69f5f8e29ec73cf", "type": "github" }, "original": { From fdbc3e1a793e7f44a61f1355eb0c96aa361ca8e6 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 16/17] caelestia: separate idle settings per device --- modules/applications/caelestia.nix | 48 ++++++++++++++++++------------ modules/hosts/laptop.nix | 1 + 2 files changed, 30 insertions(+), 19 deletions(-) diff --git a/modules/applications/caelestia.nix b/modules/applications/caelestia.nix index ed78607..0201499 100644 --- a/modules/applications/caelestia.nix +++ b/modules/applications/caelestia.nix @@ -10,6 +10,35 @@ 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 = _: { + # 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 = false; + inhibitWhenAudio = true; + 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 sisyphe = ../../assets/sisyphe.gif; pepe-music = ../../assets/pepe-music.gif; @@ -101,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 c55f940..f6b1400 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 9125dfddefd214fc49deac3f6df1603d8ff328b5 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 17/17] 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 2682b89..40e55ef 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 b02c10e..5767c0f 100644 --- a/modules/utilities/development.nix +++ b/modules/utilities/development.nix @@ -46,7 +46,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" }