Make use of specialArgs WIP

573 · Sep 18, 2024 · 5ed771c · 5ed771c
1 parent 5eb475e
commit 5ed771c
Show file tree

Hide file tree

Showing 14 changed files with 155 additions and 84 deletions.
diff --git a/flake.nix b/flake.nix
@@ -432,7 +432,7 @@
       });
 
       inherit (nixpkgs.lib) listToAttrs attrValues;
-      inherit (flakeLib) mkApp mkHome mkNixOnDroid mkNixos mkDevenvJvmLang mkDevenvDeno mkDevenvFlutter mkDevenvOcaml mkDevenvRust mkDevenvMachnix mkDevenvJupyenv mkDevenvRuby mkDevenvHaskell mkDevenvRustWasm32;
+      inherit (flakeLib) mkApp mkHome mkNixOnDroid mkNixos mkDevenvJvmLang mkDevenvDeno mkDevenvFlutter mkDevenvOcaml mkDevenvRust mkDevenvMachnix mkDevenvJupyenv mkDevenvRuby mkDevenvHaskell mkDevenvRustWasm32 mkDevShellJdk;
       # NOTE https://discourse.nixos.org/t/installing-only-a-single-package-from-unstable/5598/30
       #  and https://discourse.nixos.org/t/add-an-option-to-home-manager-as-a-nixos-module-using-flake/38731/4
       #  and https://discourse.nixos.org/t/how-do-specialargs-work/50615/4
@@ -714,7 +714,8 @@
           }
         )
         # AFAIU the pkgs used herein (mkDevenv*) are with the overlays as in flake/nixpkgs.nix etc. applied, also means any derivation defined therein can be used here then, but is a different derivation than i. e. some binary-cached elsewhere, which can lead to subtle differences i. e. (un)expected rebuilds. To use a binary-cached flake define here directly in flake.nix and add overlays when needed only.
-        (mkDevenvJupyenv system "jupyenv" { })
+        (mkDevShellJdk system "jdk21" { jdk = pkgs: pkgs.jdk21; })
+	(mkDevenvJupyenv system "jupyenv" { })
         (mkDevenvJvmLang system "jvmlanguages-devenv" { })
         (mkDevenvDeno system "deno" { })
         (mkDevenvFlutter system "flutter" { })
@@ -723,7 +724,7 @@
         (mkDevenvRuby system "ruby" { })
         (mkDevenvRust system "rust" { })
         (mkDevenvRustWasm32 system "rustwasm32" { })
-        (mkDevenvHaskell system "haskell" { })
+        (mkDevenvHaskell system "haskell" { inherit (specialArgs.${system}) haskellPackages; })
 
         (mkDevenvMachnix system "machnix" { })
         #(mkDevenvJulia system "julia" { })

diff --git a/flake/builders/mkDevShellJdk.nix b/flake/builders/mkDevShellJdk.nix
@@ -0,0 +1,12 @@
+{ system, pkgsFor, name, args, ... }:
+
+let
+  pkgs = pkgsFor.${system};
+  jdk = args.jdk pkgs;
+in
+
+pkgs.mkShell {
+  inherit name;
+  buildInputs = [ jdk pkgs.maven ];
+  JAVA_HOME = jdk;
+}
diff --git a/flake/builders/mkDevenvHaskell.nix b/flake/builders/mkDevenvHaskell.nix
@@ -1,17 +1,17 @@
-{ system, pkgsFor, inputs, specialArgs, name, args, ... }:
+{ system, pkgsFor, inputs, name, args, ... }:
 
 let
   pkgs = pkgsFor.${system};
   inherit (inputs.devenv.lib) mkShell;
