From fb206f9be18b4936ef716935c2343531acaf92c2 Mon Sep 17 00:00:00 2001
From: Soispha <soispha@vhack.eu>
Date: Sat, 29 Apr 2023 17:31:00 +0200
Subject: Refactor(treewide): Use separate shell library

---
 bootstrap/activate/default.nix     | 5 ++---
 bootstrap/config_setup/default.nix | 5 ++---
 bootstrap/install/default.nix      | 5 ++---
 bootstrap/setup/default.nix        | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'bootstrap')

diff --git a/bootstrap/activate/default.nix b/bootstrap/activate/default.nix
index 9d01e57a..c60d8e73 100644
--- a/bootstrap/activate/default.nix
+++ b/bootstrap/activate/default.nix
@@ -1,12 +1,11 @@
 # vim: ts=2
 {
   pkgs,
-  shell-library,
+  sysLib,
   ...
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) jq gawk curl coreutils libuuid nix git;};
   name = "activate";
   script = ./activate.sh;
-  lib = import ../../lib {inherit pkgs shell-library;};
 in
-  lib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
diff --git a/bootstrap/config_setup/default.nix b/bootstrap/config_setup/default.nix
index 19ee84dc..20de9542 100644
--- a/bootstrap/config_setup/default.nix
+++ b/bootstrap/config_setup/default.nix
@@ -1,12 +1,11 @@
 # vim: ts=2
 {
   pkgs,
-  shell-library,
+  sysLib,
   ...
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) git neovim;};
   name = "config_setup";
   script = ./config_setup.sh;
-  lib = import ../../lib {inherit pkgs shell-library;};
 in
-  lib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
diff --git a/bootstrap/install/default.nix b/bootstrap/install/default.nix
index 71548e90..054c28ec 100644
--- a/bootstrap/install/default.nix
+++ b/bootstrap/install/default.nix
@@ -1,12 +1,11 @@
 # vim: ts=2
 {
   pkgs,
-  shell-library,
+  sysLib,
   ...
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) jq dash curl gawk btrfs-progs coreutils libuuid gptfdisk dosfstools toybox nix git;};
   name = "install";
   script = ./install.sh;
-  lib = import ../../lib {inherit pkgs shell-library;};
 in
-  lib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
diff --git a/bootstrap/setup/default.nix b/bootstrap/setup/default.nix
index b6d925a2..b32a822b 100644
--- a/bootstrap/setup/default.nix
+++ b/bootstrap/setup/default.nix
@@ -1,12 +1,11 @@
 # vim: ts=2
 {
   pkgs,
-  shell-library,
+  sysLib,
   ...
 }: let
   dependencies = builtins.attrValues {inherit (pkgs) dash gawk curl git nix gnugrep nixos-install-tools coreutils libuuid;};
   name = "setup";
   script = ./setup.sh;
-  lib = import ../../lib {inherit pkgs shell-library;};
 in
-  lib.makeShellScriptWithLibrary {inherit dependencies name script;}
+  sysLib.makeShellScriptWithLibrary {inherit dependencies name script;}
-- 
cgit 1.4.1