diff --git a/README.md b/README.md index 10a1c22..7708cd6 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ This repository contains configuration files for building a custom NixOS ISO. The ISO is based on the `nixpkgs-unstable` repository and includes the latest Zen kernel (6.8+) with support for the latest filesystems, including `bcachefs`, `btrfs`, `ext4`. Two types of ISO can be built:- + * Graphical * Minimal @@ -23,12 +24,15 @@ git clone https://github.com/JohnRTitor/nix-iso.git cd nix-iso ``` -- For building full graphical ISO -``` +* For building full graphical ISO + +```bash nix build .#nixosConfigurations.nixos-iso.config.system.build.isoImage ``` -- For building minimal ISO -``` + +* For building minimal ISO + +```bash nix build .#nixosConfigurations.nixos-minimal.config.system.build.isoImage ``` diff --git a/flake.lock b/flake.lock index b9c339e..4ef9319 100644 --- a/flake.lock +++ b/flake.lock @@ -2,18 +2,17 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1714314149, - "narHash": "sha256-yNAevSKF4krRWacmLUsLK7D7PlfuY3zF0lYnGYNi9vQ=", - "owner": "nixos", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf8cc1201be8bc71b7cbbbdaf349b22f4f99c7ae", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" } }, "root": { diff --git a/flake.nix b/flake.nix index 1aca748..198e771 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ { description = "Unstable NixOS custom installation media"; - inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + inputs.nixpkgs.url = "nixpkgs/nixos-unstable"; outputs = { self, nixpkgs }: let diff --git a/graphical-configuration.nix b/graphical-configuration.nix index c639e6c..2b4cf4f 100644 --- a/graphical-configuration.nix +++ b/graphical-configuration.nix @@ -35,7 +35,7 @@ "cifs" "bcachefs" "ext4" - ] ++ lib.optionals (zfsSupport) [ "zfs" ]; + ] ++ lib.optionals zfsSupport [ "zfs" ]; networking.hostName = "nixos-iso"; # set live session hostname @@ -46,7 +46,7 @@ nixpkgs.config.allowUnfree = true; # Set environment variable for allowing non-free packages - environment.sessionVariables = rec { + environment.sessionVariables = { NIXPKGS_ALLOW_UNFREE = "1"; }; diff --git a/minimal-configuration.nix b/minimal-configuration.nix index 81c46af..640a19d 100644 --- a/minimal-configuration.nix +++ b/minimal-configuration.nix @@ -32,14 +32,14 @@ "ntfs" "bcachefs" "ext4" - ] ++ lib.optionals (zfsSupport) [ "zfs" ]; + ] ++ lib.optionals zfsSupport [ "zfs" ]; networking.hostName = "nixos-minimal"; # set live session hostname # Wireless network and wired network is enabled by default nixpkgs.config.allowUnfree = true; # Set environment variable for allowing non-free packages - environment.sessionVariables = rec { + environment.sessionVariables = { NIXPKGS_ALLOW_UNFREE = "1"; };