From da7bcecacd663bc7812c99a85e7ec895179e0884 Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Sun, 24 Mar 2024 10:01:48 -0400 Subject: [PATCH] Add disko config as parameter in flake system settings --- flake.nix | 11 ++++++----- profiles/personal/configuration.nix | 2 ++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index fa0a599..12c2a7d 100644 --- a/flake.nix +++ b/flake.nix @@ -16,11 +16,12 @@ let # --- SYSTEM SETTINGS --- # systemSettings = { - system = "x86_64-linux"; # System Architecture - hostname = "oryp7"; # Hostname - profile = "personal"; # Select a profile defined from profiles directory - timezone = "America/New_York"; # Time Zone - locale = "en_US.UTF-8"; # Locale + system = "x86_64-linux"; # System Architecture + hostname = "oryp7"; # Hostname + profile = "personal"; # Select a profile defined from profiles directory + timezone = "America/New_York"; # Time Zone + locale = "en_US.UTF-8"; # Locale + diskoConfig = "luks-btrfs-subvolumes"; # Disko Partition Configuration }; # --- USER SETTINGS --- # diff --git a/profiles/personal/configuration.nix b/profiles/personal/configuration.nix index 053f087..3e2ccac 100644 --- a/profiles/personal/configuration.nix +++ b/profiles/personal/configuration.nix @@ -7,6 +7,8 @@ { imports = [ ../../system/hardware-configuration.nix + "${builtins.fetchTarball "https://github.com/nix-community/disko/archive/master.tar.gz"}/module.nix" + "../../disko/${systemSettings.diskoConfiguration}.nix" ]; nix = {