nixos-iso -> nixos-gnome, kernel: zen -> cachyos

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>

Author: JohnRTitor

README.md

@@ -24,10 +24,10 @@ git clone https://github.com/JohnRTitor/nix-iso.git
 cd nix-iso
 ```
 
-* For building full graphical ISO
+* For building full GNOME ISO
 
-```shell
-env NIXPKGS_ALLOW_BROKEN=1 nix build .#nixosConfigurations.nixos-iso.config.system.build.isoImage --impure
+```bash
+env NIXPKGS_ALLOW_BROKEN=1 nix build .#nixosConfigurations.nixos-gnome.config.system.build.isoImage --impure
 ```
 
 * For building minimal ISO

common.nix

@@ -0,0 +1,42 @@
+{
+  inputs,
+  lib,
+  pkgs,
+  ...
+}: {
+  imports = [
+    inputs.chaotic.nixosModules.default
+  ];
+
+  nixpkgs.config.allowUnfree = true;
+  # Set environment variable for allowing non-free packages
+  environment.sessionVariables = {
+    NIXPKGS_ALLOW_UNFREE = "1";
+  };
+
+  nix.settings.experimental-features = [
+    "nix-command"
+    "flakes"
+  ]; # enable nix command and flakes
+
+  nixpkgs.overlays = [
+    (final: prev: {
+      bcachefs-tools = inputs.bcachefs-tools.packages.${pkgs.system}.bcachefs-tools;
+    })
+  ];
+
+  boot.kernelPackages = pkgs.linuxPackages_cachyos;
+
+  boot.zfs.package = lib.mkOverride 99 pkgs.zfs_cachyos;
+
+  environment.systemPackages = with pkgs; [
+    # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+    vim
+    git
+    curl
+    parted
+    efibootmgr
+  ];
+
+  # Wireless network and wired network is enabled by default
+}

cosmic/cosmic.nix

@@ -0,0 +1,24 @@
+# This module defines a NixOS installation CD that contains GNOME.
+
+{ lib, inputs, ... }:
+
+{
+  imports = [
+    "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
+    "${inputs.nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-base.nix"
+  ];
+
+  isoImage.edition = lib.mkDefault "cosmic";
+
+  services.desktopManager.cosmic = {
+    enable = true;
+    xwayland.enable = true;
+  };
+
+  services.displayManager.cosmic-greeter.enable = true;
+
+  services.displayManager.autoLogin = {
+    enable = true;
+    user = "nixos";
+  };
+}

flake.lock

@@ -1,56 +1,59 @@
-# This is a basic NixOS flake template for a live ISO image
-# that can be used to install NixOS on a system.
-# ISO can be built using
-# `nix build .#nixosConfigurations.nixos-iso.config.system.build.isoImage` - Graphical ISO
-# `nix build .#nixosConfigurations.nixos-minimal.config.system.build.isoImage` - Minimal ISO
-# Make sure to enable flakes and nix-command on the host system, before building the ISO
-# Resulting image can be found in ./result/iso/ directory
 {
   description = "Unstable NixOS custom installation media";
+
+  # Main sources and repositories
   inputs = {
-    nixpkgs.url = "nixpkgs/nixos-unstable";
-    bcachefs-tools.url = "github:koverstreet/bcachefs-tools";
+    nixpkgs.url = "nixpkgs/nixos-unstable"; # Unstable NixOS system (default)
+    bcachefs-tools = {
+      url = "github:koverstreet/bcachefs-tools";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    # Don't add follows nixpkgs, else will cause local rebuilds
+    chaotic.url = "github:chaotic-cx/nyx/nyxpkgs-unstable"; # Bleeding edge packages from chaotic nyx, especially CachyOS kernel
   };
+
   outputs = {
     self,
     nixpkgs,
+    chaotic,
     ...
   } @ inputs: let
     system = "x86_64-linux"; # change arch here
 
     specialArgs = {
-      inherit system;
       inherit inputs;
     };
   in {
     formatter.${system} = nixpkgs.legacyPackages.${system}.alejandra;
+
     ## GRAPHICAL ISO ##
-    nixosConfigurations.nixos-iso = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.nixos-gnome = nixpkgs.lib.nixosSystem {
       inherit system;
       modules = [
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix"
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/channel.nix"
-        ./graphical-configuration.nix
+        ./gnome
       ];
       inherit specialArgs;
     };
+
     ## MINIMAL ISO ##
     nixosConfigurations.nixos-minimal = nixpkgs.lib.nixosSystem {
       inherit system;
       modules = [
-        "${nixpkgs}/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix"
-        ./minimal-configuration.nix
+        ./minimal
       ];
       inherit specialArgs;
     };
   };
 
-  # Add nix community cache
+  # Allows the user to use our cache when using `nix run <thisFlake>`.
   nixConfig = {
     extra-substituters = [
+      "https://nyx.chaotic.cx/"
       "https://nix-community.cachix.org"
     ];
     extra-trusted-public-keys = [
+      "nyx.chaotic.cx-1:HfnXSw4pj95iI/n17rIDy40agHj12WfF+Gqk6SonIT8="
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
     ];
   };