Fix(river): Add further dependency for the init script

5 files changed, 146 insertions, 12 deletions

diff --git a/flake.lock b/flake.lock
index 31e719e3..54dae095 100644
--- a/flake.lock
+++ b/flake.lock
@@ -26,12 +26,36 @@
         "flake-compat": "flake-compat",
         "flake-utils": "flake-utils",
         "nixpkgs": [
-          "strip_js_comments",
+          "river_init_lesser",
           "nixpkgs"
         ],
         "rust-overlay": "rust-overlay"
       },
       "locked": {
+        "lastModified": 1676846788,
+        "narHash": "sha256-XLsHLgXyMdliMeAXuzdGP+TXBaV44kG1RPTUHNOs6Jk=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "953b70da2813fb882c39890f2514e7db76fc8843",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
+    "crane_2": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": [
+          "strip_js_comments",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_2"
+      },
+      "locked": {
         "lastModified": 1675902425,
         "narHash": "sha256-ASv/7bZIoP/2FON+RNFYYUlmpleZAjKKb4XF1Pmhu4g=",
         "owner": "ipetkov",
@@ -83,8 +107,54 @@
         "type": "github"
       }
     },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-utils": {
       "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1676283394,
+        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_3": {
+      "locked": {
         "lastModified": 1667395993,
         "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
         "owner": "numtide",
@@ -98,7 +168,7 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
+    "flake-utils_4": {
       "locked": {
         "lastModified": 1667395993,
         "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
@@ -182,6 +252,28 @@
         "type": "github"
       }
     },
+    "river_init_lesser": {
+      "inputs": {
+        "crane": "crane",
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1677084611,
+        "narHash": "sha256-N5junMqDsqjR+Q+nPff8DT672em4Rr+q4EQgTDxhtik=",
+        "ref": "refs/heads/prime",
+        "rev": "25422c63095ff40f1159f619888a9cb52a656fb8",
+        "revCount": 2,
+        "type": "git",
+        "url": "https://git.sils.li/ene/river-lesser-init.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.sils.li/ene/river-lesser-init.git"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -189,6 +281,7 @@
         "impermanence": "impermanence",
         "neovim_config": "neovim_config",
         "nixpkgs": "nixpkgs",
+        "river_init_lesser": "river_init_lesser",
         "shell-library": "shell-library",
         "snap-sync": "snap-sync",
         "strip_js_comments": "strip_js_comments",
@@ -198,6 +291,33 @@
     "rust-overlay": {
       "inputs": {
         "flake-utils": [
+          "river_init_lesser",
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "river_init_lesser",
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1676437770,
+        "narHash": "sha256-mhJye91Bn0jJIE7NnEywGty/U5qdELfsT8S+FBjTdG4=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "a619538647bd03e3ee1d7b947f7c11ff289b376e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_2": {
+      "inputs": {
+        "flake-utils": [
           "strip_js_comments",
           "crane",
           "flake-utils"
@@ -256,8 +376,8 @@
     },
     "strip_js_comments": {
       "inputs": {
-        "crane": "crane",
-        "flake-utils": "flake-utils_2",
+        "crane": "crane_2",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ],
diff --git a/flake.nix b/flake.nix
index 5fddd222..24f6e5f1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,6 +30,11 @@
       url = "git+https://git.sils.li/ene/lib-sh.git";
       flake = false;
     };
+    river_init_lesser = {
+      url = "git+https://git.sils.li/ene/river-lesser-init.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     user_js = {
       url = "github:arkenfox/user.js";
       flake = false;
@@ -43,14 +48,18 @@
   outputs = {
     self,
     nixpkgs,
+
     home-manager,
-    neovim_config,
-    strip_js_comments,
-    user_js,
     impermanence,
     agenix,
+
+    neovim_config,
+    user_js,
     snap-sync,
+
+    strip_js_comments,
     shell-library,
+    river_init_lesser,
     ...
   } @ inputs: let
     sysLib = import ./lib {inherit pkgs shell-library;};
@@ -66,7 +75,7 @@
       };
     };
   in {
-    nixosConfigurations = import ./flake/nixosConfigurations {inherit inputs system pkgs sysLib;};
+    nixosConfigurations = import ./flake/nixosConfigurations {inherit inputs system pkgs sysLib river_init_lesser;};
     packages."${system}" = {
       install = import ./bootstrap/install {
         inherit pkgs;
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index d2f2c97e..c1534e6e 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -20,11 +20,15 @@
         inherit
           (inputs)
           strip_js_comments
+          river_init_lesser
+
           user_js
-          system
           neovim_config
-          impermanence
           snap-sync
+
+          impermanence
+
+          system
           ;
       };
     };
diff --git a/home-manager/config/river/default.nix b/home-manager/config/river/default.nix
index add1dec8..2d85e802 100644
--- a/home-manager/config/river/default.nix
+++ b/home-manager/config/river/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   sysLib,
+  river_init_lesser,
   ...
 }: {
   xdg.configFile."river/init".source =
@@ -9,7 +10,7 @@
       name = "river_init";
       script = ./init;
       dependencies = builtins.attrValues {
-        # TODO inherit river_init_lesser
+        river_init_lesser = river_init_lesser.legacyPackages.x86_64-linux.default;
         inherit
           (pkgs)
           dash
diff --git a/home-manager/config/river/init b/home-manager/config/river/init
index 2f14fcaa..c90c143e 100755
--- a/home-manager/config/river/init
+++ b/home-manager/config/river/init
@@ -5,7 +5,7 @@
 
 err_fail() {
     if ! "$@";then
-        printf "%s\n" "$@" >> ~/river_log
+        printf "%s\n" "$*" >> ~/river_log
         exec ~/.config/river/res/safe_init
     fi
 }