From 100f89b4444fd5bef7379229f16c7299c3e975a0 Mon Sep 17 00:00:00 2001
From: Tao Tien <29749622+taotien@users.noreply.github.com>
Date: Mon, 17 Feb 2025 22:48:03 -0800
Subject: [PATCH] iso

---
 flake.nix         | 32 +++++++++++++++++++++++++++++---
 systems/BASED.nix | 11 ++++++-----
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8953820..bc8f6f9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -147,14 +147,40 @@
       bcachefs-iso = nixos.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [
-          "${nixos}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix"
+          # "${nixos}/nixos/modules/installer/cd-dvd/installation-cd-minimal-new-kernel-no-zfs.nix"
+          "${nixos}/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix"
           ({
             lib,
             pkgs,
             ...
           }: {
-            boot.supportedFilesystems = ["bcachefs"];
-            boot.kernelPackages = lib.mkOverride 0 pkgs.linuxPackages_latest;
+            nixpkgs.config = {
+              allowUnfree = true;
+            };
+            environment.systemPackages = with pkgs; [
+              helix
+              bat
+              bottom
+              dumbpipe
+              sendme
+              git
+              firefox
+              ouch
+              pueue
+              ripgrep
+              # rustdesk
+              skim
+              tree
+              wezterm
+              wget
+              zstd
+              # bcachefs-tools
+            ];
+            # boot.supportedFilesystems = ["bcachefs"];
+            boot.supportedFilesystems.btrfs = true;
+            boot.supportedFilesystems.zfs = lib.mkForce false;
+            boot.kernelPackages = pkgs.linuxPackages_latest;
+            isoImage.squashfsCompression = "zstd";
           })
         ];
       };
diff --git a/systems/BASED.nix b/systems/BASED.nix
index 7002932..e3e0392 100644
--- a/systems/BASED.nix
+++ b/systems/BASED.nix
@@ -139,11 +139,12 @@
 
   time.timeZone = lib.mkDefault "US/Pacific";
   # services.automatic-timezoned.enable = lib.mkDefault true;
-  i18n.extraLocaleSettings = {
-    LC_CTYPE = "en_US.UTF-8";
-    LC_MESSAGES = "en_US.UTF-8";
-    LC_ALL = "en_US.UTF-8";
-  };
+  # i18n.defaultLocale = "en_US.UTF-8";
+  # i18n.extraLocaleSettings = {
+  #   LC_CTYPE = "en_US.UTF-8";
+  #   LC_MESSAGES = "en_US.UTF-8";
+  #   LC_ALL = "en_US.UTF-8";
+  # };
 
   systemd.extraConfig = ''
     DefaultTimeoutStopSec=15s