From e9decd46c6eb0ea6284bacfbbddbe4d6bfb7c37c Mon Sep 17 00:00:00 2001 From: kB01 Date: Wed, 11 Dec 2024 01:00:48 +0100 Subject: [PATCH] Added Iso-Build Config for Plasma 6 --- flake.lock | 67 ++++++++++++++----- flake.nix | 2 + .../x86_64-iso/plasma6-64bit-iso/default.nix | 7 ++ 3 files changed, 61 insertions(+), 15 deletions(-) create mode 100644 systems/x86_64-iso/plasma6-64bit-iso/default.nix diff --git a/flake.lock b/flake.lock index c7ad948..9b33ab2 100644 --- a/flake.lock +++ b/flake.lock @@ -127,11 +127,11 @@ ] }, "locked": { - "lastModified": 1732482255, - "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=", + "lastModified": 1733873195, + "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=", "owner": "nix-community", "repo": "home-manager", - "rev": "a9953635d7f34e7358d5189751110f87e3ac17da", + "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758", "type": "github" }, "original": { @@ -184,11 +184,11 @@ ] }, "locked": { - "lastModified": 1732585961, - "narHash": "sha256-qZk3i/Kk3JL4roSeXlrD2rqjsowBVzoBkXHIzxBGyPs=", + "lastModified": 1733709556, + "narHash": "sha256-u0ll0DDrKlO7tiLGGtmphv3wFy5ReDuf0USo/OlfROU=", "owner": "Infinidoge", "repo": "nix-minecraft", - "rev": "eb1c9ac4398dcc55d644003548c64964c854fac1", + "rev": "8d11f147df83fe137d3d94f6f3646e3a52bec855", "type": "github" }, "original": { @@ -197,13 +197,49 @@ "type": "github" } }, + "nixlib": { + "locked": { + "lastModified": 1733620091, + "narHash": "sha256-5WoMeCkaXqTZwwCNLRzyLxEJn8ISwjx4cNqLgqKwg9s=", + "owner": "nix-community", + "repo": "nixpkgs.lib", + "rev": "f4dc9a6c02e5e14d91d158522f69f6ab4194eb5b", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixpkgs.lib", + "type": "github" + } + }, + "nixos-generators": { + "inputs": { + "nixlib": "nixlib", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733706547, + "narHash": "sha256-BdFW7TMgES7q8I5FGX5hlz+0Xp4WyfAP3tHDwEupSWU=", + "owner": "nix-community", + "repo": "nixos-generators", + "rev": "f5a0197ccfef7388885fc9455e74d6dd39e0c5e8", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-generators", + "type": "github" + } + }, "nixos-hardware": { "locked": { - "lastModified": 1732483221, - "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=", + "lastModified": 1733861262, + "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405", + "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5", "type": "github" }, "original": { @@ -215,11 +251,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1732014248, - "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", + "lastModified": 1733759999, + "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", + "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56", "type": "github" }, "original": { @@ -234,6 +270,7 @@ "home-manager": "home-manager", "lix-module": "lix-module", "nix-minecraft": "nix-minecraft", + "nixos-generators": "nixos-generators", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "snowfall-lib": "snowfall-lib", @@ -269,11 +306,11 @@ ] }, "locked": { - "lastModified": 1732575825, - "narHash": "sha256-xtt95+c7OUMoqZf4OvA/7AemiH3aVuWHQbErYQoPwFk=", + "lastModified": 1733785344, + "narHash": "sha256-pm4cfEcPXripE36PYCl0A2Tu5ruwHEvTee+HzNk+SQE=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3433ea14fbd9e6671d0ff0dd45ed15ee4c156ffa", + "rev": "a80af8929781b5fe92ddb8ae52e9027fae780d2a", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index ac796bc..c997566 100644 --- a/flake.nix +++ b/flake.nix @@ -12,6 +12,8 @@ home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-minecraft.url = "github:Infinidoge/nix-minecraft"; nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; + nixos-generators.url = "github:nix-community/nixos-generators"; + nixos-generators.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs: inputs.snowfall-lib.mkFlake { diff --git a/systems/x86_64-iso/plasma6-64bit-iso/default.nix b/systems/x86_64-iso/plasma6-64bit-iso/default.nix new file mode 100644 index 0000000..814c73f --- /dev/null +++ b/systems/x86_64-iso/plasma6-64bit-iso/default.nix @@ -0,0 +1,7 @@ +{ pkgs, modulesPath, lib, ... }: +{ + imports = [ + "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-plasma6.nix" + ]; + +}