dotfiles

commit 9ad8a7dc7deb0f8709317207127d16b5ea117fe3
parent 0d1789b93e5c5240f48771bc44cb48a346a554e0
Author: maydayv7 <maydayv7@gmail.com>
Date:   Sun, 22 Oct 2023 12:39:17 +0530

feat: Remove `inputs` Patch Support

Functionality was anyways only limited to packages and implementation was wonky

Diffstat:

8 files changed, 10 insertions(+), 19 deletions(-)
diff --git a/README.md b/README.md
@@ -417,6 +417,7 @@ You can navigate to the `README`'s present in the various directories to know mo
 - Move out proprietary files
 - Refactor Secrets
 - Drop `deploy-rs` Support
+- Remove `inputs` patching Support
 
 ### 23.05 (v12)
 
diff --git a/configuration.nix b/configuration.nix
@@ -54,8 +54,8 @@ in
 
     # Channels
     channels = {
-      stable = (build.channel stable [] ./packages/patches)."${system}";
-      unstable = (build.channel unstable [nur.overlay] [])."${system}";
+      stable = (build.channel stable [])."${system}";
+      unstable = (build.channel unstable [nur.overlay])."${system}";
       wine = wine.packages."${system}";
       gaming = gaming.packages."${system}";
       apps.generators = generators.packages."${system}".default;
diff --git a/lib/build.nix b/lib/build.nix
@@ -4,8 +4,8 @@
   lib,
   ...
 }: let
-  inherit (lib) flatten hasPrefix mapAttrsToList nameValuePair recursiveUpdate splitString util;
-  inherit (builtins) any attrValues concatStringsSep filter hasAttr isPath listToAttrs map readFile;
+  inherit (lib) flatten hasPrefix mapAttrsToList nameValuePair recursiveUpdate splitString;
+  inherit (builtins) attrValues concatStringsSep filter hasAttr listToAttrs map readFile;
 in rec {
   ## Builder Functions ##
   each = attr: func:
@@ -32,21 +32,11 @@ in rec {
       });
 
   # Package Channels Builder
-  channel = src: overlays: patch: let
-    patches = util.map.patches patch;
-  in
+  channel = src: overlays:
     each platforms (system: let
       pkgs = src.legacyPackages."${system}";
     in
-      (
-        if !(any isPath patches)
-        then import src
-        else
-          import (pkgs.applyPatches {
-            inherit src patches;
-            name = "Patched-Input_${src.shortRev}";
-          })
-      ) {
+      import src {
         inherit system;
         config = import ../modules/nix/config.nix;
         overlays =
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
@@ -12,7 +12,7 @@ in {
   config = {
     # Utilities
     user.persist.directories = [".cache/nix" ".cache/manix"];
-    environment.systemPackages = [pkgs.cachix] ++ array (import ./format.nix) pkgs;
+    environment.systemPackages = [pkgs.cachix] ++ array (import ./tools.nix) pkgs;
 
     # Settings
     nix = {
diff --git a/modules/nix/format.nix b/modules/nix/tools.nix
diff --git a/packages/patches/.git-keep b/packages/patches/.git-keep
diff --git a/scripts/nixos.nix b/scripts/nixos.nix
@@ -93,7 +93,7 @@ in
         wine.mkwindowsapp-tools
         zfs
       ]
-      ++ array (import ../modules/nix/format.nix) pkgs;
+      ++ array (import ../modules/nix/tools.nix) pkgs;
 
     text = ''
       set +eu
diff --git a/shells/format.nix b/shells/format.nix
@@ -1,5 +1,5 @@
 pkgs: {
   name = "Formatter";
   shellHook = ''echo "## Formatting Shell ##"'';
-  packages = (import ../lib/map.nix {inherit (pkgs) lib;}).array (import ../modules/nix/format.nix) pkgs;
+  packages = (import ../lib/map.nix {inherit (pkgs) lib;}).array (import ../modules/nix/tools.nix) pkgs;
 }