commit e95aaabb6ce76772303bb1e1e07a4fd36c6f7768
parent 83fe44d97482a8c75af14a12dbf8e229997189b8
Author: Katja (ctucx) <git@ctu.cx>
Date: Wed, 5 Mar 2025 23:06:49 +0100
parent 83fe44d97482a8c75af14a12dbf8e229997189b8
Author: Katja (ctucx) <git@ctu.cx>
Date: Wed, 5 Mar 2025 23:06:49 +0100
flake.lock: Update
Flake lock file updates:
• Updated input 'ctucxGallery':
'git+https://git.ctu.cx/gallery?ref=refs/heads/master&rev=36f20ee80e86e08a08c74ffa6a688b1e49473503' (2024-06-11)
→ 'git+https://git.ctu.cx/gallery?ref=refs/heads/master&rev=c460a7d103b192ce93c156fe11eaaecebf4bfb3e' (2025-03-05)
• Removed input 'ctucxGallery/flake-utils'
• Updated input 'ctucxThings':
'git+https://git.ctu.cx/ctucx.things?ref=refs/heads/main&rev=7e5e220348e8ab834f4791472d4dc4f181c7c9e4' (2023-06-14)
→ 'git+https://git.ctu.cx/ctucx.things?ref=refs/heads/main&rev=f2857dc6e2248501adf8f98e5d6b834496d84b1e' (2025-03-05)
• Removed input 'ctucxThings/flake-utils'
• Updated input 'ctucxWebsite':
'git+https://git.ctu.cx/website?ref=refs/heads/main&rev=10ee03adae3de29e75dbcc31beb6b52ae68d4084' (2025-02-23)
→ 'git+https://git.ctu.cx/website?ref=refs/heads/main&rev=01153ad284e58f3709835bf307eb4db70c54ba77' (2025-03-05)
• Removed input 'ctucxWebsite/flake-utils'
• Updated input 'flauschehornSexy':
'git+https://git.ctu.cx/flauschehorn.sexy?ref=refs/heads/master&rev=6348176e7e144ce1bb442ef8c711a4ba7f60078f' (2022-12-10)
→ 'git+https://git.ctu.cx/flauschehorn.sexy?ref=refs/heads/master&rev=58bd2a442c34488fc4411e31ab299d0af1e06600' (2025-03-05)
• Removed input 'flauschehornSexy/flake-utils'
• Updated input 'gpxMap':
'git+https://git.ctu.cx/gpx-map?ref=refs/heads/master&rev=35a87d4f2e28a48f7477b28447918fe95c361085' (2023-11-29)
→ 'git+https://git.ctu.cx/gpx-map?ref=refs/heads/master&rev=368358b4facb8bc55311250926eef78b0328b9a0' (2025-03-05)
• Removed input 'gpxMap/flake-utils'
• Updated input 'lixModule':
'https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?narHash=sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g%3D&rev=f19bd752910bbe3a861c9cad269bd078689d50fe' (2024-11-26)
→ 'https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?narHash=sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7%2Bb8%3D&rev=b90bf629bbd835e61f1317b99e12f8c831017006' (2025-01-18)
• Updated input 'lixModule/lix':
'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?narHash=sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U%3D&rev=ad9d06f7838a25beec425ff406fe68721fef73be' (2024-10-19)
→ 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?narHash=sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g%3D&rev=2837da71ec1588c1187d2e554719b15904a46c8b' (2025-01-18)
• Updated input 'mobileCoverageMap':
'git+https://git.ctu.cx/mobile-coverage-map?ref=refs/heads/master&rev=30a69ef5132b8d53b68bde9149e8e8f43414745f' (2023-06-04)
→ 'git+https://git.ctu.cx/mobile-coverage-map?ref=refs/heads/master&rev=fbb1d8bd4521f0f08b6a690a56f6d38c86966f21' (2025-03-05)
• Removed input 'mobileCoverageMap/flake-utils'
• Updated input 'mqttWebUI':
'git+https://git.ctu.cx/mqtt-webui?ref=refs/heads/master&rev=708d6abe88b66087007f339c601b54d8ba0a1fcd' (2023-05-01)
→ 'git+https://git.ctu.cx/mqtt-webui?ref=refs/heads/master&rev=071d9f35d74c02948e93afd48906c181888ebeec' (2025-03-05)
• Removed input 'mqttWebUI/flake-utils'
• Updated input 'nixpkgs':
'github:NixOS/nixpkgs/5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b' (2025-02-25)
→ 'github:NixOS/nixpkgs/6af28b834daca767a7ef99f8a7defa957d0ade6f' (2025-03-04)
• Updated input 'nixpkgsDarwin':
'github:NixOS/nixpkgs/2f137a92a87d2e03e75fce3c9c9073095720369b' (2025-02-26)
→ 'github:NixOS/nixpkgs/c3d6c20a6a16cbfdc11405c4dd0fdf64ec3a3899' (2025-03-03)
• Updated input 'nixpkgsUnstable':
'github:NixOS/nixpkgs/3a05eebede89661660945da1f151959900903b6a' (2025-02-26)
→ 'github:NixOS/nixpkgs/02032da4af073d0f6110540c8677f16d4be0117f' (2025-03-03)
• Updated input 'stagit':
'git+https://git.ctu.cx/stagit?ref=refs/heads/main&rev=73899eba11a0e430cebd5b9a654c32f327eaceea' (2023-08-07)
→ 'git+https://git.ctu.cx/stagit?ref=refs/heads/main&rev=868b715a08bdf028641fdd30e81bd5a9351cf7e8' (2025-03-05)
• Removed input 'stagit/flake-utils'
• Updated input 'trainsearch':
'git+https://git.ctu.cx/trainsearch?ref=refs/heads/main&rev=a609268e436b44109e78081692bf8cdc05ebaad1' (2025-02-05)
→ 'git+https://git.ctu.cx/trainsearch?ref=refs/heads/main&rev=7ae6fa92c33ad8b835d1a3f85a69183e65911839' (2025-03-05)
• Removed input 'trainsearch/flake-utils'
• Updated input 'travelynx2fedi':
'git+https://git.ctu.cx/travelynx2fedi?ref=refs/heads/main&rev=a93608c90c17c02ce08d9ded804de162df0e2372' (2024-06-27)
→ 'git+https://git.ctu.cx/travelynx2fedi?ref=refs/heads/main&rev=606c2cdd3ce141e3c6d1c1bec0463df67a4c810b' (2025-03-05)
• Removed input 'travelynx2fedi/flake-utils'
3 files changed, 74 insertions(+), 114 deletions(-)
diff --git a/flake.lock b/flake.lock @@ -86,19 +86,16 @@ }, "ctucxGallery": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718089410, - "narHash": "sha256-S9Zav9JqumWW618i+lWg11EIVYBP+oaGIK7HKek22Ac=", + "lastModified": 1741208826, + "narHash": "sha256-Lb5/Exc9Y7DMvN+GP8jNctnVaQgvWiaDlSlg3NdM9gM=", "ref": "refs/heads/master", - "rev": "36f20ee80e86e08a08c74ffa6a688b1e49473503", - "revCount": 39, + "rev": "c460a7d103b192ce93c156fe11eaaecebf4bfb3e", + "revCount": 40, "type": "git", "url": "https://git.ctu.cx/gallery" }, @@ -109,19 +106,16 @@ }, "ctucxThings": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1686768224, - "narHash": "sha256-nf/b+YP9aWQ66EmAWUeI3xlAPijWgmo9X1A9vfRvxQg=", + "lastModified": 1741208411, + "narHash": "sha256-CUPVLzApJ29ZOv+huElgIqpGeMPuIsflK0Vw7Z3s3f4=", "ref": "refs/heads/main", - "rev": "7e5e220348e8ab834f4791472d4dc4f181c7c9e4", - "revCount": 5, + "rev": "f2857dc6e2248501adf8f98e5d6b834496d84b1e", + "revCount": 6, "type": "git", "url": "https://git.ctu.cx/ctucx.things" }, @@ -132,19 +126,16 @@ }, "ctucxWebsite": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1740300404, - "narHash": "sha256-eFEz/okjK3O7O5qmbV7+VEknSrgp9njyNDta+0BEJkk=", + "lastModified": 1741208709, + "narHash": "sha256-OGr353vIa30EXuXXHhqbbLCpwq9tVqv/soFyB04Dd04=", "ref": "refs/heads/main", - "rev": "10ee03adae3de29e75dbcc31beb6b52ae68d4084", - "revCount": 12, + "rev": "01153ad284e58f3709835bf307eb4db70c54ba77", + "revCount": 13, "type": "git", "url": "https://git.ctu.cx/website" }, @@ -365,19 +356,16 @@ }, "flauschehornSexy": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1670689967, - "narHash": "sha256-ncj009W3XYiWFdCeqib6uLfOKdG2OPvDQhz+vfarde8=", + "lastModified": 1741208475, + "narHash": "sha256-Egnnh016YdTWAalkWkyS8DYVQr/YK3YXQ+FxnYPZsaw=", "ref": "refs/heads/master", - "rev": "6348176e7e144ce1bb442ef8c711a4ba7f60078f", - "revCount": 4, + "rev": "58bd2a442c34488fc4411e31ab299d0af1e06600", + "revCount": 5, "type": "git", "url": "https://git.ctu.cx/flauschehorn.sexy" }, @@ -410,19 +398,16 @@ }, "gpxMap": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1701274753, - "narHash": "sha256-kWMSBIhvX2A/GRrIxXnL1nAybCa7G2L8fjd2gI0dMik=", + "lastModified": 1741208528, + "narHash": "sha256-HDgOvxva+fOZ8fmtJpwG64oRQSXVlGRTmH6LtEknXJc=", "ref": "refs/heads/master", - "rev": "35a87d4f2e28a48f7477b28447918fe95c361085", - "revCount": 5, + "rev": "368358b4facb8bc55311250926eef78b0328b9a0", + "revCount": 6, "type": "git", "url": "https://git.ctu.cx/gpx-map" }, @@ -538,15 +523,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1729298361, - "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", - "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", + "lastModified": 1737234286, + "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", + "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" } }, "lixModule": { @@ -561,32 +546,29 @@ ] }, "locked": { - "lastModified": 1732605668, - "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", - "rev": "f19bd752910bbe3a861c9cad269bd078689d50fe", + "lastModified": 1737237494, + "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", + "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/f19bd752910bbe3a861c9cad269bd078689d50fe.tar.gz?rev=f19bd752910bbe3a861c9cad269bd078689d50fe" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-2.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" } }, "mobileCoverageMap": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1685865116, - "narHash": "sha256-i+LnfvnHLXNQaShm61PXMmqxe0ORzoPSaruwVzzK3RQ=", + "lastModified": 1741208873, + "narHash": "sha256-iH18itCbQjcgnlxWviyFyPbWQ1IZ3Gt7i/aP4BD6WRU=", "ref": "refs/heads/master", - "rev": "30a69ef5132b8d53b68bde9149e8e8f43414745f", - "revCount": 8, + "rev": "fbb1d8bd4521f0f08b6a690a56f6d38c86966f21", + "revCount": 9, "type": "git", "url": "https://git.ctu.cx/mobile-coverage-map" }, @@ -597,19 +579,16 @@ }, "mqttWebUI": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1682967755, - "narHash": "sha256-hY4TFn5CBdQ03fQS0y9/4FwtH6K4yBxTNKB+MMVI8VY=", + "lastModified": 1741208595, + "narHash": "sha256-Eel1FQBWRPYy3oToZT9xz5M3f0rfxjlGOizyCHxWrwU=", "ref": "refs/heads/master", - "rev": "708d6abe88b66087007f339c601b54d8ba0a1fcd", - "revCount": 19, + "rev": "071d9f35d74c02948e93afd48906c181888ebeec", + "revCount": 20, "type": "git", "url": "https://git.ctu.cx/mqtt-webui" }, @@ -693,11 +672,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1740463929, - "narHash": "sha256-4Xhu/3aUdCKeLfdteEHMegx5ooKQvwPHNkOgNCXQrvc=", + "lastModified": 1741048562, + "narHash": "sha256-W4YZ3fvWZiFYYyd900kh8P8wU6DHSiwaH0j4+fai1Sk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5d7db4668d7a0c6cc5fc8cf6ef33b008b2b1ed8b", + "rev": "6af28b834daca767a7ef99f8a7defa957d0ade6f", "type": "github" }, "original": { @@ -740,11 +719,11 @@ }, "nixpkgsDarwin": { "locked": { - "lastModified": 1740559594, - "narHash": "sha256-r1/RAgr7x68leV/R8gaR1AA6b5dmimxxdN1DRkDn3pg=", + "lastModified": 1741029734, + "narHash": "sha256-0+dlOH+9mut5mtw8iUukJ3Q9cx/DXgBarK05W7MKggA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f137a92a87d2e03e75fce3c9c9073095720369b", + "rev": "c3d6c20a6a16cbfdc11405c4dd0fdf64ec3a3899", "type": "github" }, "original": { @@ -756,11 +735,11 @@ }, "nixpkgsUnstable": { "locked": { - "lastModified": 1740547748, - "narHash": "sha256-Ly2fBL1LscV+KyCqPRufUBuiw+zmWrlJzpWOWbahplg=", + "lastModified": 1741037377, + "narHash": "sha256-SvtvVKHaUX4Owb+PasySwZsoc5VUeTf1px34BByiOxw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a05eebede89661660945da1f151959900903b6a", + "rev": "02032da4af073d0f6110540c8677f16d4be0117f", "type": "github" }, "original": { @@ -895,19 +874,16 @@ }, "stagit": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1691429917, - "narHash": "sha256-qNXnbqCgPEnI4BOxs7RVrvgWrEqUMZ74Q9g/sE0A7zo=", + "lastModified": 1741203792, + "narHash": "sha256-8hfWj/LDtjzdX+/EO0NPpK+eYaAJGBszS8bRrD3ImUY=", "ref": "refs/heads/main", - "rev": "73899eba11a0e430cebd5b9a654c32f327eaceea", - "revCount": 443, + "rev": "868b715a08bdf028641fdd30e81bd5a9351cf7e8", + "revCount": 444, "type": "git", "url": "https://git.ctu.cx/stagit" }, @@ -963,19 +939,16 @@ }, "trainsearch": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1738751989, - "narHash": "sha256-pi1iL4LEnD8xtZOTU9QVxVtL6S8/q/Tq28Yo+U/GENI=", + "lastModified": 1741204687, + "narHash": "sha256-jpd9Se90xCSzWAK4hfIIZXOFruuEtU6X+a2M06dFAeE=", "ref": "refs/heads/main", - "rev": "a609268e436b44109e78081692bf8cdc05ebaad1", - "revCount": 225, + "rev": "7ae6fa92c33ad8b835d1a3f85a69183e65911839", + "revCount": 226, "type": "git", "url": "https://git.ctu.cx/trainsearch" }, @@ -986,19 +959,16 @@ }, "travelynx2fedi": { "inputs": { - "flake-utils": [ - "flakeUtils" - ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1719490179, - "narHash": "sha256-2+8LHv8knMJFNU+rztgdJzw6rmzbFAtCIC39REBw2TQ=", + "lastModified": 1741208334, + "narHash": "sha256-d750cJJYzkHSHZ7hLJBrtq2TM2FO9vfVynU8QIeTsOo=", "ref": "refs/heads/main", - "rev": "a93608c90c17c02ce08d9ded804de162df0e2372", - "revCount": 8, + "rev": "606c2cdd3ce141e3c6d1c1bec0463df67a4c810b", + "revCount": 9, "type": "git", "url": "https://git.ctu.cx/travelynx2fedi" },
diff --git a/flake.nix b/flake.nix @@ -194,44 +194,34 @@ dnsNix.inputs.nixpkgs.follows = "nixpkgs"; stagit.url = "git+https://git.ctu.cx/stagit"; - stagit.inputs.nixpkgs.follows = "nixpkgs"; - stagit.inputs.flake-utils.follows = "flakeUtils"; + stagit.inputs.nixpkgs.follows = "nixpkgs"; mqttWebUI.url = "git+https://git.ctu.cx/mqtt-webui"; - mqttWebUI.inputs.nixpkgs.follows = "nixpkgs"; - mqttWebUI.inputs.flake-utils.follows = "flakeUtils"; + mqttWebUI.inputs.nixpkgs.follows = "nixpkgs"; trainsearch.url = "git+https://git.ctu.cx/trainsearch"; - trainsearch.inputs.nixpkgs.follows = "nixpkgs"; - trainsearch.inputs.flake-utils.follows = "flakeUtils"; + trainsearch.inputs.nixpkgs.follows = "nixpkgs"; ctucxWebsite.url = "git+https://git.ctu.cx/website"; - ctucxWebsite.inputs.nixpkgs.follows = "nixpkgs"; - ctucxWebsite.inputs.flake-utils.follows = "flakeUtils"; + ctucxWebsite.inputs.nixpkgs.follows = "nixpkgs"; ctucxThings.url = "git+https://git.ctu.cx/ctucx.things"; - ctucxThings.inputs.nixpkgs.follows = "nixpkgs"; - ctucxThings.inputs.flake-utils.follows = "flakeUtils"; + ctucxThings.inputs.nixpkgs.follows = "nixpkgs"; ctucxGallery.url = "git+https://git.ctu.cx/gallery"; - ctucxGallery.inputs.nixpkgs.follows = "nixpkgs"; - ctucxGallery.inputs.flake-utils.follows = "flakeUtils"; + ctucxGallery.inputs.nixpkgs.follows = "nixpkgs"; flauschehornSexy.url = "git+https://git.ctu.cx/flauschehorn.sexy"; - flauschehornSexy.inputs.nixpkgs.follows = "nixpkgs"; - flauschehornSexy.inputs.flake-utils.follows = "flakeUtils"; + flauschehornSexy.inputs.nixpkgs.follows = "nixpkgs"; mobileCoverageMap.url = "git+https://git.ctu.cx/mobile-coverage-map"; - mobileCoverageMap.inputs.nixpkgs.follows = "nixpkgs"; - mobileCoverageMap.inputs.flake-utils.follows = "flakeUtils"; + mobileCoverageMap.inputs.nixpkgs.follows = "nixpkgs"; - gpxMap.url = "git+https://git.ctu.cx/gpx-map"; - gpxMap.inputs.nixpkgs.follows = "nixpkgs"; - gpxMap.inputs.flake-utils.follows = "flakeUtils"; + gpxMap.url = "git+https://git.ctu.cx/gpx-map"; + gpxMap.inputs.nixpkgs.follows = "nixpkgs"; - travelynx2fedi.url = "git+https://git.ctu.cx/travelynx2fedi"; - travelynx2fedi.inputs.nixpkgs.follows = "nixpkgs"; - travelynx2fedi.inputs.flake-utils.follows = "flakeUtils"; + travelynx2fedi.url = "git+https://git.ctu.cx/travelynx2fedi"; + travelynx2fedi.inputs.nixpkgs.follows = "nixpkgs"; firefoxGnomeTheme.flake = false; firefoxGnomeTheme.url = "github:rafaelmardojai/firefox-gnome-theme/v135";
diff --git a/modules/nixos/gnome.nix b/modules/nixos/gnome.nix @@ -111,9 +111,9 @@ in { # Change hardcoded paths to nix store paths. (prev.substituteAll { src = ../../pkgs/gdm-fix-paths.patch; - coreutils = prev.coreutils; - plymouth = prev.plymouth; - dbus = prev.dbus; + coreutils = final.coreutils; + plymouth = final.plymouth; + dbus = final.dbus; }) ]; postPatch = ''