diff --git a/flake.lock b/flake.lock index ec7c7aa..30c7bde 100755 --- a/flake.lock +++ b/flake.lock @@ -1,29 +1,8 @@ { "nodes": { - "agenix": { - "inputs": { - "darwin": [], - "home-manager": "home-manager", - "nixpkgs": "nixpkgs", - "systems": "systems" - }, - "locked": { - "lastModified": 1770165109, - "narHash": "sha256-9VnK6Oqai65puVJ4WYtCTvlJeXxMzAp/69HhQuTdl/I=", - "owner": "ryantm", - "repo": "agenix", - "rev": "b027ee29d959fda4b60b57566d64c98a202e0feb", - "type": "github" - }, - "original": { - "owner": "ryantm", - "repo": "agenix", - "type": "github" - } - }, "bip110": { "inputs": { - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1773169138, @@ -41,7 +20,7 @@ }, "btc-clients": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "oldNixpkgs": "oldNixpkgs" }, "locked": { @@ -107,7 +86,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_2" + "systems": "systems" }, "locked": { "lastModified": 1731533236, @@ -123,32 +102,11 @@ "type": "github" } }, - "home-manager": { - "inputs": { - "nixpkgs": [ - "agenix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1745494811, - "narHash": "sha256-YZCh2o9Ua1n9uCvrvi5pRxtuVNml8X2a03qIFfRKpFs=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "abfad3d2958c9e6300a883bd443512c55dfeb1be", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "home-manager", - "type": "github" - } - }, "nix-bitcoin": { "inputs": { "extra-container": "extra-container", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-25_05": "nixpkgs-25_05", "nixpkgs-unstable": "nixpkgs-unstable" }, @@ -169,16 +127,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1754028485, - "narHash": "sha256-IiiXB3BDTi6UqzAZcf2S797hWEPCRZOwyNThJIYhUfk=", + "lastModified": 1772380631, + "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "59e69648d345d6e8fef86158c555730fa12af9de", + "rev": "6d3b61b190a899042ce82a5355111976ba76d698", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-25.05", + "owner": "nixos", + "ref": "master", "repo": "nixpkgs", "type": "github" } @@ -242,27 +200,11 @@ }, "original": { "owner": "nixos", - "ref": "master", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_3": { - "locked": { - "lastModified": 1772380631, - "narHash": "sha256-FhW0uxeXjefINP0vUD4yRBB52Us7fXZPk9RiPAopfiY=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "6d3b61b190a899042ce82a5355111976ba76d698", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1767480499, "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=", @@ -278,7 +220,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1774106199, "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=", @@ -294,7 +236,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1770380644, "narHash": "sha256-P7dWMHRUWG5m4G+06jDyThXO7kwSk46C1kgjEWcybkE=", @@ -313,8 +255,8 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_6", - "systems": "systems_3" + "nixpkgs": "nixpkgs_5", + "systems": "systems_2" }, "locked": { "lastModified": 1774309640, @@ -348,11 +290,10 @@ }, "root": { "inputs": { - "agenix": "agenix", "bip110": "bip110", "btc-clients": "btc-clients", "nix-bitcoin": "nix-bitcoin", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "nixpkgs-stable": "nixpkgs-stable", "nixvim": "nixvim" } @@ -386,21 +327,6 @@ "repo": "default", "type": "github" } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } } }, "root": "root", diff --git a/iso/common.nix b/iso/common.nix index 835b41d..3159003 100644 --- a/iso/common.nix +++ b/iso/common.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, modulesPath, ... }: let sovranSource = builtins.path { path = ../.; name = "sovran-systemsos"; }; @@ -6,7 +6,7 @@ let in { imports = [ - "${pkgs.path}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix" + "${modulesPath}/installer/cd-dvd/installation-cd-graphical-gnome.nix" ./branding.nix ]; @@ -45,4 +45,4 @@ in Terminal=false X-GNOME-Autostart-enabled=true ''; -} \ No newline at end of file +}