diff --git a/bacon.nix b/bacon.nix index 95fcbfa..892d0ec 100644 --- a/bacon.nix +++ b/bacon.nix @@ -1,4 +1,4 @@ -{ inputs, system, pkgs-unstable }: with inputs; +{ inputs, system, pkgs }: with inputs; let username = "sigmanificient"; in @@ -6,7 +6,7 @@ in inherit system; specialArgs = { - inherit username pkgs-unstable; + inherit username pkgs; hostname = "Bacon"; }; diff --git a/flake.nix b/flake.nix index bea09cb..c8ff5af 100644 --- a/flake.nix +++ b/flake.nix @@ -15,18 +15,29 @@ }; }; - outputs = inputs: - with inputs; let + outputs = { nixpkgs, nixpkgs-unstable, ... } @ inputs: + let system = "x86_64-linux"; - pkgs = nixpkgs.legacyPackages.${system}; - pkgs-unstable = nixpkgs.legacyPackages.${system}; + + pkgs-settings = { + inherit system; + config.allowUnfree = true; + }; + + pkgs = import nixpkgs (pkgs-settings // { + overlays = [ + (_: _: { + unstable = import nixpkgs-unstable pkgs-settings; + }) + ]; + }); in { formatter.${system} = pkgs.nixpkgs-fmt; nixosConfigurations = { Bacon = nixpkgs.lib.nixosSystem - (import ./bacon.nix { inherit inputs system pkgs-unstable; }); + (import ./bacon.nix { inherit inputs system pkgs; }); }; }; } diff --git a/system/default.nix b/system/default.nix index dbca9c3..b5b66dc 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,4 +1,4 @@ -{ config, username, hostname, pkgs, pkgs-unstable, ... }: +{ config, username, hostname, pkgs, ... }: { imports = [ @@ -217,7 +217,7 @@ virtualisation = { docker = { enable = true; - package = pkgs-unstable.docker; + package = pkgs.unstable.docker; }; libvirtd.enable = true;