From c4a899eaad26d8311b8bd5a02bffca351b3437f0 Mon Sep 17 00:00:00 2001 From: tomoron Date: Mon, 10 Mar 2025 03:12:58 +0100 Subject: [PATCH] add a custom iso config --- Makefile | 5 +++++ flake.nix | 10 +++++++++- osConfigs/global.nix | 2 +- osConfigs/hosts/iso.nix | 17 +++++++++++++++++ osConfigs/packages.nix | 2 ++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 osConfigs/hosts/iso.nix diff --git a/Makefile b/Makefile index 7ba28bd..8dfe8ff 100644 --- a/Makefile +++ b/Makefile @@ -16,5 +16,10 @@ os: home : home-manager $(MODE) $(FLAGS) --flake $(FLAKE)#$(HOST) +iso : + nix build ".#nixosConfigurations.iso.config.system.build.isoImage" + cp result/iso/*.iso . + rm -rf result + cleanup : sudo nix-collect-garbage -d diff --git a/flake.nix b/flake.nix index c6d5e32..4cff45b 100644 --- a/flake.nix +++ b/flake.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2024/10/17 18:15:24 by tomoron #+# #+# # -# Updated: 2025/02/10 17:35:45 by tomoron ### ########.fr # +# Updated: 2025/03/10 00:53:03 by tomoron ### ########.fr # # # # **************************************************************************** # @@ -58,6 +58,14 @@ vbox = osConfig {flakeName = "vbox";}; laptop = osConfig {flakeName = "laptop"; extraModules = [ nixos-hardware.nixosModules.asus-zephyrus-ga401 ];}; desktop = osConfig {flakeName = "desktop";}; + + iso = nixpkgs.lib.nixosSystem { + inherit pkgs; + modules = [ + (nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix") + ./osConfigs/hosts/iso.nix + ]; + }; }; diff --git a/osConfigs/global.nix b/osConfigs/global.nix index c4b1237..7767f14 100644 --- a/osConfigs/global.nix +++ b/osConfigs/global.nix @@ -6,7 +6,7 @@ # By: tomoron +#+ +:+ +#+ # # +#+#+#+#+#+ +#+ # # Created: 2025/02/09 01:43:46 by tomoron #+# #+# # -# Updated: 2025/03/01 19:27:30 by tomoron ### ########.fr # +# Updated: 2025/03/10 00:30:30 by tomoron ### ########.fr # # # # **************************************************************************** # diff --git a/osConfigs/hosts/iso.nix b/osConfigs/hosts/iso.nix new file mode 100644 index 0000000..99a7a43 --- /dev/null +++ b/osConfigs/hosts/iso.nix @@ -0,0 +1,17 @@ +{ ... }: + +{ + imports = [ ../packages.nix ]; + + environment.etc."skel/nix-config".source = "${builtins.fetchGit { + url = "https://github.com/ARandomPig/nix-config"; + rev = "6982747ec65962a13dd07948b2317d8d571f39b8"; + ref = "master"; + }}"; + + system.activationScripts.populateUser.text = '' + mkdir -p /home/nixos + cp -r /etc/skel/nix-config + chown -R nixos:nixos /home/nixos/nix-config + ''; +} diff --git a/osConfigs/packages.nix b/osConfigs/packages.nix index 8fbdda3..a888884 100644 --- a/osConfigs/packages.nix +++ b/osConfigs/packages.nix @@ -11,6 +11,7 @@ gnumake git neofetch + neovim ntfs3g clang ninja @@ -23,5 +24,6 @@ stress ffmpeg cryptsetup + acpi ]; }