From 4e152b1f35d8d4be84782df4c374dd5281d292b2 Mon Sep 17 00:00:00 2001
From: Vivian Roest <vivian@0x76.dev>
Date: Mon, 28 Nov 2022 23:36:13 +0100
Subject: [PATCH] laptop iso

---
 flake.nix                             |  6 ++++++
 nixos/hosts/thalassa/default.nix      |  4 ++++
 nixos/iso-graphical.nix               | 15 +++++++++++++++
 nixos/pkgs/gitea-agatheme/default.nix |  6 +++---
 4 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 nixos/iso-graphical.nix

diff --git a/flake.nix b/flake.nix
index 3bf7aa79..0e0688ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,6 +114,12 @@
           modules = [ (import ./nixos/iso.nix) ];
         };
 
+        iso-graphical = nixos-generators.nixosGenerate {
+          inherit system pkgs;
+          format = "iso";
+          modules = [ (import ./nixos/iso-graphical.nix) ];
+        };
+
         proxmox-lxc = nixos-generators.nixosGenerate {
           inherit system pkgs;
           format = "proxmox-lxc";
diff --git a/nixos/hosts/thalassa/default.nix b/nixos/hosts/thalassa/default.nix
index 54f43a97..51073333 100644
--- a/nixos/hosts/thalassa/default.nix
+++ b/nixos/hosts/thalassa/default.nix
@@ -3,4 +3,8 @@
     hostname = "null";
     type = "local";
   }
+  # {
+  #   hostname = "aoife";
+  #   type = "local";
+  # }
 ]
diff --git a/nixos/iso-graphical.nix b/nixos/iso-graphical.nix
new file mode 100644
index 00000000..c73a7748
--- /dev/null
+++ b/nixos/iso-graphical.nix
@@ -0,0 +1,15 @@
+{ pkgs, modulesPath, lib, config, ... }: {
+  imports = [
+    "${modulesPath}/installer/cd-dvd/installation-cd-graphical-calamares-gnome.nix"
+  ];
+
+  # use the latest Linux kernel
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  environment.systemPackages = with pkgs; [
+    git
+  ];
+
+  # Needed for https://github.com/NixOS/nixpkgs/issues/58959
+  boot.supportedFilesystems = lib.mkForce [ "btrfs" "ext4" ];
+}
diff --git a/nixos/pkgs/gitea-agatheme/default.nix b/nixos/pkgs/gitea-agatheme/default.nix
index 23bdcdc3..2a87ad71 100644
--- a/nixos/pkgs/gitea-agatheme/default.nix
+++ b/nixos/pkgs/gitea-agatheme/default.nix
@@ -1,10 +1,10 @@
 { lib, stdenvNoCC, fetchurl }: stdenvNoCC.mkDerivation {
   pname = "gitea-agatheme";
-  version = "1.1";
+  version = "1.2";
 
   src = fetchurl {
-    url = "https://git.lain.faith/attachments/4c2c2237-1e67-458e-8acd-92a20d382777";
-    sha256 = "sha256-uwtg6BAR5J28Ls3naQkJg7xBEfZPXVS5INH+bsVn4Uk=";
+    url = "https://git.lain.faith/attachments/290e2304-92a3-4991-8703-fbbf52f31340";
+    sha256 = "424f4e232c7d759485cdf1bcde9edde50f2992cf6bde61c21f71eae03a905543";
   };
 
   phases = [ "installPhase" ];