From 7bf3d8fd7c24dffcfa7e52da68d2b3c1cae8b120 Mon Sep 17 00:00:00 2001
From: muon <admin@muon.host>
Date: Thu, 2 Jan 2025 11:53:41 +0000
Subject: [PATCH] Fix pkgs

---
 flake.nix                             | 27 +--------------------------
 hosts/muop/configuration.nix          |  2 +-
 modules/home/desktop/productivity.nix |  3 +++
 modules/nixos/unfree/default.nix      | 19 +++++--------------
 utils.nix                             |  8 +++++---
 5 files changed, 15 insertions(+), 44 deletions(-)

diff --git a/flake.nix b/flake.nix
index 13f3f9f..ac6bdf1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,32 +17,7 @@
     let
       system = "x86_64-linux";
 
-      pkgs' = (import inputs.nixpkgs { inherit system; }).applyPatches {
-        name = "nixpkgs-unstable-patched";
-        src = inputs.nixpkgs;
-        patches = [
-          (builtins.fetchurl {
-            url =
-              "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/369042.patch";
-            sha256 =
-              "sha256:08asxmd34rzaxb8dr4nccy26k3vxnx7psy2imnp40fdplqna0a85";
-          })
-          (builtins.fetchurl {
-            url =
-              "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368790.patch";
-            sha256 =
-              "sha256:1blsawm4l30wkrdkvvq0fw2aki7v921isdwrk9dw8yh09cglbfd9";
-          })
-          (builtins.fetchurl {
-            url =
-              "https://patch-diff.githubusercontent.com/raw/NixOS/nixpkgs/pull/368091.patch";
-            sha256 =
-              "sha256:11qnwrq8sgbmxiy9qvv7q2lbl824x90p2iklf3kjf9yb3c2dx9nj";
-          })
-        ];
-      };
-
-      pkgs = import pkgs' { inherit system; };
+      pkgs = import inputs.nixpkgs { inherit system; };
 
       utils = import ./utils.nix { inherit inputs system pkgs; };
     in {
diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix
index 625f0c4..4337098 100644
--- a/hosts/muop/configuration.nix
+++ b/hosts/muop/configuration.nix
@@ -31,7 +31,7 @@ in {
   mods.server.astral.autoStart = false;
 
   mods.server.sync.enable = true;
-  mods.tailscale.enable = false;
+  mods.tailscale.enable = true;
   mods.openvpn.enable = false;
   mods.wireguard.id = 4;
 
diff --git a/modules/home/desktop/productivity.nix b/modules/home/desktop/productivity.nix
index 2605c96..d7ec59f 100644
--- a/modules/home/desktop/productivity.nix
+++ b/modules/home/desktop/productivity.nix
@@ -20,6 +20,9 @@
       # password manager
       bitwarden-desktop
 
+      # file management
+      krusader
+
       # documents
       # texliveFull
       # texstudio
diff --git a/modules/nixos/unfree/default.nix b/modules/nixos/unfree/default.nix
index dedf878..288c341 100644
--- a/modules/nixos/unfree/default.nix
+++ b/modules/nixos/unfree/default.nix
@@ -1,21 +1,12 @@
-{ pkgs, lib, config, ... }:
+{ lib, config, ... }:
 let
   cfg = config.mods.unfree;
-  mkPackages = mod:
-    if cfg.${mod}.enable then
-    cfg.${mod}.packages else [];
+  mkPackages = mod: if cfg.${mod}.enable then cfg.${mod}.packages else [ ];
 
 in {
-  imports = [
-    ./steam.nix
-    ./nvidia.nix
-    ./minecraft.nix
-  ];
+  imports = [ ./steam.nix ./nvidia.nix ./minecraft.nix ];
 
   nixpkgs.config.allowUnfreePredicate = pkg:
-    builtins.elem (lib.getName pkg) (
-      (mkPackages "steam") ++
-      (mkPackages "minecraft") ++
-      (mkPackages "nvidia")
-    );
+    builtins.elem (lib.getName pkg)
+    ((mkPackages "steam") ++ (mkPackages "minecraft") ++ (mkPackages "nvidia"));
 }
diff --git a/utils.nix b/utils.nix
index 98cf7f2..76489c2 100644
--- a/utils.nix
+++ b/utils.nix
@@ -1,7 +1,9 @@
-{ inputs, system, pkgs, ... }: {
+{ inputs, system, pkgs, ... }:
+let nixpkgs = inputs.nixpkgs;
+in {
   mkHost = host:
-    inputs.nixpkgs.lib.nixosSystem {
-      specialArgs = { inherit inputs system pkgs; };
+    nixpkgs.lib.nixosSystem {
+      specialArgs = { inherit inputs system; };
 
       modules = [
         host