Move settings around

modules/kernels/bash/default.nix

@@ -7,12 +7,13 @@
 , writeTextDir
 
 , bash
-, attrs
-, extensions
+
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) attrs extensions; };
+
 let
   kernelName = "bash";
 

modules/kernels/bash/module.nix

@@ -22,7 +22,7 @@ with lib;
         default = ["sh" "bash"];
       };
 
-      settings.lsp.bash-language-server.enable = mkOption {
+      lsp.bash-language-server.enable = mkOption {
         type = types.bool;
         default = true;
         description = "Enable Bash language server";
@@ -33,7 +33,7 @@ with lib;
   config = mkIf config.kernels.bash.enable {
     builtKernels.bash = config.pkgs.callPackage ./. {
       bash = config.pkgs.bash;
-      inherit (config.kernels.bash) attrs extensions settings;
+      settings = config.kernels.bash;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.bash;
     };
   };

modules/kernels/clojure/default.nix

@@ -6,13 +6,12 @@
 , writeTextDir
 , symlinkJoin
 
-, bash
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) attrs extensions; };
+
 let
   common = callPackage ../common.nix {};
 

modules/kernels/clojure/module.nix

@@ -22,7 +22,7 @@ with lib;
         default = ["clj"];
       };
 
-      settings.lsp.clojure-lsp.enable = mkOption {
+      lsp.clojure-lsp.enable = mkOption {
         type = types.bool;
         default = true;
         description = "Enable clojure-lsp language server";
@@ -33,7 +33,7 @@ with lib;
   config = mkIf config.kernels.clojure.enable {
     builtKernels.clojure = config.pkgs.callPackage ./. {
       clojure = config.pkgs.clojure;
-      inherit (config.kernels.clojure) attrs extensions settings;
+      settings = config.kernels.clojure;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.clojure;
     };
   };

modules/kernels/coq/default.nix

@@ -6,13 +6,12 @@
 
 , coqPackages
 
-, packages
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages attrs extensions; };
+
 let
   common = callPackage ../common.nix {};
 

modules/kernels/coq/module.nix

@@ -42,8 +42,7 @@ with lib;
     builtKernels.coq = config.pkgs.callPackage ./. {
       coqPackages = getAttr config.kernels.coq.coqPackages config.pkgs;
 
-      inherit (config.kernels.coq) packages attrs extensions;
-      settings = {};
+      settings = config.kernels.coq;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.coq;
     };
   };

modules/kernels/cpp/default.nix

@@ -7,17 +7,17 @@
 , llvmPackages_13
 , xeus-cling
 
-, flavor
-, packages
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages extensions flavor; };
+
 with lib;
 
 let
+  attrs = [flavor] ++ settings.attrs;
+
   common = callPackage ../common.nix {};
 
   displayName = "C++";

modules/kernels/cpp/module.nix

@@ -44,17 +44,12 @@ with lib;
         type = types.listOf types.str;
         default = ["cpp" "hpp" "cxx" "hxx" "c" "h"];
       };
-
-      settings = {};
     };
   };
 
   config = mkIf config.kernels.cpp.enable {
     builtKernels.cpp = config.pkgs.callPackage ./. {
-      inherit (config.kernels.cpp) flavor packages extensions settings;
-
-      attrs = [config.kernels.cpp.flavor] ++ config.kernels.cpp.attrs;
-
+      settings = config.kernels.cpp;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.cpp;
     };
   };

modules/kernels/go/default.nix

@@ -6,13 +6,12 @@
 
 , go
 
-, packages
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages attrs extensions; };
+
 with lib;
 
 let

modules/kernels/go/module.nix

@@ -36,18 +36,16 @@ with lib;
         default = ["go"];
       };
 
-      settings = {
-        lsp.gopls.enable = mkOption {
-          type = types.bool;
-          description = "Enable gopls language server";
-          default = true;
-        };
-
-        go.gocache = mkOption {
-          type = types.str;
-          description = "Value of GOCACHE environment variable";
-          default = "/home/.gocache";
-        };
+      lsp.gopls.enable = mkOption {
+        type = types.bool;
+        description = "Enable gopls language server";
+        default = true;
+      };
+
+      go.gocache = mkOption {
+        type = types.str;
+        description = "Value of GOCACHE environment variable";
+        default = "/home/.gocache";
       };
     };
   };
@@ -56,7 +54,7 @@ with lib;
     builtKernels.go = config.pkgs.callPackage ./. {
       go = getAttr config.kernels.go.goPackage config.pkgs;
 
-      inherit (config.kernels.go) packages attrs extensions settings;
+      settings = config.kernels.go;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.go;
     };
   };

modules/kernels/haskell/default.nix

@@ -6,18 +6,15 @@
 , symlinkJoin
 , makeWrapper
 
-, ltsOnly ? true
-
 , compilerName
 , snapshot
 
-, packages
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages attrs extensions; };
+
 with lib;
 
 let

modules/kernels/haskell/module.nix

@@ -32,27 +32,26 @@ with lib;
         default = ["hs"];
       };
 
