From ddd9342a302b2d0ba5ddfaada6ac289463503655 Mon Sep 17 00:00:00 2001
From: Dmitry Voronin <hi@voronind.com>
Date: Sun, 19 Jan 2025 09:25:14 +0300
Subject: [PATCH] Live: Tweak a bit.

---
 .gitignore                         |  2 +-
 Makefile                           | 10 +++-------
 config/Live.nix                    |  2 +-
 home/file/fuzzel/default.nix       |  2 +-
 host/x86_64-linux/live/default.nix |  5 +----
 package/default.nix                |  1 +
 6 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/.gitignore b/.gitignore
index 923827e..ac23a0a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/live
+/iso
diff --git a/Makefile b/Makefile
index 7510ace..505cdc2 100644
--- a/Makefile
+++ b/Makefile
@@ -52,15 +52,12 @@ install-hm:
 	nix-channel --update
 	nix-shell '<home-manager>' -A install
 
-.PHONY: installer
 installer:
-	nix build -o installer $(options) $(flake)#nixosConfigurations.installer.config.system.build.isoImage
+	nix build -o iso/installer $(options) $(flake)#nixosConfigurations.installer.config.system.build.isoImage
 
-.PHONY: isolation
 isolation:
-	nix build -o isolation $(options) $(flake)#nixosConfigurations.isolation.config.system.build.isoImage
+	nix build -o iso/isolation $(options) $(flake)#nixosConfigurations.isolation.config.system.build.isoImage
 
-.PHONY: live
 live:
 	nix build -o iso/live $(options) $(flake)#nixosConfigurations.live.config.system.build.isoImage
 
@@ -70,9 +67,8 @@ no-nixconf:
 reboot: boot
 	reboot
 
-.PHONY: recovery
 recovery:
-	nix build -o recovery $(options) $(flake)#nixosConfigurations.recovery.config.system.build.isoImage
+	nix build -o iso/recovery $(options) $(flake)#nixosConfigurations.recovery.config.system.build.isoImage
 
 show:
 	nix flake show
diff --git a/config/Live.nix b/config/Live.nix
index dd73350..c85c963 100644
--- a/config/Live.nix
+++ b/config/Live.nix
@@ -4,7 +4,7 @@ let
 in
 {
   config = lib.mkIf cfg.enable {
-    services.rogue.enable = true;
+    # services.rogue.enable = true; # NOTE: Not available smh.
     services.mingetty = {
       autologinUser = "live";
       helpLine = ''
diff --git a/home/file/fuzzel/default.nix b/home/file/fuzzel/default.nix
index f19525d..63f2a03 100644
--- a/home/file/fuzzel/default.nix
+++ b/home/file/fuzzel/default.nix
@@ -3,7 +3,7 @@ let
   dpiAware = if config.module.display.dpiAware then "yes" else "no";
 in
 {
-  file = (pkgs.formats.ini { }).generate "FuzzelConfig" {
+  file = (pkgs.formats.ini { }).generate "fuzzel-config" {
     main = {
       dpi-aware = dpiAware;
       font = "Minecraftia:size=${toString config.module.style.font.size.popup}";
diff --git a/host/x86_64-linux/live/default.nix b/host/x86_64-linux/live/default.nix
index 999c420..f398639 100644
--- a/host/x86_64-linux/live/default.nix
+++ b/host/x86_64-linux/live/default.nix
@@ -4,11 +4,8 @@
 
   module = {
     purpose = {
-      live = true;
-    };
-    package = {
-      common = true;
       desktop = true;
+      live = true;
     };
   };
 }
diff --git a/package/default.nix b/package/default.nix
index db541e2..d5ed873 100644
--- a/package/default.nix
+++ b/package/default.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
   pkgs,
   pkgsMaster,
   pkgsUnstable,