diff --git a/flake.lock b/flake.lock index dbf0b7d3..38c92961 100644 --- a/flake.lock +++ b/flake.lock @@ -49,21 +49,17 @@ }, "buildbot-nix": { "inputs": { - "flake-parts": [ - "flake-parts" - ], - "hercules-ci-effects": [], "nixpkgs": [ "nixpkgs" ], "treefmt-nix": [] }, "locked": { - "lastModified": 1775969270, - "narHash": "sha256-uu+DFoqMI2g2E+QE6EQfVc4g/jibNSnVobSUhxFr20o=", + "lastModified": 1778018861, + "narHash": "sha256-BiYCd1nr4t7kqu+gXfcgkhiUvJL/RwiglFimnSCN+8c=", "owner": "nix-community", "repo": "buildbot-nix", - "rev": "df9ff85cf20cedeae2f231dc2997d2e8ca5810cf", + "rev": "01e719b334a9e987c9305a6727862e6723385e1a", "type": "github" }, "original": { @@ -79,11 +75,11 @@ ] }, "locked": { - "lastModified": 1776420287, - "narHash": "sha256-0P2QyDM8R1FFww//TNDLTRVnVkQxVdbEVQiVuyD1SqY=", + "lastModified": 1777734189, + "narHash": "sha256-kbIhdhDPaTP6gxAPkcRYeB+cqPFDpTM/bnw+m+26vkI=", "owner": "catppuccin", "repo": "nix", - "rev": "bdf0285dc7978ebd78b76054631d7ef05680895e", + "rev": "e68cf5deaf1a7afed2e548835dba2ae99f5a3ccb", "type": "github" }, "original": { @@ -148,11 +144,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1775087534, - "narHash": "sha256-91qqW8lhL7TLwgQWijoGBbiD4t7/q75KTi8NxjVmSmA=", + "lastModified": 1777988971, + "narHash": "sha256-qIoWPDs+0/8JecyYgE3gpKQxW/4bLW/gp45vow9ioCQ=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3107b77cd68437b9a76194f0f7f9c55f2329ca5b", + "rev": "0678d8986be1661af6bb555f3489f2fdfc31f6ff", "type": "github" }, "original": { @@ -225,11 +221,11 @@ ] }, "locked": { - "lastModified": 1773656868, - "narHash": "sha256-IvWd8A3MM2qASf2U5diOoYEc2dCxqR4BOhB5RuOQnZM=", + "lastModified": 1777767341, + "narHash": "sha256-lV2i2hBWxUKU2dgHza9SGfizOsV+uUcTQD/De+6/X3M=", "owner": "glide-browser", "repo": "glide.nix", - "rev": "1a3dd001865f6ac5a3562d2cb484388672ad6eaf", + "rev": "790c9d37e3dcf9bb04ae4486a0320b999a8eec32", "type": "github" }, "original": { @@ -246,11 +242,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1775592125, - "narHash": "sha256-6kVGyNf5X7H7h/Vf8ge18YQPxRzljTlwPRpLdIPjndY=", + "lastModified": 1777992933, + "narHash": "sha256-b+eN1E5PAQVexQ9+uDxdGrM5aGsz9hpUNuircAb0bmo=", "owner": "tailscale", "repo": "golink", - "rev": "0c619de1671d3d8c8157ec2584115cdac41cc501", + "rev": "b85eec3e0ed734380a61b31782b72818f214c494", "type": "github" }, "original": { @@ -283,11 +279,11 @@ }, "hardware": { "locked": { - "lastModified": 1775490113, - "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=", + "lastModified": 1778143761, + "narHash": "sha256-lkesY6x2X2qxlqLM7CT2iM/0rP2JB7fruPN3h8POXmI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7", + "rev": "3bcaa367d4c550d687a17ac792fd5cda214ee871", "type": "github" }, "original": { @@ -303,11 +299,11 @@ ] }, "locked": { - "lastModified": 1776373306, - "narHash": "sha256-iAJIzHngGZeLIkjzuuWI6VBsYJ1n89a/Esq0m8R1vjs=", + "lastModified": 1778144356, + "narHash": "sha256-dGM+QCstz/DyLB68+JK5GWyMx4QSqmOJEVgZmy63d/g=", "owner": "nix-community", "repo": "home-manager", - "rev": "d401492e2acd4fea42f7705a3c266cea739c9c36", + "rev": "e4419d3123b780d5f4c0bceeace450424387638c", "type": "github" }, "original": { @@ -334,11 +330,11 @@ }, "mnw": { "locked": { - "lastModified": 1770419553, - "narHash": "sha256-b1XqsH7AtVf2dXmq2iyRr2NC1yG7skY7Z6N2MpWHlK4=", + "lastModified": 1777828893, + "narHash": "sha256-gVWVnmyNr74BVKfhMMZDWkhx2699dhmZ2g0W8TTHtkk=", "owner": "Gerg-L", "repo": "mnw", - "rev": "2aaffa8030d0b262176146adbb6b0e6374ce2957", + "rev": "c1c0b544bfabe6669b5a6a0383ccb475fe60258b", "type": "github" }, "original": { @@ -374,11 +370,11 @@ ] }, "locked": { - "lastModified": 1775970782, - "narHash": "sha256-7jt9Vpm48Yy5yAWigYpde+HxtYEpEuyzIQJF4VYehhk=", + "lastModified": 1777787189, + "narHash": "sha256-2KUbS/HhzWW3kkkY1+RiWj9mJ76VEXw8lBJzcCFKzfY=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "bedba5989b04614fc598af9633033b95a937933f", + "rev": "2dea2b920e7127b3afa8506713f23536651de312", "type": "github" }, "original": { @@ -389,11 +385,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1776255774, - "narHash": "sha256-bo9Hbl5yPjDRldsn1Stnbsmn/nPF0cVlowuLSGHduuA=", - "rev": "566acc07c54dc807f91625bb286cb9b321b5f42a", + "lastModified": 1778071213, + "narHash": "sha256-Nzs7SxN4LCwuFEe2DJW6soDK/gSIQGuNx5lENqDdGhk=", + "rev": "07800bee2b362f6c73fe17cb1593a260c5e183c6", "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre980800.566acc07c54d/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre993155.07800bee2b36/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -402,11 +398,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1774748309, - "narHash": "sha256-+U7gF3qxzwD5TZuANzZPeJTZRHS29OFQgkQ2kiTJBIQ=", + "lastModified": 1777168982, + "narHash": "sha256-GOkGPcboWE9BmGCRMLX3worL4EMnsnG8MyKmXNeYuhQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "333c4e0545a6da976206c74db8773a1645b5870a", + "rev": "f5901329dade4a6ea039af1433fb087bd9c1fe14", "type": "github" }, "original": { @@ -431,11 +427,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1776443141, - "narHash": "sha256-0GPSO7piciOuKYnTAvCFChlRM51HIYS8j1metFSHkAg=", + "lastModified": 1778049651, + "narHash": "sha256-EC5pBiLcP/EVmYWldJRNfkChCqF9rkeTnTs8t9Cs+ZY=", "owner": "notashelf", "repo": "nvf", - "rev": "a2708696b1c3805bbde5b6292c214f56d3b2996d", + "rev": "88dbbad1f44efe3d2c18903e2c7542452f7bdfd6", "type": "github" }, "original": { @@ -444,26 +440,6 @@ "type": "github" } }, - "quickshell": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1776066068, - "narHash": "sha256-SwKVkgEsqsp5ki9m7fqvhncb5MjvH1hlZqbn3s+x/Uk=", - "owner": "quickshell-mirror", - "repo": "quickshell", - "rev": "fb08eced449e87e47321e95beeb890a63d2c67bd", - "type": "github" - }, - "original": { - "owner": "quickshell-mirror", - "repo": "quickshell", - "type": "github" - } - }, "root": { "inputs": { "agenix": "agenix", @@ -482,7 +458,6 @@ "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs", "nvf": "nvf", - "quickshell": "quickshell", "tangled": "tangled", "treefmt-nix": "treefmt-nix" } @@ -611,11 +586,11 @@ "sqlite-lib-src": "sqlite-lib-src" }, "locked": { - "lastModified": 1776427995, - "narHash": "sha256-bUR/cHqZP1zigWCo59KFF+F6UDuGM9q5CiFHdvnvSO8=", + "lastModified": 1778160232, + "narHash": "sha256-Iiucz+taXaghvqP+ppTnDydW2H6Rhy0Oa4pFYMb5fJk=", "ref": "refs/heads/master", - "rev": "956f97c314517efbfa18d04ce8e0234e6609a30a", - "revCount": 2250, + "rev": "a323aa96d0fe2a3a14fa5bb5b6db618e609f4cda", + "revCount": 2359, "type": "git", "url": "https://tangled.org/tangled.org/core" }, diff --git a/flake.nix b/flake.nix index 47532b84..64f0e5ba 100644 --- a/flake.nix +++ b/flake.nix @@ -39,8 +39,6 @@ buildbot-nix = { url = "github:nix-community/buildbot-nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-parts.follows = "flake-parts"; - inputs.hercules-ci-effects.follows = ""; inputs.treefmt-nix.follows = ""; }; ctp = { @@ -83,10 +81,6 @@ url = "git+https://git.pyrox.dev/pyrox/pkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; - quickshell = { - url = "github:quickshell-mirror/quickshell"; - inputs.nixpkgs.follows = "nixpkgs"; - }; tangled = { url = "git+https://tangled.org/tangled.org/core"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/nixosModules/programs/dms/default.nix b/nixosModules/programs/dms/default.nix index 4dc0816c..7d15adac 100644 --- a/nixosModules/programs/dms/default.nix +++ b/nixosModules/programs/dms/default.nix @@ -1,7 +1,7 @@ { config, lib, - inputs', + pkgs, ... }: let @@ -18,7 +18,7 @@ in enableCalendarEvents = false; enableAudioWavelength = false; enableDynamicTheming = false; - quickshell.package = inputs'.quickshell.packages.quickshell; + quickshell.package = pkgs.quickshell; }; }; }