diff --git a/flake.lock b/flake.lock index f2657e6..ec582ef 100644 --- a/flake.lock +++ b/flake.lock @@ -17,17 +17,14 @@ ] }, "locked": { - "lastModified": 1770950478, - "narHash": "sha256-y83gbdVEQheIYUvD8rzQcidLN0tcGCGq5b2TWQRjr4c=", - "owner": "cry128", - "repo": "Cerulean", - "rev": "5397bf5efcb1a047612a6e919bc2aad87ba9bb40", - "type": "github" + "lastModified": 1770974095, + "narHash": "sha256-7plCbyNGVinY0Ti+MIR8tU+BJDe1qvyXCKq1TDk9tc8=", + "path": "/home/me/cry/mk/Cerulean", + "type": "path" }, "original": { - "owner": "cry128", - "repo": "Cerulean", - "type": "github" + "path": "/home/me/cry/mk/Cerulean", + "type": "path" } }, "deploy-rs": { @@ -63,11 +60,11 @@ ] }, "locked": { - "lastModified": 1770316708, - "narHash": "sha256-i9oEi2PUIZfp+73ZvQE/Ze0aCEV3y3+vvaJ/ZmAe3bw=", + "lastModified": 1770947070, + "narHash": "sha256-g/l/iUET/M+nSrXlwYF2e0KeKqgGpjy3qhwQY4tG62A=", "ref": "refs/heads/main", - "rev": "955746af205e2a94a8e0798a911941da9c5af779", - "revCount": 117, + "rev": "4fc28bfb4f95071d34184c7ba3153eaff87eba41", + "revCount": 121, "type": "git", "url": "https://forge.dobutterfliescry.net/cry/site" }, @@ -111,11 +108,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1768135262, - "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", + "lastModified": 1769996383, + "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", + "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", "type": "github" }, "original": { @@ -258,11 +255,11 @@ ] }, "locked": { - "lastModified": 1770365342, - "narHash": "sha256-jV5tAs67HSBWz/ePEp1eyoUK3Lqfc1fEAvt2wC6reFc=", + "lastModified": 1770943752, + "narHash": "sha256-3vWAy2BCP5liaCEKmeqeVWbTCF/JnukgMOg8qf8mCcg=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "51db830336715209a4a213aa985f4d405ff0be69", + "rev": "aa1626057e57eca3686fbc1c3e2ddfde884c6b2a", "type": "github" }, "original": { @@ -289,11 +286,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "lastModified": 1769909678, + "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "72716169fe93074c333e8d0173151350670b824c", "type": "github" }, "original": { @@ -304,11 +301,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770197578, - "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", + "lastModified": 1770841267, + "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", + "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", "type": "github" }, "original": { @@ -357,17 +354,14 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770950436, - "narHash": "sha256-+h5jrsIJBea5P+rAk4OqUpScqnHYQTvCRUhgGv/MX34=", - "owner": "cry128", - "repo": "nt", - "rev": "8725f5079f8f27b3faafeff90e5fc075d55e7d0a", - "type": "github" + "lastModified": 1770954326, + "narHash": "sha256-PZ+78r+iFZ90l6fdwC73SSyNyCqaiZIAFeDg0qBHY+8=", + "path": "/home/me/cry/mk/nt", + "type": "path" }, "original": { - "owner": "cry128", - "repo": "nt", - "type": "github" + "path": "/home/me/cry/mk/nt", + "type": "path" } }, "root": { diff --git a/groups/all/default.nix b/groups/all/default.nix index 2c84bee..3860303 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -1,12 +1,9 @@ { - inputs, pkgs, lib, ... }: { imports = [ - inputs.dobutterfliescry-net.overlays.default - ./modules/flatpak.nix ]; diff --git a/nixpkgs.nix b/nixpkgs.nix new file mode 100644 index 0000000..549ca0b --- /dev/null +++ b/nixpkgs.nix @@ -0,0 +1,27 @@ +{ + root, + inputs, + ... +}: { + nixpkgs.channels.default = { + # nixpkgs (stable branch) + pkgs = { + source = inputs.nixpkgs; + overlays = + [inputs.dobutterfliescry-net.overlays.default] + ++ import (root + "/overlays"); + config = { + allowUnfree = false; + allowBroken = false; + }; + }; + # nixpkgs-unstable + upkgs = { + source = inputs.nixpkgs-unstable; + config = { + allowUnfree = false; + allowBroken = false; + }; + }; + }; +}