-      settings = {
-        lsp.haskell-language-server.enable = mkOption {
-          description = "Enable haskell-language-server";
-          type = types.bool;
-          default = true;
-        };
-        lsp.haskell-language-server.debug = mkOption {
-          description = "Haskell-language-server: enable debug output";
-          type = types.bool;
-          default = false;
-        };
-        lsp.haskell-language-server.super-debug = mkOption {
-          description = "Haskell-language-server: enable verbose debug output";
-          type = types.bool;
-          default = false;
-        };
-        enableHlintOutput = mkOption {
-          description = "Enable hlint warnings in Jupyter kernel output. Normally you don't want this because it is provided by haskell-language-server.";
-          type = types.bool;
-          default = false;
-        };
+      lsp.haskell-language-server.enable = mkOption {
+        description = "Enable haskell-language-server";
+        type = types.bool;
+        default = true;
+      };
+      lsp.haskell-language-server.debug = mkOption {
+        description = "Haskell-language-server: enable debug output";
+        type = types.bool;
+        default = false;
+      };
+      lsp.haskell-language-server.super-debug = mkOption {
+        description = "Haskell-language-server: enable verbose debug output";
+        type = types.bool;
+        default = false;
+      };
+
+      enableHlintOutput = mkOption {
+        description = "Enable hlint warnings in Jupyter kernel output. Normally you don't want this because it is provided by haskell-language-server.";
+        type = types.bool;
+        default = false;
       };
     };
   };
@@ -76,7 +75,7 @@ with lib;
         compilerName = config.kernels.haskell.ghcPackage;
         snapshot = getAttr config.kernels.haskell.ghcPackage compilers;
 
-        inherit (config.kernels.haskell) packages attrs extensions settings;
+        settings = config.kernels.haskell;
         settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.haskell;
       };
   };

modules/kernels/julia/default.nix

@@ -9,13 +9,12 @@
 
 , julia
 
-, packages
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages attrs extensions; };
+
 with lib;
 
 let

modules/kernels/julia/module.nix

@@ -39,27 +39,26 @@ with lib;
         default = ["jl"];
       };
 
-      settings = {
-        precompile = mkOption {
-          description = "Precompile Julia environment for faster imports. In some cases, precompilation can make the build fail, so turning this off can help.";
-          type = types.bool;
-          default = true;
-        };
-        lsp.LanguageServer.enable = mkOption {
-          description = "Enable LanguageServer language server";
-          type = types.bool;
-          default = true;
-        };
-        lsp.LanguageServer.index = mkOption {
-          description = "LanguageServer: auto-index packages when building environment";
-          type = types.bool;
-          default = true;
-        };
-        lsp.LanguageServer.debug = mkOption {
-          description = "LanguageServer: log debug messages to stderr";
-          type = types.bool;
-          default = false;
-        };
+      precompile = mkOption {
+        description = "Precompile Julia environment for faster imports. In some cases, precompilation can make the build fail, so turning this off can help.";
+        type = types.bool;
+        default = true;
+      };
+
+      lsp.LanguageServer.enable = mkOption {
+        description = "Enable LanguageServer language server";
+        type = types.bool;
+        default = true;
+      };
+      lsp.LanguageServer.index = mkOption {
+        description = "LanguageServer: auto-index packages when building environment";
+        type = types.bool;
+        default = true;
+      };
+      lsp.LanguageServer.debug = mkOption {
+        description = "LanguageServer: log debug messages to stderr";
+        type = types.bool;
+        default = false;
       };
     };
   };
@@ -68,7 +67,7 @@ with lib;
     builtKernels.julia = config.pkgs.callPackage ./. {
       julia = getAttr config.kernels.julia.juliaPackage config.pkgs;
 
-      inherit (config.kernels.julia) packages attrs extensions settings;
+      settings = config.kernels.julia;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.julia;
     };
   };

modules/kernels/octave/default.nix

@@ -8,14 +8,14 @@
 , symlinkJoin
 , writeTextDir
 
-, packages
-, attrs
-, extensions
 , octave
+
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages attrs extensions; };
+
 with lib;
 
 let

modules/kernels/octave/module.nix

@@ -27,7 +27,7 @@ with lib;
         default = ["m"];
       };
 
-      settings.extraJupyterConfig = mkOption {
+      extraJupyterConfig = mkOption {
         type = types.str;
         default = "";
         description = "Extra Jupyter configuration.";
@@ -38,7 +38,7 @@ with lib;
   config = mkIf config.kernels.octave.enable {
     builtKernels.octave = config.pkgs.callPackage ./. {
       octave = config.pkgs.octave;
-      inherit (config.kernels.octave) packages attrs extensions settings;
+      settings = config.kernels.octave;
       settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.octave;
     };
   };

modules/kernels/postgres/default.nix

@@ -4,13 +4,12 @@
 , writeTextDir
 , symlinkJoin
 
-, packages
-, attrs
-, extensions
 , settings
 , settingsSchema
 }:
 
+with { inherit (settings) packages attrs extensions; };
+
 let
   common = callPackage ../common.nix {};