refactor(sys): Modularize and move to `modules/system` or `pkgs`

38 files changed, 33 insertions, 13 deletions

diff --git a/sys/nixpkgs/pkgs/scripts/default.nix b/pkgs/sources/scripts/default.nix
index 5279b241..09c8d411 100644
--- a/sys/nixpkgs/pkgs/scripts/default.nix
+++ b/pkgs/sources/scripts/default.nix
@@ -1,6 +1,7 @@
 {
   sysLib,
-  config,
+  homeConfig,
+  nixosConfig,
 }: [
   (
     final: prev: let
@@ -45,7 +46,6 @@
         '';
 
       ## Begin of shell scripts
-
       aumo-scr = write_shell {
         name = "aumo";
         path = "apps";
@@ -65,6 +65,14 @@
         dependencies = [];
       };
 
+      brightness-scr = lib.mkIf nixosConfig.soispha.laptop.enable (write_shell {
+        name = "brightness";
+        path = "small_functions";
+        generateCompletions = true;
+        dependencies = [];
+        replacementStrings = {BACKLIGHT_NAME = nixosConfig.soispha.laptop.backlight;};
+      });
+
       con2pdf-scr = sysLib.writeShellScript {
         name = "con2pdf";
         src = ./source/apps/con2pdf.sh;
@@ -125,7 +133,7 @@
             git
             gnused
             # $EDITOR
-            
+
             ;
         };
       };
@@ -247,13 +255,13 @@
         generateCompletions = true;
         replacementStrings = {
           DEFAULT_NEORG_PROJECT_DIR =
-            config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces.projects;
-          HOME_TASKRC = "${config.xdg.configHome}/task/home-manager-taskrc";
-          NEORG_REVIEW_PATH = "${config.xdg.dataHome}/neorg/review";
-          ALL_PROJECTS_NEWLINE = "${config.soispha.taskwarrior.projects.projects_newline}";
-          ALL_PROJECTS_COMMA = "${config.soispha.taskwarrior.projects.projects_comma}";
-          ALL_PROJECTS_PIPE = "${config.soispha.taskwarrior.projects.projects_pipe}";
-          ALL_WORKSPACES = "${lib.strings.concatStringsSep "|" (builtins.attrNames config.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces)}";
+            homeConfig.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces.projects;
+          HOME_TASKRC = "${homeConfig.xdg.configHome}/task/home-manager-taskrc";
+          NEORG_REVIEW_PATH = "${homeConfig.xdg.dataHome}/neorg/review";
+          ALL_PROJECTS_NEWLINE = "${homeConfig.soispha.taskwarrior.projects.projects_newline}";
+          ALL_PROJECTS_COMMA = "${homeConfig.soispha.taskwarrior.projects.projects_comma}";
+          ALL_PROJECTS_PIPE = "${homeConfig.soispha.taskwarrior.projects.projects_pipe}";
+          ALL_WORKSPACES = "${lib.strings.concatStringsSep "|" (builtins.attrNames homeConfig.programs.nixvim.plugins.neorg.modules."core.dirman".config.workspaces)}";
           ID_GENERATION_FUNCTION = "${sysLib.writeShellScript {
             name = "neorg_id_function";
             src = ./source/specific/neorg/neorg_id_function.sh;
@@ -324,8 +332,8 @@
         ];
         generateCompletions = true;
         replacementStrings = {
-          XDG_CACHE_HOME = config.xdg.cacheHome;
-          XDG_MUSIC_DIR = config.xdg.userDirs.music;
+          XDG_CACHE_HOME = homeConfig.xdg.cacheHome;
+          XDG_MUSIC_DIR = homeConfig.xdg.userDirs.music;
         };
       };
 
@@ -365,6 +373,7 @@
         # llp = llp-scr; # TODO: see above
         aumo = aumo-scr;
         battery = battery-scr;
+        brightness = brightness-scr;
         con2pdf = con2pdf-scr;
         description = description-scr;
         fupdate = fupdate-scr;
@@ -373,9 +382,9 @@
         ll = ll-scr;
         lock = lock-scr;
         lyrics = lyrics-scr;
+        mpc = mpc-scr;
         mpc-fav = mpc-fav-scr;
         mpc-rm = mpc-rm-scr;
-        mpc = mpc-scr;
         nato = nato-scr;
         neorg = neorg-scr;
         screenshot_persistent = screenshot_persistent-scr;
