From 4bb34105f1d89a6b3d3e86ce08008023ba2f1d96 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Sun, 15 Dec 2024 02:28:56 +0100
Subject: [PATCH 1/3] Machines/Archie: replace usb_storage module with nvme

---
 machines/Archie/hardware-configuration.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix
index bd32dc6..29e1a5b 100644
--- a/machines/Archie/hardware-configuration.nix
+++ b/machines/Archie/hardware-configuration.nix
@@ -14,7 +14,7 @@
   # Enable support for the Xbox One wireless dongle
   hardware.xone.enable = true;
 
-  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "nvme" "sd_mod"];
   boot.initrd.kernelModules = ["amdgpu"];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];

From 3eaabeacd9961f1d55bb082048cfb21fea1646b1 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Sun, 15 Dec 2024 02:30:44 +0100
Subject: [PATCH 2/3] Machines/Archie: remove btrfs compression

---
 machines/Archie/hardware-configuration.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/machines/Archie/hardware-configuration.nix b/machines/Archie/hardware-configuration.nix
index 29e1a5b..da6c290 100644
--- a/machines/Archie/hardware-configuration.nix
+++ b/machines/Archie/hardware-configuration.nix
@@ -22,19 +22,19 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
     fsType = "btrfs";
-    options = ["subvol=@root" "compress=zstd"];
+    options = ["subvol=@root"];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
     fsType = "btrfs";
-    options = ["subvol=@nix" "compress=zstd"];
+    options = ["subvol=@nix"];
   };
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
     fsType = "btrfs";
-    options = ["subvol=@boot" "compress=zstd"];
+    options = ["subvol=@boot"];
   };
 
   fileSystems."/boot/efi" = {
@@ -62,12 +62,12 @@
     "/home" = {
       device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
       fsType = "btrfs";
-      options = ["subvol=@home" "compress=zstd"];
+      options = ["subvol=@home"];
     };
     "/persist" = {
       device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
       fsType = "btrfs";
-      options = ["subvol=@persist" "compress=zstd"];
+      options = ["subvol=@persist"];
       neededForBoot = true;
     };
   };

From a2eacddd44bbca7e571e570b51cd59f768e3a6dc Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Sun, 15 Dec 2024 03:07:23 +0100
Subject: [PATCH 3/3] Kde/konsole: replace fetchFromGitHub with flake input

---
 flake.lock                     | 17 +++++++++++++++++
 flake.nix                      |  5 +++++
 roles/kde/programs/konsole.nix | 12 ++----------
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8a596eb..15dfcba 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,6 +38,22 @@
         "type": "github"
       }
     },
+    "catppuccin-konsole": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1720277724,
+        "narHash": "sha256-d5+ygDrNl2qBxZ5Cn4U7d836+ZHz77m6/yxTIANd9BU=",
+        "owner": "catppuccin",
+        "repo": "konsole",
+        "rev": "3b64040e3f4ae5afb2347e7be8a38bc3cd8c73a8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "catppuccin",
+        "repo": "konsole",
+        "type": "github"
+      }
+    },
     "eza-themes": {
       "flake": false,
       "locked": {
@@ -542,6 +558,7 @@
       "inputs": {
         "agenix": "agenix",
         "catppuccin": "catppuccin",
+        "catppuccin-konsole": "catppuccin-konsole",
         "eza-themes": "eza-themes",
         "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",
diff --git a/flake.nix b/flake.nix
index 7da03e7..f567c75 100644
--- a/flake.nix
+++ b/flake.nix
@@ -88,6 +88,11 @@
       url = "github:eza-community/eza-themes";
       flake = false;
     };
+
+    catppuccin-konsole = {
+      url = "github:catppuccin/konsole";
+      flake = false;
+    };
   };
 
   outputs = {...} @ inputs:
diff --git a/roles/kde/programs/konsole.nix b/roles/kde/programs/konsole.nix
index 6bf8ae8..ecf812f 100644
--- a/roles/kde/programs/konsole.nix
+++ b/roles/kde/programs/konsole.nix
@@ -1,13 +1,5 @@
-{pkgs, ...}: let
-  catppuccinKonsole =
-    pkgs.fetchFromGitHub {
-      owner = "catppuccin";
-      repo = "konsole";
-      # Latest commit is 7d86b8a1e56e58f6b5649cdaac543a573ac194ca
-      rev = "main";
-      hash = "sha256-EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
-    }
-    + /Catppuccin-Mocha.colorscheme;
+{flakeSelf, ...}: let
+  catppuccinKonsole = "${flakeSelf.inputs.catppuccin-konsole}/themes/catppuccin-mocha.colorscheme";
 in {
   home-manager.users.toast = {
     xdg.dataFile = {