diff --git a/flake.lock b/flake.lock index ec582ef..f2657e6 100644 --- a/flake.lock +++ b/flake.lock @@ -17,14 +17,17 @@ ] }, "locked": { - "lastModified": 1770974095, - "narHash": "sha256-7plCbyNGVinY0Ti+MIR8tU+BJDe1qvyXCKq1TDk9tc8=", - "path": "/home/me/cry/mk/Cerulean", - "type": "path" + "lastModified": 1770950478, + "narHash": "sha256-y83gbdVEQheIYUvD8rzQcidLN0tcGCGq5b2TWQRjr4c=", + "owner": "cry128", + "repo": "Cerulean", + "rev": "5397bf5efcb1a047612a6e919bc2aad87ba9bb40", + "type": "github" }, "original": { - "path": "/home/me/cry/mk/Cerulean", - "type": "path" + "owner": "cry128", + "repo": "Cerulean", + "type": "github" } }, "deploy-rs": { @@ -60,11 +63,11 @@ ] }, "locked": { - "lastModified": 1770947070, - "narHash": "sha256-g/l/iUET/M+nSrXlwYF2e0KeKqgGpjy3qhwQY4tG62A=", + "lastModified": 1770316708, + "narHash": "sha256-i9oEi2PUIZfp+73ZvQE/Ze0aCEV3y3+vvaJ/ZmAe3bw=", "ref": "refs/heads/main", - "rev": "4fc28bfb4f95071d34184c7ba3153eaff87eba41", - "revCount": 121, + "rev": "955746af205e2a94a8e0798a911941da9c5af779", + "revCount": 117, "type": "git", "url": "https://forge.dobutterfliescry.net/cry/site" }, @@ -108,11 +111,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1769996383, - "narHash": "sha256-AnYjnFWgS49RlqX7LrC4uA+sCCDBj0Ry/WOJ5XWAsa0=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "57928607ea566b5db3ad13af0e57e921e6b12381", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -255,11 +258,11 @@ ] }, "locked": { - "lastModified": 1770943752, - "narHash": "sha256-3vWAy2BCP5liaCEKmeqeVWbTCF/JnukgMOg8qf8mCcg=", + "lastModified": 1770365342, + "narHash": "sha256-jV5tAs67HSBWz/ePEp1eyoUK3Lqfc1fEAvt2wC6reFc=", "owner": "FlameFlag", "repo": "nixcord", - "rev": "aa1626057e57eca3686fbc1c3e2ddfde884c6b2a", + "rev": "51db830336715209a4a213aa985f4d405ff0be69", "type": "github" }, "original": { @@ -286,11 +289,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1769909678, - "narHash": "sha256-cBEymOf4/o3FD5AZnzC3J9hLbiZ+QDT/KDuyHXVJOpM=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "72716169fe93074c333e8d0173151350670b824c", + "lastModified": 1761114652, + "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", "type": "github" }, "original": { @@ -301,11 +304,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1770841267, - "narHash": "sha256-9xejG0KoqsoKEGp2kVbXRlEYtFFcDTHjidiuX8hGO44=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ec7c70d12ce2fc37cb92aff673dcdca89d187bae", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { @@ -354,14 +357,17 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1770954326, - "narHash": "sha256-PZ+78r+iFZ90l6fdwC73SSyNyCqaiZIAFeDg0qBHY+8=", - "path": "/home/me/cry/mk/nt", - "type": "path" + "lastModified": 1770950436, + "narHash": "sha256-+h5jrsIJBea5P+rAk4OqUpScqnHYQTvCRUhgGv/MX34=", + "owner": "cry128", + "repo": "nt", + "rev": "8725f5079f8f27b3faafeff90e5fc075d55e7d0a", + "type": "github" }, "original": { - "path": "/home/me/cry/mk/nt", - "type": "path" + "owner": "cry128", + "repo": "nt", + "type": "github" } }, "root": { diff --git a/groups/all/default.nix b/groups/all/default.nix index 3860303..2c84bee 100644 --- a/groups/all/default.nix +++ b/groups/all/default.nix @@ -1,9 +1,12 @@ { + inputs, pkgs, lib, ... }: { imports = [ + inputs.dobutterfliescry-net.overlays.default + ./modules/flatpak.nix ]; diff --git a/groups/cryos/programs.nix b/groups/cryos/programs.nix index 4ec2405..4b0fc6b 100644 --- a/groups/cryos/programs.nix +++ b/groups/cryos/programs.nix @@ -45,6 +45,7 @@ nix-prefetch-git nix-index nix-unit + deploy-rs.deploy-rs # Python python312 # I use 3.12 since it's in a pretty stable state now diff --git a/homes/modules/wm/hypr/hyprland.nix b/homes/modules/wm/hypr/hyprland.nix index 4db2870..b9ca1f7 100755 --- a/homes/modules/wm/hypr/hyprland.nix +++ b/homes/modules/wm/hypr/hyprland.nix @@ -2,6 +2,7 @@ # and your home-manager config (for managing hyprland's config files) { pkgs, + pkgs-unstable, inputs, config, lib, @@ -14,7 +15,7 @@ config = lib.mkIf config.hyprland.enable { wayland.windowManager.hyprland = { enable = true; - package = pkgs.hyprland; # upkgs.hyprland; + package = pkgs.hyprland; # pkgs-unstable.hyprland; xwayland.enable = true; diff --git a/nixpkgs.nix b/nixpkgs.nix deleted file mode 100644 index 549ca0b..0000000 --- a/nixpkgs.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - 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; - }; - }; - }; -}