From 652675267a6dcb62c64fdae12184b9b16c40dfae Mon Sep 17 00:00:00 2001
From: Tristan Druyen <tristan@vault81.de>
Date: Tue, 4 Mar 2025 19:45:58 +0100
Subject: [PATCH] Fix user-shell import

---
 home-mods/firefox/default.nix   |  4 ++--
 home-mods/firefox/floorp.nix    |  4 ++--
 systems/nixos-pulse/default.nix |  9 ++++----
 systems/rescue-iso/default.nix  | 38 ++++-----------------------------
 4 files changed, 12 insertions(+), 43 deletions(-)

diff --git a/home-mods/firefox/default.nix b/home-mods/firefox/default.nix
index 437c0e4..6386489 100644
--- a/home-mods/firefox/default.nix
+++ b/home-mods/firefox/default.nix
@@ -2,8 +2,8 @@
 , lib
 , pkgs
 , ...
-}@args: {
-  programs.firefox = (import ./_base.nix args);
+} @ args: {
+  programs.firefox = import ./_base.nix args;
 
   home.sessionVariables = {
     BROWSER = "firefox";
diff --git a/home-mods/firefox/floorp.nix b/home-mods/firefox/floorp.nix
index 27b2f81..d2dd03d 100644
--- a/home-mods/firefox/floorp.nix
+++ b/home-mods/firefox/floorp.nix
@@ -2,8 +2,8 @@
 , lib
 , pkgs
 , ...
-}@args: {
-  programs.floorp = (import ./_base.nix args);
+} @ args: {
+  programs.floorp = import ./_base.nix args;
 
   home.sessionVariables = {
     BROWSER = "floorp";
diff --git a/systems/nixos-pulse/default.nix b/systems/nixos-pulse/default.nix
index 1d4f724..c3b0ef6 100644
--- a/systems/nixos-pulse/default.nix
+++ b/systems/nixos-pulse/default.nix
@@ -5,7 +5,7 @@
 , system
 , inputs
 , ...
-}@moduleArgs: {
+} @ moduleArgs: {
   imports = [
     (modulesPath + "/installer/scan/not-detected.nix")
     inputs.nixos-hardware.nixosModules.common-cpu-amd
@@ -63,11 +63,10 @@
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    users.tristand = import ../../users/admin-shell.nix {
+    users.tristand = import ../../users/admin-shell.nix (moduleArgs
+      // {
       username = "tristand";
-
-      inherit moduleArgs;
-    };
+    });
   };
 
   users.groups.nixremote = { };
diff --git a/systems/rescue-iso/default.nix b/systems/rescue-iso/default.nix
index b2d7af7..58e40a5 100644
--- a/systems/rescue-iso/default.nix
+++ b/systems/rescue-iso/default.nix
@@ -20,40 +20,10 @@
     # TODO Add authorized Keys
   };
 
-  boot =
-    let
-      version = "6.12-rc1";
-      # version = "6.12-rc3";
-      kernelPatches = pkgs.callPackage "${inputs.nixpkgs}/pkgs/os-specific/linux/kernel/patches.nix" { };
-      # ref = "6efbea77b390604a7be7364583e19cd2d6a1291b";
-      ref = "bc6d2d10418e1bfdb95b16f5dd4cca42d5dec766";
-      linux_mainline =
-        { buildLinux
-        , fetchzip
-        , ...
-        } @ args:
-        buildLinux {
-          version = version;
-          src = fetchzip {
-            # url = "https://git.kernel.org/torvalds/t/linux-${ref}.tar.gz";
-            # hash = "";
-            url = "https://github.com/koverstreet/bcachefs/archive/${ref}.tar.gz";
-            hash = "sha256-tq0dXKVtW1R+Yenv7HG4Qqc1P49OzcJgICpoZLkA/K4=";
-          };
-          modDirVersion = lib.versions.pad 3 version;
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-          extraMeta.branch = "master";
-        };
-      linuxMainlinePkg = pkgs.callPackage linux_mainline { };
-      linuxMainlinePkgs = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linuxMainlinePkg);
-    in
-    {
-      kernelPackages = linuxMainlinePkgs;
-      supportedFilesystems = lib.mkForce [ "bcachefs" "btrfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
-    };
+  boot = {
+    kernelPackages = pkgs.linuxPackages_cachyos;
+    supportedFilesystems = lib.mkForce [ "bcachefs" "btrfs" "vfat" "f2fs" "xfs" "ntfs" "cifs" ];
+  };
 
   users.users.root.openssh.authorizedKeys.keys = [
     "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4xz3EgIRiRb/gmnCSq17kHd4MLilf05zYOFZrwOIrA tristand@nixos-fw16"