diff --git a/nix/hosts/heather/reverse-proxy.nix b/nix/hosts/heather/reverse-proxy.nix index f36b315..22c7eb2 100644 --- a/nix/hosts/heather/reverse-proxy.nix +++ b/nix/hosts/heather/reverse-proxy.nix @@ -21,7 +21,7 @@ plugins = [ "github.com/caddy-dns/rfc2136@v1.0.0" ]; - hash = "sha256-i6hgT3ufiVz13f2Ruox7EPLhIDXSomA3T/4IFmoHJUo="; + hash = "sha256-HohHrhdQb68UVl0oiT2b9+E/SNVMfGDHkZdJ2sY8Bu0="; }; globalConfig = '' metrics { diff --git a/nix/modules/default.nix b/nix/modules/default.nix index f066250..c6b3619 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -3,8 +3,12 @@ inputs, pkgs, config, + lib, ... }: +let + inherit (lib) mkForce; +in { system.stateVersion = "25.05"; @@ -75,7 +79,7 @@ ]; nixpkgs = { - config.allowUnfree = true; + config.allowUnfree = mkForce true; overlays = [ (import ../pkgs/default.nix inputs) ]; diff --git a/nix/npins/sources.json b/nix/npins/sources.json index 5c7f94b..ccf410e 100644 --- a/nix/npins/sources.json +++ b/nix/npins/sources.json @@ -51,9 +51,9 @@ }, "branch": "master", "submodules": false, - "revision": "683b7f72db7202e4ad037c58fac53b3f7c12f980", - "url": "https://github.com/nix-community/lanzaboote/archive/683b7f72db7202e4ad037c58fac53b3f7c12f980.tar.gz", - "hash": "sha256-2hj+F0SxJ9tVtJSGQpoO53vtrXxbeqURz65tkmm15GE=" + "revision": "f142433bdbeffd2af51231e0aff7162c2bfbf6ef", + "url": "https://github.com/nix-community/lanzaboote/archive/f142433bdbeffd2af51231e0aff7162c2bfbf6ef.tar.gz", + "hash": "sha256-5/wlGe3a4ucxvYq2cuAAsuSFWKcIttQ6En83MLlV2jY=" }, "nixos": { "type": "Git", @@ -64,9 +64,9 @@ }, "branch": "nixos-unstable", "submodules": false, - "revision": "624af665418d3c65d544145b4d34ad696439570e", - "url": "https://github.com/NixOS/nixpkgs/archive/624af665418d3c65d544145b4d34ad696439570e.tar.gz", - "hash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=" + "revision": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", + "url": "https://github.com/NixOS/nixpkgs/archive/f13ff45afd1bb73e640eaa08a7066dbed07e3238.tar.gz", + "hash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=" }, "nixos-hardware": { "type": "Git", @@ -77,16 +77,16 @@ }, "branch": "master", "submodules": false, - "revision": "a017f5b72210026af5b3ac5949f08d94380a6fbd", - "url": "https://github.com/NixOS/nixos-hardware/archive/a017f5b72210026af5b3ac5949f08d94380a6fbd.tar.gz", - "hash": "sha256-1CfD8ZUjCkTgjsneLZ/lxCHhgDfqxxE7/GX0MmsgiqA=" + "revision": "2e790b0a6be8ec2b76174ac0931b8ff11919ec98", + "url": "https://github.com/NixOS/nixos-hardware/archive/2e790b0a6be8ec2b76174ac0931b8ff11919ec98.tar.gz", + "hash": "sha256-65EQYIRRpTdpH8lUiB6Mvo5uBkG60aBIzAJuALfx+O0=" }, "nixos-stable": { "type": "Channel", "name": "nixos-26.05", "artifact": "nixexprs.tar.xz", - "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.6200.8623c4c20aa4/nixexprs.tar.xz", - "hash": "sha256-V1MsJr1brsjtyfzGtnQ4id/qw6NjeYRqTY5vlf9s7CU=" + "url": "https://releases.nixos.org/nixos/26.05/nixos-26.05.7201.ee48b147c18c/nixexprs.tar.xz", + "hash": "sha256-iDLHbagLeTbQwI79zkbPdsUbwPvsk6nCJNSep+l1BRk=" }, "tangled": { "type": "GitRelease", diff --git a/nix/pkgs/default.nix b/nix/pkgs/default.nix index 1b16435..54167f0 100644 --- a/nix/pkgs/default.nix +++ b/nix/pkgs/default.nix @@ -52,18 +52,6 @@ inputs: final: prev: --set QT_QPA_PLATFORM xcb ''; }; - niri = prev.niri.override { - libdisplay-info = prev.libdisplay-info.overrideAttrs (finalAttrs: { - version = "0.3.0"; - src = final.fetchFromGitLab { - domain = "gitlab.freedesktop.org"; - owner = "emersion"; - repo = "libdisplay-info"; - rev = finalAttrs.version; - sha256 = "sha256-nXf2KGovNKvcchlHlzKBkAOeySMJXgxMpbi5z9gLrdc="; - }; - }); - }; # Missing packages upmpdcli = final.callPackage ./upmpdcli.nix { };