diff --git a/flake.lock b/flake.lock index 48693bd..7c174b6 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1620055814, - "narHash": "sha256-8LEHoYSJiL901bTMVatq+rf8y7QtWuZhwwpKE2fyaRY=", + "lastModified": 1672791794, + "narHash": "sha256-mqGPpGmwap0Wfsf3o2b6qHJW1w2kk/I6cGCGIU+3t6o=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1db42b7fe3878f3f5f7a4f2dc210772fd080e205", + "rev": "9813adc7f7c0edd738c6bdd8431439688bb0cb3d", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixos-20.03", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index 7bd60b8..e03b558 100644 --- a/flake.nix +++ b/flake.nix @@ -1,30 +1,18 @@ { - inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-20.03"; + description = "Julian's system configuration"; + + inputs = { + nixpkgs.url = "nixpkgs/nixos-unstable"; + }; outputs = { self, nixpkgs }: { - nixosConfigurations.container = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - modules = - [ ({ pkgs, ... }: { - boot.isContainer = true; - - # Let 'nixos-version --json' know about the Git revision - # of this flake. - system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev; - - # Network configuration. - networking.useDHCP = false; - networking.firewall.allowedTCPPorts = [ 80 ]; - - # Enable a web server. - services.httpd = { - enable = true; - adminAddr = "morty@example.org"; - }; - }) - ]; + nixosConfigurations = { + framework = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; + modules = [ ./configuration.nix ]; + + }; }; - }; }