@@ -390,3 +399,14 @@
     }
   )
 ]
+
+
+    pkgs = import nixpkgs (import ./sys/nixpkgs {
+      inherit (nixpkgs) lib;
+      inherit system sysLib;
+
+      # FIXME: Don't unconditionally use tiamat here <2024-02-24>
+      homeConfig = self.nixosConfigurations.tiamat.config.home-manager.users.soispha;
+      nixosConfig = self.nixosConfigurations.tiamat.config;
+      overlays = [];
+    });
diff --git a/sys/nixpkgs/pkgs/scripts/source/apps/aumo.sh b/pkgs/sources/scripts/source/apps/aumo.sh
index 84d39deb..84d39deb 100755
--- a/sys/nixpkgs/pkgs/scripts/source/apps/aumo.sh
+++ b/pkgs/sources/scripts/source/apps/aumo.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/apps/con2pdf.sh b/pkgs/sources/scripts/source/apps/con2pdf.sh
index 08bf8998..08bf8998 100755
--- a/sys/nixpkgs/pkgs/scripts/source/apps/con2pdf.sh
+++ b/pkgs/sources/scripts/source/apps/con2pdf.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.1.md b/pkgs/sources/scripts/source/apps/fupdate.1.md
index 710e8fb7..710e8fb7 100644
--- a/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.1.md
+++ b/pkgs/sources/scripts/source/apps/fupdate.1.md
diff --git a/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.sh b/pkgs/sources/scripts/source/apps/fupdate.sh
index 4322610a..4322610a 100755
--- a/sys/nixpkgs/pkgs/scripts/source/apps/fupdate.sh
+++ b/pkgs/sources/scripts/source/apps/fupdate.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/apps/git-edit-index.sh b/pkgs/sources/scripts/source/apps/git-edit-index.sh
index e73dc53c..e73dc53c 100755
--- a/sys/nixpkgs/pkgs/scripts/source/apps/git-edit-index.sh
+++ b/pkgs/sources/scripts/source/apps/git-edit-index.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/small_functions/nato.py b/pkgs/sources/scripts/source/small_functions/nato.py
index e9d15f56..e9d15f56 100755
--- a/sys/nixpkgs/pkgs/scripts/source/small_functions/nato.py
+++ b/pkgs/sources/scripts/source/small_functions/nato.py
diff --git a/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_persistent.sh b/pkgs/sources/scripts/source/small_functions/screenshot_persistent.sh
index 4308b8d2..4308b8d2 100755
--- a/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_persistent.sh
+++ b/pkgs/sources/scripts/source/small_functions/screenshot_persistent.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_temporary.sh b/pkgs/sources/scripts/source/small_functions/screenshot_temporary.sh
index 8968ca79..8968ca79 100755
--- a/sys/nixpkgs/pkgs/scripts/source/small_functions/screenshot_temporary.sh
+++ b/pkgs/sources/scripts/source/small_functions/screenshot_temporary.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/small_functions/update-sys.sh b/pkgs/sources/scripts/source/small_functions/update-sys.sh
index d28247f6..d28247f6 100755
--- a/sys/nixpkgs/pkgs/scripts/source/small_functions/update-sys.sh
+++ b/pkgs/sources/scripts/source/small_functions/update-sys.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/neorg_id_function.sh b/pkgs/sources/scripts/source/specific/neorg/neorg_id_function.sh
index 865ecacf..865ecacf 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/neorg_id_function.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/neorg_id_function.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/add.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/add.sh
index 5a830a10..5a830a10 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/add.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/add.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/context.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/context.sh
index 7095847d..7095847d 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/context.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/context.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/dmenu.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/dmenu.sh
index 5a138982..5a138982 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/dmenu.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/dmenu.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_start.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/f_start.sh
index 2423dd44..2423dd44 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_start.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/f_start.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_stop.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/f_stop.sh
index e4ff0b94..e4ff0b94 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/f_stop.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/f_stop.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/list.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/list.sh
index 10659457..10659457 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/list.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/list.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/project.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/project.sh
index 64591850..64591850 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/project.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/project.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/review.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/review.sh
index a0a9ab8d..a0a9ab8d 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/review.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/review.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/utils.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/utils.sh
index c3843e8e..c3843e8e 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/utils.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/utils.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/workspace.sh b/pkgs/sources/scripts/source/specific/neorg/sh/functions/workspace.sh
index d5eb2fca..d5eb2fca 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/functions/workspace.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/functions/workspace.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/main.sh b/pkgs/sources/scripts/source/specific/neorg/sh/main.sh
index 559351b9..559351b9 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/neorg/sh/main.sh
+++ b/pkgs/sources/scripts/source/specific/neorg/sh/main.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/spodi/sh/download.sh b/pkgs/sources/scripts/source/specific/spodi/sh/download.sh
index fe9746c8..fe9746c8 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/spodi/sh/download.sh
+++ b/pkgs/sources/scripts/source/specific/spodi/sh/download.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/spodi/sh/update.sh b/pkgs/sources/scripts/source/specific/spodi/sh/update.sh
index a289cf58..a289cf58 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/spodi/sh/update.sh
+++ b/pkgs/sources/scripts/source/specific/spodi/sh/update.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/spodi/spodi.sh b/pkgs/sources/scripts/source/specific/spodi/spodi.sh
index 475fd48a..475fd48a 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/spodi/spodi.sh
+++ b/pkgs/sources/scripts/source/specific/spodi/spodi.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/specific/ytcc/description.sh b/pkgs/sources/scripts/source/specific/ytcc/description.sh
index ae9107b9..ae9107b9 100755
--- a/sys/nixpkgs/pkgs/scripts/source/specific/ytcc/description.sh
+++ b/pkgs/sources/scripts/source/specific/ytcc/description.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/battery.sh b/pkgs/sources/scripts/source/wrappers/battery.sh
index e650ba5d..e650ba5d 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/battery.sh
+++ b/pkgs/sources/scripts/source/wrappers/battery.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/hibernate.sh b/pkgs/sources/scripts/source/wrappers/hibernate.sh
index 30868fd1..30868fd1 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/hibernate.sh
+++ b/pkgs/sources/scripts/source/wrappers/hibernate.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/ll.sh b/pkgs/sources/scripts/source/wrappers/ll.sh
index f689ba44..f689ba44 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/ll.sh
+++ b/pkgs/sources/scripts/source/wrappers/ll.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/lock.sh b/pkgs/sources/scripts/source/wrappers/lock.sh
index 3101ef9a..3101ef9a 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/lock.sh
+++ b/pkgs/sources/scripts/source/wrappers/lock.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/lyrics.sh b/pkgs/sources/scripts/source/wrappers/lyrics.sh
index 02a147c8..02a147c8 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/lyrics.sh
+++ b/pkgs/sources/scripts/source/wrappers/lyrics.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-fav.sh b/pkgs/sources/scripts/source/wrappers/mpc-fav.sh
index 795a4875..795a4875 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-fav.sh
+++ b/pkgs/sources/scripts/source/wrappers/mpc-fav.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-rm.sh b/pkgs/sources/scripts/source/wrappers/mpc-rm.sh
index 94e0634b..94e0634b 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc-rm.sh
+++ b/pkgs/sources/scripts/source/wrappers/mpc-rm.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc.sh b/pkgs/sources/scripts/source/wrappers/mpc.sh
index 5aae5cdb..5aae5cdb 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/mpc.sh
+++ b/pkgs/sources/scripts/source/wrappers/mpc.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/show.sh b/pkgs/sources/scripts/source/wrappers/show.sh
index ae2bdb13..ae2bdb13 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/show.sh
+++ b/pkgs/sources/scripts/source/wrappers/show.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/sort_song.sh b/pkgs/sources/scripts/source/wrappers/sort_song.sh
index e2978507..e2978507 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/sort_song.sh
+++ b/pkgs/sources/scripts/source/wrappers/sort_song.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/virsh-del.sh b/pkgs/sources/scripts/source/wrappers/virsh-del.sh
index c3de5484..c3de5484 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/virsh-del.sh
+++ b/pkgs/sources/scripts/source/wrappers/virsh-del.sh
diff --git a/sys/nixpkgs/pkgs/scripts/source/wrappers/yti.sh b/pkgs/sources/scripts/source/wrappers/yti.sh
index a69ffa74..a69ffa74 100755
--- a/sys/nixpkgs/pkgs/scripts/source/wrappers/yti.sh
+++ b/pkgs/sources/scripts/source/wrappers/yti.sh