Merge branch 'main' into feature/add-parthenon

Merge pull request 'automated: Update flake.lock' (#125 ) from update-flake-lock into main
Reviewed-on: #125
2025-07-04 00:58:37 -04:00 · 2025-07-04 00:58:29 -04:00 · 2025-07-04 00:55:53 -04:00 · 2025-07-03 12:15:15 +00:00 · 2025-06-29 18:01:50 -04:00 · 2025-06-29 18:01:50 -04:00
4 changed files with 75 additions and 72 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -37,11 +37,11 @@
    "base16-helix": {
      "flake": false,
      "locked": {
-        "lastModified": 1736852337,
-        "narHash": "sha256-esD42YdgLlEh7koBrSqcT7p2fsMctPAcGl/+2sYJa2o=",
+        "lastModified": 1748408240,
+        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
        "owner": "tinted-theming",
        "repo": "base16-helix",
-        "rev": "03860521c40b0b9c04818f2218d9cc9efc21e7a5",
+        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
        "type": "github"
      },
      "original": {
@@ -75,11 +75,11 @@
      },
      "locked": {
        "dir": "pkgs/firefox-addons",
-        "lastModified": 1748730131,
-        "narHash": "sha256-QHKZlwzw80hoJkNGXQePIg4u109lqcodALkont2WJAc=",
+        "lastModified": 1751515409,
+        "narHash": "sha256-yu+/TxHkuZ8GHKwpKTv1BpfbYD1wH1CyPsOmY72chTg=",
        "owner": "rycee",
        "repo": "nur-expressions",
-        "rev": "aa7bfc2ec4763b57386fcd50242c390a596b9bb0",
+        "rev": "2e0dcafe8c48470e036908f34a2a1413f75bd804",
        "type": "gitlab"
      },
      "original": {
@@ -92,11 +92,11 @@
    "firefox-gnome-theme": {
      "flake": false,
      "locked": {
-        "lastModified": 1744642301,
-        "narHash": "sha256-5A6LL7T0lttn1vrKsNOKUk9V0ittdW0VEqh6AtefxJ4=",
+        "lastModified": 1748383148,
+        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
        "owner": "rafaelmardojai",
        "repo": "firefox-gnome-theme",
-        "rev": "59e3de00f01e5adb851d824cf7911bd90c31083a",
+        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
        "type": "github"
      },
      "original": {
@@ -124,11 +124,11 @@
        "nixpkgs-lib": "nixpkgs-lib"
      },
      "locked": {
-        "lastModified": 1743550720,
-        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
+        "lastModified": 1751413152,
+        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
+        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
        "type": "github"
      },
      "original": {
@@ -145,11 +145,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1733312601,
-        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
        "type": "github"
      },
      "original": {
@@ -207,11 +207,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1742649964,
-        "narHash": "sha256-DwOTp7nvfi8mRfuL1escHDXabVXFGT1VlPD1JHrtrco=",
+        "lastModified": 1747372754,
+        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "dcf5072734cb576d2b0c59b2ac44f5050b5eac82",
+        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
        "type": "github"
      },
      "original": {
@@ -266,16 +266,16 @@
    "gnome-shell": {
      "flake": false,
      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
+        "lastModified": 1748186689,
+        "narHash": "sha256-UaD7Y9f8iuLBMGHXeJlRu6U1Ggw5B9JnkFs3enZlap0=",
        "owner": "GNOME",
        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
+        "rev": "8c88f917db0f1f0d80fa55206c863d3746fa18d0",
        "type": "github"
      },
      "original": {
        "owner": "GNOME",
-        "ref": "48.1",
+        "ref": "48.2",
        "repo": "gnome-shell",
        "type": "github"
      }
@@ -287,11 +287,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748737919,
-        "narHash": "sha256-5kvBbLYdp+n7Ftanjcs6Nv+UO6sBhelp6MIGJ9nWmjQ=",
+        "lastModified": 1751513147,
+        "narHash": "sha256-idSXM3Y0KNf/WDDqGfthiOSQMwZYwis1JZhTkdWrr6A=",
        "owner": "nix-community",
        "repo": "home-manager",
-        "rev": "5675a9686851d9626560052a032c4e14e533c1fa",
+        "rev": "426b405d979d893832549b95f23c13537c65d244",
        "type": "github"
      },
      "original": {
@@ -330,11 +330,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747572947,
-        "narHash": "sha256-PMQoXbfmWPuXnF8EaWqRmvTvl7+WFUrDVgufFRPgOM4=",
+        "lastModified": 1750372088,
+        "narHash": "sha256-LPwgPRBTfnA76rHUr7KYvwq2pNt5IfxymNAZUJFvn/M=",
        "owner": "hyprwm",
        "repo": "contrib",
-        "rev": "910dad4c5755c1735d30da10c96d9086aa2a608d",
+        "rev": "189f32f56285aae9646bf1292976392beba5a2e2",
        "type": "github"
      },
      "original": {
@@ -383,11 +383,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748751003,
-        "narHash": "sha256-i4GZdKAK97S0ZMU3w4fqgEJr0cVywzqjugt2qZPrScs=",
+        "lastModified": 1751170039,
+        "narHash": "sha256-3EKpUmyGmHYA/RuhZjINTZPU+OFWko0eDwazUOW64nw=",
        "owner": "Mic92",
        "repo": "nix-index-database",
-        "rev": "2860bee699248d828c2ed9097a1cd82c2f991b43",
+        "rev": "9c932ae632d6b5150515e5749b198c175d8565db",
        "type": "github"
      },
      "original": {
@@ -427,11 +427,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748776124,
-        "narHash": "sha256-vs2cMCHX9wnWJutXhQyWkWOpMF/Xbw0ZAUAFGsKLifA=",
+        "lastModified": 1751281697,
+        "narHash": "sha256-abHhTXGEGYhCKOc9vQbqHFG7dxwJ6AudIy1h4MUsjm0=",
        "owner": "lilyinstarlight",
        "repo": "nixos-cosmic",
-        "rev": "e989a41092f6f0375e7afb789bc97cb30d01fdb8",
+        "rev": "78b86e37713a1111d9e37c62b242d60be3013bd1",
        "type": "github"
      },
      "original": {
@@ -463,11 +463,11 @@
    },
    "nixos-hardware": {
      "locked": {
-        "lastModified": 1748634340,
-        "narHash": "sha256-pZH4bqbOd8S+si6UcfjHovWDiWKiIGRNRMpmRWaDIms=",
+        "lastModified": 1751432711,
+        "narHash": "sha256-136MeWtckSHTN9Z2WRNRdZ8oRP3vyx3L8UxeBYE+J9w=",
        "owner": "NixOS",
        "repo": "nixos-hardware",
-        "rev": "daa628a725ab4948e0e2b795e8fb6f4c3e289a7a",
+        "rev": "497ae1357f1ac97f1aea31a4cb74ad0d534ef41f",
        "type": "github"
      },
      "original": {
@@ -486,11 +486,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748287559,
-        "narHash": "sha256-dvUE9HGwzEXyv6G7LuZFQCmRYFuXLJBO4+crCTxe5zs=",
+        "lastModified": 1751469444,
+        "narHash": "sha256-L5vPflQCt7WWzL66cA0ZbITfg+vzrSf6Ak5m4s6vDds=",
        "owner": "SuperSandro2000",
        "repo": "nixos-modules",
-        "rev": "9ae063877f8c5d42c39b739ae1d00f9657ad17f4",
+        "rev": "ed24075c9b4d1cedac253f31aaa2d4729d4fdf53",
        "type": "github"
      },
      "original": {
@@ -501,11 +501,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1748762463,
-        "narHash": "sha256-rb8vudY2u0SgdWh83SAhM5QZT91ZOnvjOLGTO4pdGTc=",
+        "lastModified": 1751529439,
+        "narHash": "sha256-fn4qiux6lOX2MEB5VU/KFUhjc4HuQON2SexwJnC1ibc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0d0bc640d371e9e8c9914c42951b3d6522bc5dda",
+        "rev": "f596e2141c241f5cca21188543cd4dcda32f2c3c",
        "type": "github"
      },
      "original": {
@@ -517,11 +517,11 @@
    },
    "nixpkgs-lib": {
      "locked": {
-        "lastModified": 1743296961,
-        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
+        "lastModified": 1751159883,
+        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
        "owner": "nix-community",
        "repo": "nixpkgs.lib",
-        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
+        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
        "type": "github"
      },
      "original": {
@@ -532,11 +532,11 @@
    },
    "nixpkgs-stable": {
      "locked": {
-        "lastModified": 1748421225,
-        "narHash": "sha256-XXILOc80tvlvEQgYpYFnze8MkQQmp3eQxFbTzb3m/R0=",
+        "lastModified": 1751274312,
+        "narHash": "sha256-/bVBlRpECLVzjV19t5KMdMFWSwKLtb5RyXdjz3LJT+g=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "78add7b7abb61689e34fc23070a8f55e1d26185b",
+        "rev": "50ab793786d9de88ee30ec4e4c24fb4236fc2674",
        "type": "github"
      },
      "original": {
@@ -559,11 +559,11 @@
        "treefmt-nix": "treefmt-nix"
      },
      "locked": {
-        "lastModified": 1746056780,
-        "narHash": "sha256-/emueQGaoT4vu0QjU9LDOG5roxRSfdY0K2KkxuzazcM=",
+        "lastModified": 1748730660,
+        "narHash": "sha256-5LKmRYKdPuhm8j5GFe3AfrJL8dd8o57BQ34AGjJl1R0=",
        "owner": "nix-community",
        "repo": "NUR",
-        "rev": "d476cd0972dd6242d76374fcc277e6735715c167",
+        "rev": "2c0bc52fe14681e9ef60e3553888c4f086e46ecb",
        "type": "github"
      },
      "original": {
@@ -583,11 +583,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747372754,
-        "narHash": "sha256-2Y53NGIX2vxfie1rOW0Qb86vjRZ7ngizoo+bnXU9D9k=",
+        "lastModified": 1750779888,
+        "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",
        "owner": "cachix",
        "repo": "git-hooks.nix",
-        "rev": "80479b6ec16fefd9c1db3ea13aeb038c60530f46",
+        "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",
        "type": "github"
      },
      "original": {
@@ -627,11 +627,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1748746145,
-        "narHash": "sha256-bwkCAK9pOyI2Ww4Q4oO1Ynv7O9aZPrsIAMMASmhVGp4=",
+        "lastModified": 1751510438,
+        "narHash": "sha256-m8PjOoyyCR4nhqtHEBP1tB/jF+gJYYguSZmUmVTEAQE=",
        "owner": "oxalica",
        "repo": "rust-overlay",
-        "rev": "12a0d94a2f2b06714f747ab97b2fa546f46b460c",
+        "rev": "7f415261f298656f8164bd636c0dc05af4e95b6b",
        "type": "github"
      },
      "original": {
@@ -647,11 +647,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1747603214,
-        "narHash": "sha256-lAblXm0VwifYCJ/ILPXJwlz0qNY07DDYdLD+9H+Wc8o=",
+        "lastModified": 1750119275,
+        "narHash": "sha256-Rr7Pooz9zQbhdVxux16h7URa6mA80Pb/G07T4lHvh0M=",
        "owner": "Mic92",
        "repo": "sops-nix",
-        "rev": "8d215e1c981be3aa37e47aeabd4e61bb069548fd",
+        "rev": "77c423a03b9b2b79709ea2cb63336312e78b72e2",
        "type": "github"
      },
      "original": {
@@ -688,11 +688,11 @@
        "tinted-zed": "tinted-zed"
      },
      "locked": {
-        "lastModified": 1748717073,
-        "narHash": "sha256-Yxo8A7BgNpRXTrB359LyfQ0NjJuiaLIS6sTTUCulEX0=",
+        "lastModified": 1751498047,
+        "narHash": "sha256-2T/VKbqqp4KTz3szFl58AaI+LBg9ctLjnP1IQA8sPg8=",
        "owner": "danth",
        "repo": "stylix",
-        "rev": "64b9f2c2df31bb87bdd2360a2feb58c817b4d16c",
+        "rev": "d21cfb364a78ad72935625e79b8c5d497f0b7616",
        "type": "github"
      },
      "original": {
@@ -767,11 +767,11 @@
    "tinted-schemes": {
      "flake": false,
      "locked": {
-        "lastModified": 1744974599,
-        "narHash": "sha256-Fg+rdGs5FAgfkYNCs74lnl8vkQmiZVdBsziyPhVqrlY=",
+        "lastModified": 1748180480,
+        "narHash": "sha256-7n0XiZiEHl2zRhDwZd/g+p38xwEoWtT0/aESwTMXWG4=",
        "owner": "tinted-theming",
        "repo": "schemes",
-        "rev": "28c26a621123ad4ebd5bbfb34ab39421c0144bdd",
+        "rev": "87d652edd26f5c0c99deda5ae13dfb8ece2ffe31",
        "type": "github"
      },
      "original": {
@@ -783,11 +783,11 @@
    "tinted-tmux": {
      "flake": false,
      "locked": {
-        "lastModified": 1745111349,
-        "narHash": "sha256-udV+nHdpqgkJI9D0mtvvAzbqubt9jdifS/KhTTbJ45w=",
+        "lastModified": 1748740859,
+        "narHash": "sha256-OEM12bg7F4N5WjZOcV7FHJbqRI6jtCqL6u8FtPrlZz4=",
        "owner": "tinted-theming",
        "repo": "tinted-tmux",
-        "rev": "e009f18a01182b63559fb28f1c786eb027c3dee9",
+        "rev": "57d5f9683ff9a3b590643beeaf0364da819aedda",
        "type": "github"
      },
      "original": {
--- a/systems/palatine-hill/docker/nextcloud.nix
+++ b/systems/palatine-hill/docker/nextcloud.nix
@@ -9,7 +9,8 @@ let
  nextcloud-base = {
    # image comes from running docker compose build in nextcloud-docker/.examples/full/apache
    image = "nextcloud-nextcloud";
-    pull = "always";
+    # pull = "always";
+    # do NOT enable pull here, this image is generated based on a custom docker image
    hostname = "nextcloud";
    volumes = [
      "${nextcloud_path}/nc_data:/var/www/html:z"
--- a/users/alice/default.nix
+++ b/users/alice/default.nix
@@ -14,5 +14,7 @@ import ../default.nix {
    ;
  publicKeys = [
    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIP7oJjIYNRCRrUlhdGJgst6bzqubbKH0gjZYulQ1eVcZ alice@artemision"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILWG3cIBju6vzX6s8JlmGNJOiWY7pQ19bHvcqDADtWzv snowi@DESKTOP-EVIR8IH"
+    "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEMfC0IXl9sGx+9FjuYZT2OUfffGjciJIHWqZdEU1d3n alice@parthenon-7588"
  ];
 }
--- a/utils/eval-to-drv.sh
+++ b/utils/eval-to-drv.sh
@@ -16,4 +16,4 @@ script_path=$(dirname "$(readlink -f $0)")
 parent_path=$(dirname "$script_path")
 out_path="$parent_path/$1.json"

-nix run git+https://nayeonie.com/ahuston-0/flake-update-diff -- --evaluate --allow-import-from-derivation --json "$out_path" "$parent_path"
+nix run git+https://nayeonie.com/ahuston-0/flake-update-diff --fallback -- --evaluate --allow-import-from-derivation --json "$out_path" "$parent_path"
Author	SHA1	Message	Date
ahuston-0	f063b8827e	Merge branch 'main' into feature/add-parthenon All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 45s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 6m14s Details	2025-07-04 00:58:37 -04:00
ahuston-0	afa3cb8ca2	Merge pull request 'automated: Update `flake.lock`' (#125 ) from update-flake-lock into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 8s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m53s Details Reviewed-on: #125	2025-07-04 00:58:29 -04:00
ahuston-0	84b16ff0c1	add parthenon key All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 14s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 5m41s Details	2025-07-04 00:55:53 -04:00
github-actions[bot]	055f6d3509	automated: Update `flake.lock` All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 32s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 5m45s Details Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request	2025-07-03 12:15:15 +00:00
ahuston-0	cd54e7e381	Merge pull request 'automated: Update `flake.lock`' (#121 ) from update-flake-lock into main All checks were successful Check flake.lock / Check health of `flake.lock` (push) Successful in 14s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m4s Details Update flakes / update_lockfile (push) Successful in 15m10s Details Reviewed-on: #121	2025-06-29 18:01:50 -04:00
github-actions[bot]	6b9619f3e9	automated: Update `flake.lock` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request	2025-06-29 18:01:50 -04:00
ahuston-0	726ff95163	Merge pull request 'Update utils/eval-to-drv.sh' (#124 ) from ahuston-0-patch-2 into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 17s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m7s Details Update flakes / update_lockfile (push) Failing after 13m34s Details Reviewed-on: #124	2025-06-28 15:30:04 -04:00
ahuston-0	8e806a9e83	Update utils/eval-to-drv.sh All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 13s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 5m46s Details	2025-06-28 15:15:17 -04:00
ahuston-0	7e56be3e73	Merge pull request 'Update systems/palatine-hill/docker/nextcloud.nix' (#123 ) from ahuston-0-patch-1 into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 13s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m26s Details Update flakes / update_lockfile (push) Failing after 2m47s Details Reviewed-on: #123	2025-06-16 00:10:12 -04:00
ahuston-0	7a4bace017	Update systems/palatine-hill/docker/nextcloud.nix All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 16s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 6m7s Details	2025-06-15 16:13:04 -04:00
ahuston-0	a731ab8f6b	Merge pull request 'Update users/alice/default.nix' (#122 ) from feature/add-pc into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 1m6s Details Check Nix flake / Perform Nix flake checks (push) Successful in 5m29s Details Update flakes / update_lockfile (push) Failing after 2m24s Details Reviewed-on: #122	2025-06-11 12:44:11 -04:00
ahuston-0	d3c0a06e59	Update users/alice/default.nix All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 14s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 5m16s Details	2025-06-11 12:38:47 -04:00
ahuston-0	c2679bf795	Merge pull request 'automated: Update `flake.lock`' (#119 ) from update-flake-lock into main Some checks failed Check flake.lock / Check health of `flake.lock` (push) Successful in 11s Details Check Nix flake / Perform Nix flake checks (push) Successful in 3m45s Details Update flakes / update_lockfile (push) Failing after 3m19s Details Reviewed-on: #119	2025-06-09 02:09:52 -04:00
github-actions[bot]	f3ddc65a66	automated: Update `flake.lock` All checks were successful Check flake.lock / Check health of `flake.lock` (pull_request) Successful in 17s Details Check Nix flake / Perform Nix flake checks (pull_request) Successful in 4m11s Details Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://nayeonie.com/ahuston-0/nix-dotfiles/src/branch/main/.github/workflows/flake-update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request	2025-06-08 12:10:47 +00:00