From 1e56cd9c830dd0bf011abad66ef5cb70d42e7739 Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Sun, 1 Aug 2021 19:28:28 +0200
Subject: [PATCH] remove scripts package and use flake

---
 flake.nix               | 4 ++++
 home/configurations.nix | 3 ++-
 outputs.nix             | 4 ++--
 overlays/default.nix    | 3 ---
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index b1d3c4f..2e9a587 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,6 +22,10 @@
       url = git+https://gitlab.com/khumba/nvd.git;
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    scripts = {
+      url = git+https://git.dadada.li/dadada/scripts.git?ref=main;
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = { ... } @ args: import ./outputs.nix args;
diff --git a/home/configurations.nix b/home/configurations.nix
index 3c9fc8e..63fed20 100644
--- a/home/configurations.nix
+++ b/home/configurations.nix
@@ -3,6 +3,7 @@
 , home-manager
 , nix-doom-emacs
 , nvd
+, scripts
 }@inputs:
 let
   hmConfiguration =
@@ -30,7 +31,7 @@ in
   home = hmConfiguration {
     extraModules = [ ./home ];
     overlays = [
-      self.overlays.scripts
+      (final: prev: { s = scripts; })
       (final: prev: { n = nvd; })
     ];
     stateVersion = "20.09";
diff --git a/outputs.nix b/outputs.nix
index 384a590..3880460 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -6,6 +6,7 @@
 , nix-doom-emacs
 , nixos-hardware
 , nvd
+, scripts
 , ...
 }@inputs:
 (flake-utils.lib.eachDefaultSystem (system:
@@ -51,14 +52,13 @@
     };
     packages = flake-utils.lib.flattenTree {
       deploy = pkgs.callPackage ./pkgs/deploy.nix { };
-      scripts = pkgs.callPackage ./pkgs/scripts.nix { };
       keys = pkgs.callPackage ./pkgs/keys { };
       homePage = pkgs.callPackage ./pkgs/homePage { };
       recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd;
     };
   })) // {
   hmConfigurations = import ./home/configurations.nix {
-    inherit self nixpkgs home-manager nix-doom-emacs nvd;
+    inherit self nixpkgs home-manager nix-doom-emacs nvd scripts;
   };
   hmModules = import ./home/modules inputs;
   nixosConfigurations = import ./nixos/configurations.nix {
diff --git a/overlays/default.nix b/overlays/default.nix
index 704511b..d4caaa0 100644
--- a/overlays/default.nix
+++ b/overlays/default.nix
@@ -9,9 +9,6 @@ in
   homePage = final: prev: {
     homePage = prev.callPackage ../pkgs/homePage { };
   };
-  scripts = final: prev: {
-    scipts = prev.callPackage ../pkgs/scripts.nix { };
-  };
   recipemd = final: prev: {
     recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd;
   };