diff --git a/flake.lock b/flake.lock index c2d282b..bf08d97 100644 --- a/flake.lock +++ b/flake.lock @@ -447,16 +447,18 @@ }, "niphas": { "inputs": { - "nixpkgs": "nixpkgs", + "nixpkgs": [ + "nixpkgs-unstable" + ], "treefmt-nix": "treefmt-nix", "wrappers": "wrappers" }, "locked": { - "lastModified": 1770197728, - "narHash": "sha256-7KFx0gTPGaQf4dwTG3Y+SB67X9OD/gYx2/JIoUa2GOU=", + "lastModified": 1770383443, + "narHash": "sha256-LJVEYY8Aw0gkavNbZsAf8xEuCdW3BJrtlvRe3/vfzNQ=", "ref": "refs/heads/master", - "rev": "740a76f6ce13f7339bf26b8e591db46e72085226", - "revCount": 29, + "rev": "3df23352410acbc1d8d11f6e5fe0671dd98b0367", + "revCount": 32, "type": "git", "url": "https://code.kmein.de/kfm/niphas" }, @@ -545,15 +547,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1770134715, - "narHash": "sha256-bugJ+uTtL38KIh3M9vwXjTT3kt203MQbhD6ro1FcYsU=", + "lastModified": 1769598131, + "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2482bf09c2d388464c9fe0a49a39b42932fed967", + "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", "type": "github" }, "original": { "owner": "NixOS", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -589,18 +592,18 @@ "type": "github" } }, - "nixpkgs_2": { + "nixpkgs-unstable": { "locked": { - "lastModified": 1769598131, - "narHash": "sha256-e7VO/kGLgRMbWtpBqdWl0uFg8Y2XWFMdz0uUJvlML8o=", + "lastModified": 1770197578, + "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "fa83fd837f3098e3e678e6cf017b2b36102c7211", + "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-25.11", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -679,8 +682,9 @@ "nix-index-database": "nix-index-database", "nix-topology": "nix-topology", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "nixpkgs-old": "nixpkgs-old", + "nixpkgs-unstable": "nixpkgs-unstable", "nur": "nur", "retiolum": "retiolum", "scripts": "scripts", diff --git a/flake.nix b/flake.nix index 3e5d44d..8c01f9c 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,7 @@ nix-index-database.url = "github:nix-community/nix-index-database"; nixpkgs-old.url = "github:NixOS/nixpkgs/50fc86b75d2744e1ab3837ef74b53f103a9b55a0"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11"; + nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; niphas.url = "git+https://code.kmein.de/kfm/niphas"; nixos-hardware.url = "github:NixOS/nixos-hardware"; nur.url = "github:nix-community/NUR"; @@ -61,6 +62,7 @@ stylix.inputs.nixpkgs.follows = "nixpkgs"; tinc-graph.inputs.nixpkgs.follows = "nixpkgs"; wetter.inputs.nixpkgs.follows = "nixpkgs"; + niphas.inputs.nixpkgs.follows = "nixpkgs-unstable"; }; outputs = @@ -76,6 +78,7 @@ scripts, tinc-graph, nix-topology, + nixpkgs-unstable, nixos-hardware, niphas, treefmt-nix, @@ -199,6 +202,8 @@ niveum-browser = prev.firefox; niveum-filemanager = prev.pcmanfm; + ashell = nixpkgs-unstable.legacyPackages.${prev.system}.ashell; + # wrapped from upstream wrapScript = {