From 9f9bb5779735d088c2e1d49b628aa0bacf81e03d Mon Sep 17 00:00:00 2001
From: Fabian Montero <fabian@posixlycorrect.com>
Date: Mon, 25 Aug 2025 16:04:07 -0600
Subject: [PATCH] remove redundant functions from pkgs that are in
 trivionomicon

---
 flake.nix                      |  6 +++---
 home/default.nix               |  1 +
 pkgs/config/default.nix        |  2 +-
 pkgs/default.nix               |  5 ++---
 pkgs/lib/default.nix           |  3 ---
 pkgs/lib/importAll.nix         | 20 --------------------
 sys/platforms/yuki/default.nix |  2 +-
 7 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 pkgs/lib/default.nix
 delete mode 100644 pkgs/lib/importAll.nix

diff --git a/flake.nix b/flake.nix
index 66ad268..4401d6d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,14 +41,14 @@
       doctrinePrefix = "local";
 
       paths = {
-        # localOverlay = "pkgs";
+        localOverlay = "pkgs";
         nixpkgsConfig = "pkgs/config";
 
         nixosSource = "sys";
-        nixosPlatforms = "sys/platform";
+        nixosPlatforms = "sys/platforms";
 
         hmSource = "home";
-        hmPlatforms = "home/platform";
+        hmPlatforms = "home/platforms";
       };
     };
 }
diff --git a/home/default.nix b/home/default.nix
index 3db7471..3ba92a1 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,5 +9,6 @@ with lib; {
   imports = [
     ./modules
     flakes.trivionomicon.homeManagerModules.default
+    flakes.hm-isolation.homeManagerModule
   ];
 }
diff --git a/pkgs/config/default.nix b/pkgs/config/default.nix
index 0156348..681271f 100644
--- a/pkgs/config/default.nix
+++ b/pkgs/config/default.nix
@@ -1,4 +1,4 @@
-lib:
+{lib}:
 with lib; {
   android_sdk.accept_license = true; #TODO: what the fuck is this
   allowUnfreePredicate = pkg: import ./unfree.nix lib (getName pkg);
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9f52bbc..daef071 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,14 +1,13 @@
 {
   final,
   prev,
+  flakes,
 }:
 with prev.lib; let
   inherit (final) callPackage fetchpatch;
 in {
-  lib = callPackage ./lib {};
-
   override =
-    {
+    {# add python modules here to make them available in all versions
     }
     // (
       let
diff --git a/pkgs/lib/default.nix b/pkgs/lib/default.nix
deleted file mode 100644
index e3ab56e..0000000
--- a/pkgs/lib/default.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{callPackage}: {
-  importAll = callPackage ./importAll.nix {};
-}
diff --git a/pkgs/lib/importAll.nix b/pkgs/lib/importAll.nix
deleted file mode 100644
index 6acabe9..0000000
--- a/pkgs/lib/importAll.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{lib}: {
-  root,
-  exclude ? [],
-}:
-with builtins;
-with lib;
-# http://chriswarbo.net/projects/nixos/useful_hacks.html
-  let
-    basename = removeSuffix ".nix";
-
-    isMatch = name: type:
-      (hasSuffix ".nix" name || type == "directory")
-      && ! elem name (map basename exclude);
-
-    entry = name: _: {
-      name = basename name;
-      value = import (root + "/${name}");
-    };
-  in
-    mapAttrs' entry (filterAttrs isMatch (readDir root))
diff --git a/sys/platforms/yuki/default.nix b/sys/platforms/yuki/default.nix
index 447a70b..2fc50c5 100644
--- a/sys/platforms/yuki/default.nix
+++ b/sys/platforms/yuki/default.nix
@@ -30,7 +30,7 @@
     };
   };
 
-  trivium.sway.enable = true;
+  local.sway.enable = true;
 
   networking = {
     hostName = "yuki";