diff --git a/flake.lock b/flake.lock index a220a8e..40417a7 100644 --- a/flake.lock +++ b/flake.lock @@ -19,9 +19,7 @@ "conf": { "inputs": { "home-manager": "home-manager", - "hosts": [ - "hosts" - ], + "hosts": "hosts", "ide": "ide", "musnix": "musnix", "nixpkgs": [ @@ -31,11 +29,11 @@ "sal": "sal" }, "locked": { - "lastModified": 1722631388, - "narHash": "sha256-ljnH69V9wdUUIjRZiCQwi5Wy6+00+YbXRqCGT/NYCc8=", + "lastModified": 1722692511, + "narHash": "sha256-xXYlr5P/q2D5D69bnkK5yBNAdqdN7U8HjotosQVRpn4=", "owner": "ivandimitrov8080", "repo": "configuration.nix", - "rev": "c09e7674f49553dccb2026acc2265610bb7af8e8", + "rev": "1d438b291dbf436a201e5f3c77ee32383868d73f", "type": "github" }, "original": { @@ -776,6 +774,7 @@ "hosts": { "inputs": { "nixpkgs": [ + "conf", "nixpkgs" ] }, @@ -805,11 +804,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1722536391, - "narHash": "sha256-LAL00y8IMU1I2IMTy4q8vlBW+hS6ulElh1kX+CWJgSo=", + "lastModified": 1722691995, + "narHash": "sha256-TWpmjsNJN75sHfAfsFTlhSl2t5ZQtoRTthu2XfaFnpw=", "owner": "ivandimitrov8080", "repo": "flake-ide", - "rev": "24a89c8ed56a635683decec0e0d43b132c404150", + "rev": "c3a2cc3f24a854ad91513f1692607764ee9e6b8e", "type": "github" }, "original": { @@ -998,11 +997,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722372011, - "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", + "lastModified": 1722519197, + "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", + "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", "type": "github" }, "original": { @@ -1134,7 +1133,6 @@ "root": { "inputs": { "conf": "conf", - "hosts": "hosts", "nixpkgs": "nixpkgs", "simple-nixos-mailserver": "simple-nixos-mailserver", "vpsadminos": "vpsadminos", diff --git a/flake.nix b/flake.nix index 4bd7c27..8c658ba 100644 --- a/flake.nix +++ b/flake.nix @@ -2,9 +2,8 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; vpsadminos.url = "github:vpsfreecz/vpsadminos"; - conf = { url = "github:ivandimitrov8080/configuration.nix"; inputs = { nixpkgs.follows = "nixpkgs"; hosts.follows = "hosts"; }; }; + conf = { url = "github:ivandimitrov8080/configuration.nix"; inputs = { nixpkgs.follows = "nixpkgs"; }; }; simple-nixos-mailserver = { url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs.nixpkgs.follows = "nixpkgs"; }; - hosts = { url = "github:StevenBlack/hosts"; inputs.nixpkgs.follows = "nixpkgs"; }; webshite = { url = "github:ivandimitrov8080/idimitrov.dev"; inputs.nixpkgs.follows = "nixpkgs"; }; }; @@ -13,7 +12,6 @@ , vpsadminos , conf , simple-nixos-mailserver - , hosts , webshite , ... }: @@ -31,8 +29,8 @@ modules = [ vpsadminos.nixosConfigurations.container simple-nixos-mailserver.nixosModule - hosts.nixosModule mods.base + mods.shell ./mailserver ]; pkgs = import nixpkgs {