-  inherit (specialArgs.${system}) haskellPackages;
+  #inherit (specialArgs.${system}) haskellPackages;
 in
 mkShell rec {
   inherit inputs pkgs;
   modules = [
     ({ pkgs, ... }:
       let
         myHaskellPackages =
-          haskellPackages.override (old: {
+          args.haskellPackages.override (old: {
             overrides = pkgs.lib.composeExtensions (old.overrides or (_: _: { }))
               (hself: hsuper: {
                 ghc = hsuper.ghc // { withPackages = hsuper.ghc.withHoogle; };

diff --git a/flake/builders/mkHome.nix b/flake/builders/mkHome.nix
@@ -17,11 +17,16 @@ inputs.home-manager.lib.homeManagerConfiguration {
   pkgs = pkgsFor.${system};
   /**
     as in ./../../lib/common-config.nix `homeManager.baseConfig.extraSpecialArgs`
+    These herein are needed for ./../../home/ modules' parameters
   */
   extraSpecialArgs = { 
     inherit inputs rootPath;
     libreoffice-postscript = inputs.libreoffice-postscript.legacyPackages.${system};
 
+    inherit (inputs.nixvim.legacyPackages.${system}) makeNixvim;
+    haskellPackages = inputs.ghc-nixpkgs-unstable.legacyPackages.${system}.haskell.packages.ghc965;
+    ghc-nixpkgs-unstable = inputs.ghc-nixpkgs-unstable.legacyPackages.${system};
+    unstable = inputs.unstable.legacyPackages.${system};
     emacs = if isLinux && isAarch64
       then inputs.emacs-overlay-cached.packages.${system}.emacs-unstable-nox
       else inputs.emacs-overlay.packages.${system}.emacs-unstable;

diff --git a/flake/builders/mkNixOnDroid.nix b/flake/builders/mkNixOnDroid.nix
@@ -29,6 +29,7 @@ inputs.nix-on-droid.lib.nixOnDroidConfiguration {
   extraSpecialArgs = {
     inherit inputs rootPath;
     unstable = inputs.unstable.legacyPackages.${system};
+    inherit (inputs.nixvim.legacyPackages.${system}) makeNixvim;
     emacs = if isLinux && isAarch64
       then inputs.emacs-overlay-cached.packages.${system}.emacs-unstable-nox
       else inputs.emacs-overlay.packages.${system}.emacs-unstable;

diff --git a/flake/builders/mkNixos.nix b/flake/builders/mkNixos.nix
@@ -12,6 +12,7 @@ inputs.nixpkgs.lib.nixosSystem {
   */
   specialArgs = {
     inherit inputs rootPath;
+    inherit (inputs.nixvim.legacyPackages.${system}) makeNixvim;
     # NOTE one can alternatively also just (with only inherit inputs;) use in the downstream nix file then: inputs.unstable.legacyPackages.${pkgs.system};
     unstable = inputs.unstable.legacyPackages.${system};
     emacs = if isLinux && isAarch64

diff --git a/flake/default.nix b/flake/default.nix
@@ -59,6 +59,7 @@ in
   mkNixos = simpleWrapper ./builders/mkNixos.nix;
 
   mkApp = wrapper ./builders/mkApp.nix;
+  mkDevShellJdk = wrapper ./builders/mkDevShellJdk.nix;
   mkDevenvJvmLang = wrapper ./builders/mkDevenvJvmLang.nix;
   mkDevenvDeno = wrapper ./builders/mkDevenvDeno.nix;
   mkDevenvFlutter = wrapper ./builders/mkDevenvFlutter.nix;

diff --git a/home/base/general.nix b/home/base/general.nix
@@ -4,7 +4,7 @@ Original author's home'nix files are always prefixed with `{ config, lib, pkgs,
 Parameter `[inputs]` here is a deviation from the orinal author's intent (doing that via overlay) and should maybe be fixed
 For `[inputs]` parameter determine a solution (./../../nixos/programs/docker.nix also has the issue yet)
 */
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, unstable, ... }:
 let
   inherit (lib)
     attrValues
@@ -18,7 +18,7 @@ Attribute `system` here is determined that way (`inherit (pkgs.stdenv.hostPlatfo
 
 If I want to rid overlays I might have to find a way with less potentially bad implications, IDK are there any ?
 */
-  inherit (pkgs.stdenv.hostPlatform) system;
+  #inherit (pkgs.stdenv.hostPlatform) system;
   cfg = config.custom.base.general;
   localeGerman = "de_DE.UTF-8";
   localeEnglish = "en_US.UTF-8";
@@ -31,7 +31,7 @@ in
       enable = mkEnableOption "basic config" // { default = true; };
 
       lightWeight =
-        mkEnableOption "light weight config for low performance hosts";
+        mkEnableOption "light weight config for low performance hosts" // { default = false; };
 
       wsl = mkEnableOption "config for NixOS-WSL instances";
 
@@ -49,7 +49,7 @@ in
   ###### implementation
 
   config = mkIf cfg.enable (mkMerge [
-    (mkIf (!cfg.termux) {
+     {
       custom.programs = {
         emacs-novelist.enable = true;
         emacs-nano.enable = true;
@@ -58,7 +58,8 @@ in
         nix-index.enable = true;
         neovim = {
           enable = true;
-          lightWeight = false; # FIXME Remove this line, only for testing if build works on nix-on-droid
+	  # not inherit not same attr
+	  lightWeight = cfg.lightWeight;
         };
       };
 
@@ -143,7 +144,7 @@ in
             ;
 
           inherit
-            (inputs.unstable.legacyPackages.${system})
+            (unstable)
             eza
             yazi
             ;
@@ -159,6 +160,7 @@ in
           ];
           PAGER = "${pkgs.less}/bin/less";
           SHELL = "bash";
+	  # TODO how does that interfere with same attr in neovim.nix
           EDITOR = "vi";
           VISUAL = "vi";
           # (ft-man-plugin),
@@ -169,13 +171,37 @@ in
           # export MANPAGER='nvim -u NONE -i NONE "+runtime plugin/man.lua" -c "Man"''!'' -o -'
           #working#MANPAGER = "${config.custom.programs.neovim.finalPackage}/bin/nvim -u NONE -i NONE '+runtime plugin/man.lua' -c Man! -o -";
         };
-
       };
+    }
 
+    {
+      home.stateVersion = "24.05";
+    }
+
+    {
       programs.fzf.enable = true;
 
       # FIXME: set to sd-switch once it works for krypton, https://home-manager-options.extranix.com/?query=systemd.user.startServices&release=release-24.05
       systemd.user.startServices = "legacy";
+    }
+
+    (mkIf (!cfg.minimal) {
+      custom = {
+        misc.util-bins.enable = true;
+
+        # see ./home/programs
+        programs = {
+          git.enable = true;
+          nnn.enable = true;
+          rsync.enable = true;
+          ssh = {
+            enable = true;
+            #  modules = [ "vcs" ];
+          };
+        };
+      };
+
+      programs.home-manager.enable = true;
     })
 
     (mkIf cfg.wsl {
@@ -187,30 +213,10 @@ in
       # programs.starship.enable = true; # long lines are distorted
     })
 
-    {
-      home.stateVersion = "24.05";
-    }
-
-    (mkIf cfg.termux {
-      custom = {
-        base.general = {
-          lightWeight = true;
-          minimal = true;
-        };
-        programs.emacs-novelist.enable = true;
-      };
-    })
-
     (mkIf (!cfg.lightWeight) {
       custom.programs = {
         tmux.enable = true;
         emacs.enable = true;
-        #        emacs-novelist.enable = true;
-        #emacs-nano.enable = true;
-        neovim = {
-          enable = true;
-          lightWeight = false;
-        };
       };
 
       home.packages = attrValues {
@@ -228,26 +234,5 @@ in
           ;
       };
     })
-
-    (mkIf (!cfg.minimal) {
-      custom = {
-        misc.util-bins.enable = true;
-
-        # see ./home/programs
-        programs = {
-          git.enable = true;
-          nnn.enable = true;
-          rsync.enable = true;
-          ssh = {
-            enable = true;
-            #  modules = [ "vcs" ];
-          };
-        };
-      };
-
-      programs = {
-        home-manager.enable = true;
-      };
-    })
   ]);
 }
diff --git a/home/programs/arbtt.nix b/home/programs/arbtt.nix
@@ -3,7 +3,7 @@ Original author's home'nix files are always prefixed with `{ config, lib, pkgs,
 
 For `[haskellPackages]` parameter determine a solution (./../../nixos/programs/docker.nix also has the issue yet)
 */
-{ config, lib, pkgs, /*haskellPackages,*/ inputs, ... }:
+{ config, lib, pkgs, haskellPackages, inputs, ... }:
 
 let
   inherit (lib)
@@ -37,7 +37,7 @@ in
   config = mkIf cfg.enable {
     # FIXME https://github.com/toonn/nix-config/blob/master/home/home.nix
     home.packages = attrValues {
-      inherit (inputs.ghc-nixpkgs-unstable.legacyPackages.${system}.haskell.packages.ghc965)
+      inherit (haskellPackages)
         arbtt
         ;
     };
@@ -51,7 +51,7 @@ in
               let
                 path = builtins.concatStringsSep ":"
                   (map (p: "${lib.getBin p}/bin")
-                    (attrValues { inherit (inputs.ghc-nixpkgs-unstable.legacyPackages.${system}.haskell.packages.ghc965) arbtt; inherit (pkgs) coreutils; } # with pkgs; []
+                    (attrValues { inherit (haskellPackages) arbtt; inherit (pkgs) coreutils; } # with pkgs; []
                     )
                   );
               in

diff --git a/home/programs/hledger.nix b/home/programs/hledger.nix
@@ -1,9 +1,10 @@
 /**
+
 Original author's home'nix files are always prefixed with `{ config, lib, pkgs, ... }:` header
 
 For `[haskellPackages]` parameter determine a solution (./../../nixos/programs/docker.nix also has the issue yet)
 */
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, inputs, ghc-nixpkgs-unstable, ... }:
 
 let
   inherit (lib)
@@ -17,7 +18,7 @@ let
   inherit (pkgs.stdenv) isLinux isx86_64;
 
   inherit
-    (inputs.ghc-nixpkgs-unstable.legacyPackages.${system})
+    (ghc-nixpkgs-unstable)
     hledger
     hledger-utils
     hledger-interest
@@ -30,7 +31,7 @@ Attribute `system` here is determined that way (`inherit (pkgs.stdenv.hostPlatfo
 
 If I want to rid overlays I might have to find a way with less potentially bad implications, IDK are there any ?
 */
-  inherit (pkgs.stdenv.hostPlatform) system;
+ # inherit (pkgs.stdenv.hostPlatform) system;
 
   cfg = config.custom.programs.hledger;
 in