diff --git a/config/Live.nix b/config/Live.nix deleted file mode 100644 index ed98e9a..0000000 --- a/config/Live.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ lib, config, inputs, ... }: -let - cfg = config.module.live; -in -{ - config = lib.mkIf cfg.enable { - imports = [ - "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix" - ]; - }; -} - diff --git a/host/x86_64-linux/installer/default.nix b/host/x86_64-linux/installer/default.nix index c60de07..69c622e 100644 --- a/host/x86_64-linux/installer/default.nix +++ b/host/x86_64-linux/installer/default.nix @@ -1,4 +1,4 @@ -{ inputs, lib, ... }: +{ inputs, lib, pkgs, ... }: { imports = [ "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix" @@ -13,6 +13,11 @@ PermitRootLogin = lib.mkForce "yes"; }; + # Needed by installer smh. + environment.systemPackages = with pkgs; [ + ghc + ]; + # Root user setup. home.nixos.enable = true; user.root = true; diff --git a/host/x86_64-linux/live/default.nix b/host/x86_64-linux/live/default.nix index d6a6089..a15491d 100644 --- a/host/x86_64-linux/live/default.nix +++ b/host/x86_64-linux/live/default.nix @@ -1,5 +1,7 @@ -{ ... }: +{ inputs, ... }: { + imports = [ "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix" ]; + # Root user setup. home.nixos.enable = true; user.root = true; @@ -16,4 +18,3 @@ }; }; } - diff --git a/host/x86_64-linux/recovery/default.nix b/host/x86_64-linux/recovery/default.nix index 06bdf2b..60ab621 100644 --- a/host/x86_64-linux/recovery/default.nix +++ b/host/x86_64-linux/recovery/default.nix @@ -1,5 +1,7 @@ -{ ... }: +{ inputs, ... }: { + imports = [ "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix" ]; + # Root user setup. home.nixos.enable = true; user.root = true; @@ -11,4 +13,3 @@ }; }; } - diff --git a/option/Live.nix b/option/Live.nix deleted file mode 100644 index 9196358..0000000 --- a/option/Live.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ lib, config, ... }: -let - purpose = config.module.purpose; -in -{ - options.module.live.enable = lib.mkEnableOption "the live modules." // { - default = purpose.live; - }; -} diff --git a/option/Style.nix b/option/Style.nix index 1b69ed0..34e143d 100644 --- a/option/Style.nix +++ b/option/Style.nix @@ -76,11 +76,13 @@ in cursor = { name = mkStrOption "Bibata-Modern-Custom"; size = mkIntOption 24; - package = mkPkgOption (inputs.nix-cursors.packages.${pkgs.system}.bibata-modern-cursor.override { - accent_color = "#${cfg.color.accent}"; - background_color = "#${cfg.color.bg.light}"; - outline_color = "#${cfg.color.border}"; - }); + package = mkPkgOption ( + inputs.nix-cursors.packages.${pkgs.system}.bibata-modern-cursor.override { + accent_color = "#${cfg.color.accent}"; + background_color = "#${cfg.color.bg.light}"; + outline_color = "#${cfg.color.border}"; + } + ); }; # cursor = { # name = mkStrOption "phinger-cursors-light";