From 777a6fd9c155a75fcb108fc05ff72bb33c40a4f2 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Wed, 26 Mar 2025 01:06:51 -0400
Subject: [PATCH] home: cleanup pkgs import and patching

---
 etcnixos/system-mreow.nix |  1 -
 home-manager/flake.nix    | 43 ++++++++++++++++++---------------------
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/etcnixos/system-mreow.nix b/etcnixos/system-mreow.nix
index 000abc6..56d1902 100644
--- a/etcnixos/system-mreow.nix
+++ b/etcnixos/system-mreow.nix
@@ -88,7 +88,6 @@
     '';
   };
 
-
   programs.gamescope = {
     enable = true;
     capSysNice = true;
diff --git a/home-manager/flake.nix b/home-manager/flake.nix
index 26d5318..d57d3e0 100644
--- a/home-manager/flake.nix
+++ b/home-manager/flake.nix
@@ -46,32 +46,29 @@
       homeDirectory = "/home/${username}";
       hostname = nixpkgs.lib.strings.removeSuffix "\n" (builtins.readFile /etc/hostname);
 
-      pkgs' =
+      pkgs = import (
         (import nixpkgs {
-          system = "x86_64-linux";
         }).applyPatches
-          {
-            name = "nixpkgs";
-            src = inputs.nixpkgs;
-            patches = [
-              # https://github.com/NixOS/nixpkgs/pull/67576
-              # gimp 3.0
-              (builtins.fetchurl {
-                url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
-                sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss";
-              })
+        {
+          name = "nixpkgs";
+          src = inputs.nixpkgs;
+          patches = [
+            # https://github.com/NixOS/nixpkgs/pull/67576
+            # gimp 3.0
+            (builtins.fetchurl {
+              url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
+              sha256 = "02fk89563m2xfrl7kl9s1hh4bcppwrmd60j542kyl64nd2cvp9ss";
+            })
 
-              # mistral-rs 0.5.0
-              # https://github.com/NixOS/nixpkgs/pull/392645
-              (builtins.fetchurl {
-                url = "https://github.com/NixOS/nixpkgs/pull/392645.diff";
-                sha256 = "1sc65jfx5ngsa4zkfnybg6ma65g2wgzd6ac1gajxwqni5470i5rq";
-              })
-            ];
-          };
-      pkgs = import pkgs' {
-        system = "x86_64-linux";
-      };
+            # mistral-rs 0.5.0
+            # https://github.com/NixOS/nixpkgs/pull/392645
+            (builtins.fetchurl {
+              url = "https://github.com/NixOS/nixpkgs/pull/392645.diff";
+              sha256 = "1sc65jfx5ngsa4zkfnybg6ma65g2wgzd6ac1gajxwqni5470i5rq";
+            })
+          ];
+        }
+      ) { };
     in
     {
       formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style;