From f6a4a172f0cf044af4c55fbb1aa14b4761b351b2 Mon Sep 17 00:00:00 2001
From: Andre <andre@8bitbuddhism.com>
Date: Fri, 6 Dec 2024 15:21:21 -0500
Subject: [PATCH] General: pin Lix to stable; General: run nix fmt; Shura: work
 around build error with the LQX kernel

---
 flake.lock                                     | 18 +++++++++---------
 flake.nix                                      |  5 +++--
 modules/nixos/ui/desktops/budgie/default.nix   |  3 ++-
 modules/nixos/ui/desktops/hyprland/default.nix |  3 ++-
 .../Shura/hardware-configuration.nix           |  3 +--
 5 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 024736e..fbb14cc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -185,16 +185,16 @@
     },
     "flatpak": {
       "locked": {
-        "lastModified": 1732285094,
-        "narHash": "sha256-OD9tu/QN71OnEWtgvm9pXuQs+SGQtKnLHOGVRG5f9CU=",
+        "lastModified": 1733228754,
+        "narHash": "sha256-Jbt4imHmz5Z0jdaW7RrwAO1HYCmPs3XCt4j86jkG0b4=",
         "owner": "gmodena",
         "repo": "nix-flatpak",
-        "rev": "d3a763532be5d223bb3474642f089667a8091cdf",
+        "rev": "2880dc44fc8c450b4ffe1609a4bccd19ef759f5c",
         "type": "github"
       },
       "original": {
         "owner": "gmodena",
-        "ref": "v0.5.0",
+        "ref": "v0.5.1",
         "repo": "nix-flatpak",
         "type": "github"
       }
@@ -279,14 +279,14 @@
       "locked": {
         "lastModified": 1732605668,
         "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=",
-        "ref": "release-2.91",
+        "ref": "stable",
         "rev": "96824d606a6656650bbe436366bc89d5ee3a6573",
         "revCount": 113,
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       },
       "original": {
-        "ref": "release-2.91",
+        "ref": "stable",
         "type": "git",
         "url": "https://git.lix.systems/lix-project/nixos-module"
       }
@@ -371,11 +371,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1733261153,
-        "narHash": "sha256-eq51hyiaIwtWo19fPEeE0Zr2s83DYMKJoukNLgGGpek=",
+        "lastModified": 1733412085,
+        "narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b681065d0919f7eb5309a93cea2cfa84dec9aa88",
+        "rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index d664144..728d1e2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
     };
 
     # Flatpak support
-    flatpak.url = "github:gmodena/nix-flatpak/v0.5.0";
+    flatpak.url = "github:gmodena/nix-flatpak/v0.5.1";
 
     # Home-manager support
     home-manager = {
@@ -32,7 +32,7 @@
     #   If you'd rather use regular Nix, remove `lix-module.nixosModules.default` from the `modules` section below.
     #   To learn more about Lix, see https://lix.systems/
     lix = {
-      url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.91";
+      url = "git+https://git.lix.systems/lix-project/nixos-module?ref=stable";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -46,6 +46,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    # Code formatter
     treefmt = {
       url = "github:numtide/treefmt-nix";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/nixos/ui/desktops/budgie/default.nix b/modules/nixos/ui/desktops/budgie/default.nix
index 80de435..e218253 100644
--- a/modules/nixos/ui/desktops/budgie/default.nix
+++ b/modules/nixos/ui/desktops/budgie/default.nix
@@ -10,7 +10,8 @@ let
 in
 {
   options = {
-    ${namespace}.ui.desktops.budgie.enable = lib.mkEnableOption "Enables the Budgie desktop environment.";
+    ${namespace}.ui.desktops.budgie.enable =
+      lib.mkEnableOption "Enables the Budgie desktop environment.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/modules/nixos/ui/desktops/hyprland/default.nix b/modules/nixos/ui/desktops/hyprland/default.nix
index d029098..8fc99ff 100644
--- a/modules/nixos/ui/desktops/hyprland/default.nix
+++ b/modules/nixos/ui/desktops/hyprland/default.nix
@@ -10,7 +10,8 @@ let
 in
 {
   options = {
-    ${namespace}.ui.desktops.hyprland.enable = lib.mkEnableOption "Enables the Hyprland desktop environment.";
+    ${namespace}.ui.desktops.hyprland.enable =
+      lib.mkEnableOption "Enables the Hyprland desktop environment.";
   };
 
   config = lib.mkIf cfg.enable {
diff --git a/systems/x86_64-linux/Shura/hardware-configuration.nix b/systems/x86_64-linux/Shura/hardware-configuration.nix
index ff20cdf..fa80796 100644
--- a/systems/x86_64-linux/Shura/hardware-configuration.nix
+++ b/systems/x86_64-linux/Shura/hardware-configuration.nix
@@ -14,8 +14,7 @@ in
 
   # Configure the kernel.
   boot = {
-    #kernelPackages = pkgs.linuxPackages_latest;
-    kernelPackages = pkgs.linuxKernel.packages.linux_lqx;
+    kernelPackages = pkgs.linuxKernel.packages.linux_zen;
 
     # Hardware defaults detected by nixos-generate-configuration
     initrd = {