diff --git a/flake.lock b/flake.lock index 9023792..37e2f6e 100644 --- a/flake.lock +++ b/flake.lock @@ -96,6 +96,20 @@ "type": "github" } }, + "flake-schemas": { + "locked": { + "lastModified": 1780327564, + "narHash": "sha256-HiRPtA0spK+Dkgbhz/1zW9glXxNVB+L4Rj2VYmdawb8=", + "rev": "6cc9bd98891b1fc6bb2b8cb3277df8bc72799ca6", + "revCount": 149, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/flake-schemas/0.5.0/019e83cf-9af3-78b1-ac5b-70e68ad1efe1/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/DeterminateSystems/flake-schemas/%2A" + } + }, "flake-utils": { "inputs": { "systems": "systems" @@ -197,6 +211,26 @@ "type": "github" } }, + "hildibrand": { + "inputs": { + "flake-schemas": "flake-schemas", + "nixpkgs": "nixpkgs_3", + "rust-overlay": "rust-overlay_2" + }, + "locked": { + "lastModified": 1785717646, + "narHash": "sha256-j6MlkwaYOLa3bogK4SbOnVI5eMZ9j2GdExSiKMaELPo=", + "ref": "refs/heads/master", + "rev": "9588520925513ed0e47711a5798c6e9958143a0a", + "revCount": 5, + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" + }, + "original": { + "type": "git", + "url": "https://scm.wyattjmiller.com/wymiller/hildibrand.git" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -220,7 +254,7 @@ }, "home-manager_2": { "inputs": { - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1779507042, @@ -285,6 +319,20 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1784280462, + "narHash": "sha256-DtoqIqM7VkR6NxAkcLpMwmi02USwWb3JdmNGLyhthc0=", + "rev": "293d6abedf0478e681a4dfcfcb35b30fc796a32f", + "revCount": 1009740, + "type": "tarball", + "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2605.1009740%2Brev-293d6abedf0478e681a4dfcfcb35b30fc796a32f/019f73de-20f7-7ec2-98c8-65726640dbf9/source.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A" + } + }, + "nixpkgs_4": { "locked": { "lastModified": 1778443072, "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=", @@ -300,7 +348,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1780902259, "narHash": "sha256-q8yYEC5f1mFlQO9RGna4LTc9QrcvWunX6FYp83munkQ=", @@ -316,7 +364,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1744536153, "narHash": "sha256-awS2zRgF4uTwrOKwwiJcByDzDOdo3Q1rPZbiHQg/N38=", @@ -336,15 +384,16 @@ "inputs": { "darwin": "darwin_2", "flake-utils": "flake-utils_2", + "hildibrand": "hildibrand", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1783886399, - "narHash": "sha256-pcHOwEcr5xFGFRUriCdWFcBFBU5oouFW3iO65HCZ3cI=", + "lastModified": 1786304454, + "narHash": "sha256-2ovOgwFWnKqUMoQfxbobtIWQ+TSN62llX9eJVb9hFoY=", "ref": "refs/heads/master", - "rev": "b43f2ace4941315daabccc716e151a0ca47276db", - "revCount": 32, + "rev": "ea7094e4e33fbb030edf28383de37073fc8b84e0", + "revCount": 43, "type": "git", "url": "https://scm.wyattjmiller.com/wymiller/nur.git" }, @@ -362,7 +411,7 @@ "nix-flatpak": "nix-flatpak", "nixpkgs": "nixpkgs_2", "nur": "nur", - "rust-overlay": "rust-overlay_2" + "rust-overlay": "rust-overlay_3" } }, "rust-overlay": { @@ -388,7 +437,29 @@ }, "rust-overlay_2": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": [ + "nur", + "hildibrand", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1784438913, + "narHash": "sha256-NYF7ZM5ip0u+w1pBFDpIGEbrbgN/wpnLFAmBkWkYMXw=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "afacd6819d3765a05814ee8e3de74c77d42ac799", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1783834461, diff --git a/modules/machine/estinien/configuration.nix b/modules/machine/estinien/configuration.nix index 2074082..f93bd45 100644 --- a/modules/machine/estinien/configuration.nix +++ b/modules/machine/estinien/configuration.nix @@ -3,7 +3,9 @@ userName, nur, ... -}: { +}: let + hildibrand = nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand; + in { imports = [ ../../pwrMgmt ../../networking/core.nix @@ -53,7 +55,7 @@ }; environment.systemPackages = [ - nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand + hildibrand ]; systemd.services.hildibrand = { @@ -64,7 +66,7 @@ Type = "simple"; User = userName; WorkingDirectory = "/home/${userName}"; - ExecStart = "${nur.packages.${pkgs.stdenv.hostPlatform.system}.hildibrand}/bin/hildibrand"; + ExecStart = "${hildibrand}/bin/hildebrand"; Restart = "on-failure"; RestartSec = "5s"; };