diff options
Diffstat (limited to '')
| -rw-r--r-- | flake.nix | 7 | ||||
| -rw-r--r-- | hosts/carmel/default.nix (renamed from hosts/carmel/configuration.nix) | 1 | ||||
| -rw-r--r-- | lib/default.nix | 14 |
3 files changed, 10 insertions, 12 deletions
@@ -1,9 +1,12 @@ { description = "personal NixOS configurations"; + inputs = { # Nixpkgs, NixOS's official repo nixpkgs.url = "github:nixos/nixpkgs/release-21.11"; + utils.url = "github:numtide/flake-utils"; + # We use the unstable nixpkgs repo for some packages. nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable"; @@ -18,7 +21,7 @@ outputs = { ... }@inputs: let lib = import ./lib { inherit inputs; }; - in: { + in { nixosConfigurations = { carmel = lib.mkSystem { hostname = "carmel"; @@ -37,7 +40,7 @@ }; } // inputs.utils.lib.eachDefaultSystem (system: let - pkgs = import inputs.nixpkgs { inherit system overlays; }; + pkgs = import inputs.nixpkgs { inherit system; }; home-manager = inputs.home-manager.defaultPackage."${system}"; in { diff --git a/hosts/carmel/configuration.nix b/hosts/carmel/default.nix index d009831..19c88c0 100644 --- a/hosts/carmel/configuration.nix +++ b/hosts/carmel/default.nix @@ -4,7 +4,6 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ../../modules/systems ../../modules/desktop ]; diff --git a/lib/default.nix b/lib/default.nix index 7f0f8ed..532a33b 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,24 +1,21 @@ -{ inputs, overlays }: +{ inputs }: + { mkSystem = { hostname , system - , desktop ? false }: inputs.nixpkgs.lib.nixosSystem { inherit system; specialArgs = { - inherit inputs system hostname desktop; + inherit inputs system hostname; }; modules = [ - ../modules/deskop ../modules/system ../hosts/${hostname} { networking.hostName = hostname; - # Apply overlay and allow unfree packages nixpkgs = { - inherit overlays; config.allowUnfree = true; }; # Add each input as a registry @@ -27,7 +24,7 @@ inputs.nixpkgs.lib.nameValuePair (n) ({ flake = v; })) inputs; } - ] + ]; }; mkHome = @@ -39,7 +36,7 @@ inputs.home-manager.lib.homeManagerConfiguration { inherit username system; extraSpecialArgs = { - inherit system hostname graphical; + inherit system hostname desktop; }; homeDirectory = "/home/${username}"; configuration = ../users/${username}; @@ -48,7 +45,6 @@ # Base configuration { nixpkgs = { - inherit overlays; config.allowUnfree = true; }; programs = { |