From 119148c764b3010242f694a16181cf9b284fd204 Mon Sep 17 00:00:00 2001
From: Doloro1978 <doloroo@proton.me>
Date: Thu, 30 Apr 2026 11:35:18 +0100
Subject: [PATCH] swapped out flake

---
 config/modules/surface_patches.nix |  2 +-
 flake.lock                         | 46 +++++++++++++++++++-----------
 flake.nix                          | 10 ++-----
 3 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/config/modules/surface_patches.nix b/config/modules/surface_patches.nix
index 0a69412..d0501d9 100644
--- a/config/modules/surface_patches.nix
+++ b/config/modules/surface_patches.nix
@@ -6,7 +6,7 @@
 }:
 {
   flake-file.inputs = {
-    x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
+    x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1";
   };
   modules.surface-patches = {
     nixos =
diff --git a/flake.lock b/flake.lock
index 60e1a2a..3abb7a7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -233,7 +233,7 @@
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
-          "nixpkgs-lib"
+          "nixpkgs"
         ]
       },
       "locked": {
@@ -1018,6 +1018,22 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1777395829,
+        "narHash": "sha256-HposVFZcsBCevgqLR73w/BpSe8J1lMgw5kASnnxO3A4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "e75f25705c2934955ee5075e62530d74aca973c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1736061677,
         "narHash": "sha256-DjkQPnkAfd7eB522PwnkGhOMuT9QVCZspDpJJYyOj60=",
@@ -1033,7 +1049,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1776877367,
         "narHash": "sha256-wMN1gM00sUQ2KC9CNr/XEOGdfOrl67PabIRv9AYayTo=",
@@ -1049,9 +1065,7 @@
     "nixvim": {
       "inputs": {
         "flake-parts": "flake-parts_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
+        "nixpkgs": "nixpkgs_6",
         "systems": "systems_4"
       },
       "locked": {
@@ -1120,7 +1134,7 @@
       "inputs": {
         "libcamera-src": "libcamera-src",
         "libpisp-src": "libpisp-src",
-        "nixpkgs": "nixpkgs_6",
+        "nixpkgs": "nixpkgs_7",
         "rpi-bluez-firmware-src": "rpi-bluez-firmware-src",
         "rpi-firmware-nonfree-src": "rpi-firmware-nonfree-src",
         "rpi-firmware-src": "rpi-firmware-src",
@@ -1158,9 +1172,6 @@
         "niri-flake": "niri-flake",
         "nix-cachyos-kernel": "nix-cachyos-kernel",
         "nixpkgs": "nixpkgs_5",
-        "nixpkgs-lib": [
-          "nixpkgs"
-        ],
         "nixvim": "nixvim",
         "raspberry-pi-nix": "raspberry-pi-nix",
         "sops-nix": "sops-nix",
@@ -1311,7 +1322,7 @@
     },
     "spicetify-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
         "systems": "systems_5"
       },
       "locked": {
@@ -1535,17 +1546,18 @@
     },
     "x1e-kernel": {
       "locked": {
-        "lastModified": 1776849143,
-        "narHash": "sha256-41YSWFxindwVTkQF6UlRtkkIryNYWX0mpChvz/av4uc=",
-        "ref": "refs/heads/main",
-        "rev": "0569ea2dd459957d424b734e815860c52ecaaab3",
-        "revCount": 5,
+        "lastModified": 1777479846,
+        "narHash": "sha256-6nfw073S5tlpAZ74hXhFTR0AhvLEbqnafv2Fv4Dv530=",
+        "ref": "bump-7.1-rc1",
+        "rev": "01bed07108fa8f27882fe83559d45f303992a9a7",
+        "revCount": 6,
         "type": "git",
-        "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
+        "url": "https://git.scug.io/doloro/x1e-nixos.git"
       },
       "original": {
+        "ref": "bump-7.1-rc1",
         "type": "git",
-        "url": "https://git.scug.io/nikkuss/x1e-nixos.git"
+        "url": "https://git.scug.io/doloro/x1e-nixos.git"
       }
     },
     "xdph": {
diff --git a/flake.nix b/flake.nix
index 2784549..233a3da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -8,7 +8,7 @@
     flake-file.url = "github:vic/flake-file";
     flake-parts = {
       url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs-lib";
+      inputs.nixpkgs-lib.follows = "nixpkgs";
     };
     font-patcher.url = "github:Doloro1978/nix-nerd-fonts-patcher";
     heliumFlake = {
@@ -31,11 +31,7 @@
     };
     nix-cachyos-kernel.url = "github:xddxdd/nix-cachyos-kernel/release";
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
-    nixpkgs-lib.follows = "nixpkgs";
-    nixvim = {
-      url = "github:nix-community/nixvim";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    nixvim.url = "github:nix-community/nixvim";
     raspberry-pi-nix.url = "github:nix-community/raspberry-pi-nix";
     sops-nix = {
       url = "github:Mic92/sops-nix";
@@ -46,7 +42,7 @@
       url = "github:nix-community/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    x1e-kernel.url = "git+https://git.scug.io/nikkuss/x1e-nixos.git";
+    x1e-kernel.url = "git+https://git.scug.io/doloro/x1e-nixos.git?ref=bump-7.1-rc1";
     zen-browser = {
       url = "github:youwen5/zen-browser-flake";
       inputs.nixpkgs.follows = "nixpkgs";