flake.lock

@@ -38,22 +38,6 @@
         "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": {
@@ -558,7 +542,6 @@
       "inputs": {
         "agenix": "agenix",
         "catppuccin": "catppuccin",
-        "catppuccin-konsole": "catppuccin-konsole",
         "eza-themes": "eza-themes",
         "home-manager": "home-manager_2",
         "home-manager-unstable": "home-manager-unstable",

flake.nix

@@ -88,11 +88,6 @@
       url = "github:eza-community/eza-themes";
       flake = false;
     };
-
-    catppuccin-konsole = {
-      url = "github:catppuccin/konsole";
-      flake = false;
-    };
   };
 
   outputs = {...} @ inputs:

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" "nvme" "sd_mod"];
+  boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod"];
   boot.initrd.kernelModules = ["amdgpu"];
   boot.kernelModules = ["kvm-amd"];
   boot.extraModulePackages = [];
@@ -22,19 +22,19 @@
   fileSystems."/" = {
     device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
     fsType = "btrfs";
-    options = ["subvol=@root"];
+    options = ["subvol=@root" "compress=zstd"];
   };
 
   fileSystems."/nix" = {
     device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
     fsType = "btrfs";
-    options = ["subvol=@nix"];
+    options = ["subvol=@nix" "compress=zstd"];
   };
 
   fileSystems."/boot" = {
     device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
     fsType = "btrfs";
-    options = ["subvol=@boot"];
+    options = ["subvol=@boot" "compress=zstd"];
   };
 
   fileSystems."/boot/efi" = {
@@ -62,12 +62,12 @@
     "/home" = {
       device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
       fsType = "btrfs";
-      options = ["subvol=@home"];
+      options = ["subvol=@home" "compress=zstd"];
     };
     "/persist" = {
       device = "/dev/disk/by-uuid/5322c217-b87b-4150-8b4c-a8fa17a899bf";
       fsType = "btrfs";
-      options = ["subvol=@persist"];
+      options = ["subvol=@persist" "compress=zstd"];
       neededForBoot = true;
     };
   };

roles/kde/programs/konsole.nix

@@ -1,5 +1,13 @@
-{flakeSelf, ...}: let
+{pkgs, ...}: let
-  catppuccinKonsole = "${flakeSelf.inputs.catppuccin-konsole}/themes/catppuccin-mocha.colorscheme";
+  catppuccinKonsole =
+    pkgs.fetchFromGitHub {
+      owner = "catppuccin";
+      repo = "konsole";
+      # Latest commit is 7d86b8a1e56e58f6b5649cdaac543a573ac194ca
+      rev = "main";
+      hash = "sha256-EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
+    }
+    + /Catppuccin-Mocha.colorscheme;
 in {
   home-manager.users.toast = {
     xdg.dataFile = {