From 5039b2a37c564aaad449a89280b67db6744e719d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Fri, 12 Jun 2026 16:18:16 +0200 Subject: [PATCH 01/14] snapshot pre-autoupdate-2026-06-12T14-18-16Z From 247174146299edefce435a1dbce2fcb0c7d7ca4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:19:09 +0200 Subject: [PATCH 02/14] snapshot pre-autoupdate-2026-06-13T07-19-09Z From 406baf2a5dac332cdf6300cbfded62252d8d4514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:21:11 +0200 Subject: [PATCH 03/14] merge conflict handled --- modules/utilities/nixGitCherryPicker.nix | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/modules/utilities/nixGitCherryPicker.nix b/modules/utilities/nixGitCherryPicker.nix index 8b13c75..bd649ce 100644 --- a/modules/utilities/nixGitCherryPicker.nix +++ b/modules/utilities/nixGitCherryPicker.nix @@ -1,5 +1,4 @@ {inputs, ...}: { -<<<<<<< desktop flake.homeModules.nix-git-cherry-picker-laptop = {pkgs, ...}: { home.packages = [ inputs.nix-git-cherry-picker.packages.${pkgs.system}.default @@ -16,25 +15,6 @@ force = true; }; }; - flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: { -======= - flake.homeModules.nixGitCherryPicker-laptop = {pkgs, ...}: { ->>>>>>> main - 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": "/home/tomasr/nixos/" - } - ''; - force = true; - }; - }; flake.homeModules.nix-git-cherry-picker-desktop = {pkgs, ...}: { home.packages = [ inputs.nix-git-cherry-picker.packages.${pkgs.system}.default From e4eb23f10f38a09b1dba615869c5f3a2b65416a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:21:11 +0200 Subject: [PATCH 04/14] merge conflict handled --- modules/hosts/laptop.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/hosts/laptop.nix b/modules/hosts/laptop.nix index 0ff6de1..13553ba 100644 --- a/modules/hosts/laptop.nix +++ b/modules/hosts/laptop.nix @@ -69,7 +69,7 @@ librewolf mullvad neovim - nixGitCherryPicker-laptop + nix-git-cherry-picker-laptop notewrapper oh-my-zsh ripgrep From 66ff0dc4066b39555d2d82ecca5c452f15d78372 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:26:20 +0200 Subject: [PATCH 05/14] flake-parts: use flakehub cache --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e491ce5..caa546f 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ }; */ flake-parts = { - url = "github:hercules-ci/flake-parts"; + url = "https://flakehub.com/f/hercules-ci/flake-parts/*"; # flakehub caches results }; import-tree.url = "github:vic/import-tree"; # imports ./modules recursively }; From 065012ed84231600709bb606bbf9950933639a83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:27:44 +0200 Subject: [PATCH 06/14] flake-utils: use flakehub cache --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index caa546f..e4b3891 100644 --- a/flake.nix +++ b/flake.nix @@ -13,7 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; flake-utils = { - url = "github:numtide/flake-utils"; + url = "https://flakehub.com/f/numtide/flake-utils/*"; # flakehub caches results }; notewrapper = { url = "github:tomasriveral/notewrapper"; From 3b30916261fa586ac3007d62c2c90e83c5eb9210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:29:14 +0200 Subject: [PATCH 07/14] flake.lock: update --- flake.lock | 38 ++++++++++---------------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 2df4118..88f782c 100644 --- a/flake.lock +++ b/flake.lock @@ -74,15 +74,14 @@ "locked": { "lastModified": 1778716662, "narHash": "sha256-m1Yf0wZ8j1OHjTc2UwHwyQRSnNeSgLJOd7q5Y45hzi4=", - "owner": "hercules-ci", - "repo": "flake-parts", "rev": "f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb", - "type": "github" + "revCount": 475, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/hercules-ci/flake-parts/0.1.475%2Brev-f7c1a2d347e4c52d5fb8d10cb4d94b5884e546fb/019e2533-0324-7e90-93eb-29b02e1a61cd/source.tar.gz" }, "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/hercules-ci/flake-parts/%2A" } }, "flake-utils": { @@ -92,15 +91,14 @@ "locked": { "lastModified": 1731533236, "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" + "revCount": 102, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/numtide/flake-utils/0.1.102%2Brev-11707dc2f618dd54ca8739b309ec4fc024de578b/0193276d-5b8f-7dbc-acf1-41cb7b54ad2e/source.tar.gz" }, "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" + "type": "tarball", + "url": "https://flakehub.com/f/numtide/flake-utils/%2A" } }, "home-manager": { @@ -265,22 +263,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1780902259, - "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, "notewrapper": { "inputs": { "flake-utils": [ From 4bf8fe10c9a38d1a01d78afcc3436a2a898ee266 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:30:14 +0200 Subject: [PATCH 08/14] snapshot pre-autoupdate-2026-06-13T07-30-14Z From 89c87b82427fb4a435e2ea2a95ca427bfdae20e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:34:56 +0200 Subject: [PATCH 09/14] flake.lock: autoupdate-2026-06-13T07-30-14Z --- flake.lock | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 88f782c..76f78c7 100644 --- a/flake.lock +++ b/flake.lock @@ -34,11 +34,11 @@ "quickshell": "quickshell" }, "locked": { - "lastModified": 1780996864, - "narHash": "sha256-OIDk3FiSKjYLV4Dvfv6fMeVcV3Dk9+MBBKTORNqMsUg=", + "lastModified": 1781178648, + "narHash": "sha256-z6V1T7MHShM7TfFIMCDp94Bi1Wk9LJfK96vm8YFGY5M=", "owner": "caelestia-dots", "repo": "shell", - "rev": "c46593d438a75fce42f28529662b678b79d94693", + "rev": "a16c957a8bd13e0cfd09928ca0a22fecd3681e44", "type": "github" }, "original": { @@ -54,11 +54,11 @@ ] }, "locked": { - "lastModified": 1780894562, - "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=", + "lastModified": 1781152676, + "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=", "owner": "nix-community", "repo": "disko", - "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc", + "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1", "type": "github" }, "original": { @@ -108,11 +108,11 @@ ] }, "locked": { - "lastModified": 1780883961, - "narHash": "sha256-WU6SUrESuPiEXEUvX4D51AgWrXRJty+sLJBwBaDBGqE=", + "lastModified": 1781319724, + "narHash": "sha256-ZGuxexEMo4Xv28KJ0dX/m/PHN4oZIOnxHZpNTyrvx4M=", "owner": "nix-community", "repo": "home-manager", - "rev": "4eb4fec41674d5b059aa2eedf0f98453890546fa", + "rev": "8355f0a16b2dbb06a97959a918af5b239bbe05ae", "type": "github" }, "original": { @@ -140,17 +140,17 @@ "m3shapes": { "flake": false, "locked": { - "lastModified": 1777812556, - "narHash": "sha256-E5nqOucRQBWKuT31AMekmfgMywRdHgSbU86R7t4BKKA=", + "lastModified": 1781017666, + "narHash": "sha256-kfHyzZaPHgqZML48OA+5JwBOsLdQJ2ci/aGPShvUB4Y=", "owner": "soramanew", "repo": "m3shapes", - "rev": "356825d31f16052a782735cce264331cba0cb71b", + "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6", "type": "github" }, "original": { "owner": "soramanew", "repo": "m3shapes", - "rev": "356825d31f16052a782735cce264331cba0cb71b", + "rev": "bdc327b29f95394a732baf3c9b19658ba23755b6", "type": "github" } }, @@ -179,11 +179,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780734595, - "narHash": "sha256-DmTfP92QFYRLOGXlMIE54MAgxSJjDWocl3gRNOu72Os=", + "lastModified": 1780902259, + "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9b696460ac78b5ccfc17c854d8c976f20456e943", + "rev": "bd0ff2d3eac24699c3664d5966b9ef36f388e2ca", "type": "github" }, "original": { @@ -210,11 +210,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1780997039, - "narHash": "sha256-8pPXOCZkrySE3zwtix2MYxm9NzzHT/XQr0mHJsf3lis=", + "lastModified": 1781334907, + "narHash": "sha256-UiFcXd+Qrb7oaNPhXqMty2lSRSFBNtz6LhQLNDuQ4w8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "872eb0174d0d5a1bc37388ff84eea2bca44b1065", + "rev": "d34e9cd74d51daeadd9724178281ac380893f8ac", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1780489272, - "narHash": "sha256-hMWKTal0SqG2OdtT/wB6wj9jLaES40yJlUQAjtbjTpA=", + "lastModified": 1781273662, + "narHash": "sha256-50dd7Cs1mUHq1srw7UojdzCYOB4TfrIXMv7XHHPU9zw=", "owner": "tomasriveral", "repo": "nixpkgs-notifier", - "rev": "276b61aecaf9c2700e7c3cb7310bac5c6a9e5b5a", + "rev": "12183f26e8b196d9906f82dc05f9672793c61038", "type": "github" }, "original": { @@ -249,11 +249,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1780930886, - "narHash": "sha256-rppURzHviaQN131F+nLiLdGfcb0uCd9gGP0E5+iw9MI=", + "lastModified": 1781268102, + "narHash": "sha256-Zn5KTggEmUB3lXn/ccERNcBdddE6IaOFber9dWViWDg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c3cede7ddc26bd659d2d383b5610efbd2c7a16e", + "rev": "49a4bd0573c376468dd7996ddb6f9fa31d8c4d97", "type": "github" }, "original": { @@ -297,11 +297,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1780942898, - "narHash": "sha256-cP4gUX4YE1kFe+15Zd1CbqL08XytPm1UXZuaXjYLG94=", + "lastModified": 1781158593, + "narHash": "sha256-zxlheX4o1MK00dkYzoXm7Srj5SD9iOCSp4N7f1iShr0=", "owner": "r14dd", "repo": "patent", - "rev": "bbad654b6b65264d2ba267b5c87e8be0bd89b78e", + "rev": "68772d068088d62a030619090959165af5e71ed1", "type": "github" }, "original": { From ff1469dea25c543f3acda52508e840c03a38ac66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:37:01 +0200 Subject: [PATCH 10/14] nixpkgs-master: follow unstable when unused --- flake.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e4b3891..ffcc356 100644 --- a/flake.nix +++ b/flake.nix @@ -4,7 +4,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-26.05"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; # used for some packages - nixpkgs-master.url = "github:nixos/nixpkgs/master"; # used with precaution as they are untested and not cached + + # Only uncomment when needed. This uses a lot of space and compute ressources for sometimes not that much. If not used, make it follow unstable + nixpkgs-master.follows = "nixpkgs-unstable"; + #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"; From c32e8112c693d4ab8247572c60fb569fc9f91bcd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:37:38 +0200 Subject: [PATCH 11/14] flake.lock: update --- flake.lock | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index 76f78c7..f68edf3 100644 --- a/flake.lock +++ b/flake.lock @@ -208,22 +208,6 @@ "type": "github" } }, - "nixpkgs-master": { - "locked": { - "lastModified": 1781334907, - "narHash": "sha256-UiFcXd+Qrb7oaNPhXqMty2lSRSFBNtz6LhQLNDuQ4w8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d34e9cd74d51daeadd9724178281ac380893f8ac", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "master", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-notifier": { "inputs": { "flake-utils": [ @@ -341,7 +325,9 @@ "import-tree": "import-tree", "nix-git-cherry-picker": "nix-git-cherry-picker", "nixpkgs": "nixpkgs", - "nixpkgs-master": "nixpkgs-master", + "nixpkgs-master": [ + "nixpkgs-unstable" + ], "nixpkgs-notifier": "nixpkgs-notifier", "nixpkgs-unstable": "nixpkgs-unstable", "notewrapper": "notewrapper", From 6525d6d5999411a0aafd669e072b4133d532d637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:41:05 +0200 Subject: [PATCH 12/14] librewolf: add temp-mail.org bookmark --- modules/applications/browser.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/modules/applications/browser.nix b/modules/applications/browser.nix index 8cad7d4..e110a54 100644 --- a/modules/applications/browser.nix +++ b/modules/applications/browser.nix @@ -386,6 +386,12 @@ keyword = "nix reference manual"; url = "https://nix.dev/manual/nix/2.34/nix-2.34.html"; } + { + name = "Disposable temporary email"; + tags = ["privacy" "email" "temporary"]; + keyword = "disposable temporary email"; + url = "https://temp-mail.org"; + } ]; }; search = { @@ -622,6 +628,17 @@ # }; #}; }; + bookmarks = { + force = true; + settings = [ + { + name = "Disposable temporary email"; + tags = ["privacy" "email" "temporary"]; + keyword = "disposable temporary email"; + url = "https://temp-mail.org"; + } + ]; + }; search = { force = true; default = "quant"; From ba4727f4532a298cde729c72d9ee1157dcb9f498 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:43:10 +0200 Subject: [PATCH 13/14] librewolf: add r/Piracy megathread bookmark --- modules/applications/browser.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/applications/browser.nix b/modules/applications/browser.nix index e110a54..52f65a7 100644 --- a/modules/applications/browser.nix +++ b/modules/applications/browser.nix @@ -637,6 +637,12 @@ keyword = "disposable temporary email"; url = "https://temp-mail.org"; } + { + name = "r/Piracy megathread"; + tags = ["piracy" "megathread" "reddit"]; + keyword = "piracy megathread"; + url = "https://old.reddit.com/r/Piracy/wiki/megathread"; + } ]; }; search = { From a140ce95604c1d0648bcb9623afe10b5c4419be1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20Rivera?= Date: Sat, 13 Jun 2026 09:45:00 +0200 Subject: [PATCH 14/14] librewolf: add rryan-tm logs bookmark --- modules/applications/browser.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/applications/browser.nix b/modules/applications/browser.nix index 52f65a7..db75d9f 100644 --- a/modules/applications/browser.nix +++ b/modules/applications/browser.nix @@ -392,6 +392,12 @@ keyword = "disposable temporary email"; url = "https://temp-mail.org"; } + { + name = "nix-update-script Rryan-tm logs"; + tags = ["nixpkgs" "nix" "log" "rryan-tm"]; + keyword = "rryan-tm logs"; + url = "https://nixpkgs-update-logs.nix-community.org"; + } ]; }; search = {