Deadnix cleanup and refactor common shellHook and tools into settings.nix

Author: bladyjoker

api/build.nix

@@ -1,4 +1,4 @@
-self@{ inputs, ... }:
+{ inputs, ... }:
 {
   perSystem = { pkgs, system, config, ... }:
     let
@@ -12,14 +12,9 @@ self@{ inputs, ... }:
           pkgs.protobuf
           pkgs.haskellPackages.proto-lens-protoc
           pkgs.protoc-gen-doc
-        ]; # ++ builtins.attrValues commonTools;
+        ] ++ config.settings.shell.tools;
 
-        shellHookd = ''
-          export LC_CTYPE=C.UTF-8;
-          export LC_ALL=C.UTF-8;
-          export LANG=C.UTF-8;
-          ${config.pre-commit.installationScript}
-        '';
+        shellHook = config.settings.shell.hook;
       };
 
       packages = {

docs/build.nix

@@ -1,5 +1,5 @@
-{ inputs, lib, ... }: {
-  perSystem = { pkgs, system, inputs', config, ... }:
+_: {
+  perSystem = { pkgs, config, ... }:
     {
       devShells.dev-docs = pkgs.mkShell {
         name = "docs-env";

experimental/build.nix

@@ -1,4 +1,4 @@
-{ inputs, ... }: {
+_: {
   perSystem = { pkgs, config, ... }:
     {
 
@@ -19,14 +19,9 @@
           pkgs.protobuf
           pkgs.haskellPackages.proto-lens-protoc
           pkgs.swiPrologWithGui
-        ]; # ++ builtins.attrValues commonTools;
+        ] ++ config.settings.shell.tools;
 
-        shellHook = ''
-          export LC_CTYPE=C.UTF-8;
-          export LC_ALL=C.UTF-8;
-          export LANG=C.UTF-8;
-          ${config.pre-commit.installationScript}
-        '';
+        shellHook = config.settings.shell.hook;
       };
 
     };

extras/build.nix

@@ -3,7 +3,7 @@
   imports = [
     inputs.flake-parts.flakeModules.easyOverlay # Adds perSystem.overlayAttrs
   ];
-  perSystem = { pkgs, config, ... }:
+  perSystem = { pkgs, ... }:
     {
 
       overlayAttrs = {

extras/lbf-nix/lbf-haskell.nix

@@ -7,8 +7,6 @@ lbf:
 # LambdaBuffers Haskell Codegen
 lbg-haskell:
 let
-  utils = import ./utils.nix pkgs;
-
   lbfHaskellOpts =
     {
       # Source that is passed to `lbf` as the `--import-path` flag and used to find `files`.

extras/lbf-nix/lbf-plutus-purescript.nix

@@ -16,7 +16,7 @@ let
       };
       classes = {
         default = [ ];
-        override = cls: [ "Prelude.Eq" "Plutus.V1.PlutusData" ]; # TODO(bladyjoker): When Json instances are implemented for CTL Plutus types, bring back Json.
+        override = _: [ "Prelude.Eq" "Plutus.V1.PlutusData" ]; # TODO(bladyjoker): When Json instances are implemented for CTL Plutus types, bring back Json.
       };
       configs = {
         default = [ ];

extras/lbf-nix/lbf-purescript.nix

@@ -7,8 +7,6 @@ lbf:
 # LambdaBuffers Purescript Codegen
 lbg-purescript:
 let
-  utils = import ./utils.nix pkgs;
-
   lbfPurescriptOpts =
     {
       # Source that is passed to `lbf` as the `--import-path` flag and used to find `files`.

flake.nix

@@ -14,13 +14,13 @@
     purifix.url = "github:purifix/purifix";
   };
 
-  outputs = inputs@{ self, nixpkgs, flake-utils, pre-commit-hooks, protobufs-nix, mlabs-tooling, hci-effects, iohk-nix, flake-parts, purifix, ... }:
+  outputs = inputs@{ flake-parts, ... }:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [
         (import ./pkgs.nix)
         (import ./settings.nix)
-        (import ./hercules-ci.nix)
         (import ./pre-commit.nix)
+        (import ./hercules-ci.nix)
         (import ./docs/build.nix)
         (import ./extras/build.nix)
         (import ./extras/lbf-nix/build.nix)
@@ -45,23 +45,5 @@
       ];
       debug = true;
       systems = [ "x86_64-linux" "x86_64-darwin" ];
-      perSystem = { system, config, pkgs, ... }:
-        let
-          inherit self;
-
-          # pre-commit-hooks.nix
-
-          fourmolu = pkgs.haskell.packages.ghc924.fourmolu;
-
-          apply-refact = pkgs.haskellPackages.apply-refact;
-
-          commonTools = {
-            inherit (pre-commit-hooks.outputs.packages.${system}) nixpkgs-fmt cabal-fmt shellcheck hlint typos markdownlint-cli dhall purty;
-            inherit (pkgs) protolint txtpbfmt;
-            inherit fourmolu;
-            inherit apply-refact;
-          };
-        in
-        { };
     };
 }

hercules-ci.nix

@@ -1,4 +1,4 @@
-{ self, inputs, ... }: {
+{ inputs, ... }: {
   imports = [
     inputs.hci-effects.flakeModule # Adds hercules-ci and herculesCI options
   ];
@@ -17,7 +17,7 @@
     };
   };
   hercules-ci.github-pages.branch = "main";
-  perSystem = { pkgs, config, ... }: {
+  perSystem = { config, ... }: {
     hercules-ci.github-pages.settings.contents = config.packages.lambda-buffers-book;
   };
 

lambda-buffers-codegen/build.nix

@@ -1,6 +1,6 @@
 self@{ inputs, ... }:
 {
-  perSystem = { pkgs, system, inputs', config, ... }:
+  perSystem = { pkgs, config, ... }:
     let
       project = { lib, ... }: {
         src = ./.;
@@ -34,19 +34,14 @@ self@{ inputs, ... }:
 
           exactDeps = true;
 
-          #nativeBuildInputs = builtins.attrValues commonTools;
+          nativeBuildInputs = config.settings.shell.tools;
 
           tools = {
             cabal = { };
             haskell-language-server = { };
           };
 
-          shellHook = lib.mkForce ''
-            export LC_CTYPE=C.UTF-8;
-            export LC_ALL=C.UTF-8;
-            export LANG=C.UTF-8;
-            ${config.pre-commit.installationScript}
-          '';
+          shellHook = lib.mkForce config.settings.shell.hook;
         };
       };
       hsNixFlake = (pkgs.haskell-nix.cabalProject' [