Skip to content

Commit 2460348

Browse files
thomasjmthomasjm
committed
Move settings around
1 parent bf9c864 commit 2460348

33 files changed

+188
-219
lines changed

‎modules/kernels/bash/default.nix

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@
77
, writeTextDir
88

99
, bash
10-
, attrs
11-
, extensions
10+
1211
, settings
1312
, settingsSchema
1413
}:
1514

15+
with { inherit (settings) attrs extensions; };
16+
1617
let
1718
kernelName = "bash";
1819

‎modules/kernels/bash/module.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ with lib;
2222
default = ["sh" "bash"];
2323
};
2424

25-
settings.lsp.bash-language-server.enable = mkOption {
25+
lsp.bash-language-server.enable = mkOption {
2626
type = types.bool;
2727
default = true;
2828
description = "Enable Bash language server";
@@ -33,7 +33,7 @@ with lib;
3333
config = mkIf config.kernels.bash.enable {
3434
builtKernels.bash = config.pkgs.callPackage ./. {
3535
bash = config.pkgs.bash;
36-
inherit (config.kernels.bash) attrs extensions settings;
36+
settings = config.kernels.bash;
3737
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.bash;
3838
};
3939
};

‎modules/kernels/clojure/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
, writeTextDir
77
, symlinkJoin
88

9-
, bash
10-
, attrs
11-
, extensions
129
, settings
1310
, settingsSchema
1411
}:
1512

13+
with { inherit (settings) attrs extensions; };
14+
1615
let
1716
common = callPackage ../common.nix {};
1817

‎modules/kernels/clojure/module.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ with lib;
2222
default = ["clj"];
2323
};
2424

25-
settings.lsp.clojure-lsp.enable = mkOption {
25+
lsp.clojure-lsp.enable = mkOption {
2626
type = types.bool;
2727
default = true;
2828
description = "Enable clojure-lsp language server";
@@ -33,7 +33,7 @@ with lib;
3333
config = mkIf config.kernels.clojure.enable {
3434
builtKernels.clojure = config.pkgs.callPackage ./. {
3535
clojure = config.pkgs.clojure;
36-
inherit (config.kernels.clojure) attrs extensions settings;
36+
settings = config.kernels.clojure;
3737
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.clojure;
3838
};
3939
};

‎modules/kernels/coq/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66

77
, coqPackages
88

9-
, packages
10-
, attrs
11-
, extensions
129
, settings
1310
, settingsSchema
1411
}:
1512

13+
with { inherit (settings) packages attrs extensions; };
14+
1615
let
1716
common = callPackage ../common.nix {};
1817

‎modules/kernels/coq/module.nix

+1-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,7 @@ with lib;
4242
builtKernels.coq = config.pkgs.callPackage ./. {
4343
coqPackages = getAttr config.kernels.coq.coqPackages config.pkgs;
4444

45-
inherit (config.kernels.coq) packages attrs extensions;
46-
settings = {};
45+
settings = config.kernels.coq;
4746
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.coq;
4847
};
4948
};

‎modules/kernels/cpp/default.nix

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@
77
, llvmPackages_13
88
, xeus-cling
99

10-
, flavor
11-
, packages
12-
, attrs
13-
, extensions
1410
, settings
1511
, settingsSchema
1612
}:
1713

14+
with { inherit (settings) packages extensions flavor; };
15+
1816
with lib;
1917

2018
let
19+
attrs = [flavor] ++ settings.attrs;
20+
2121
common = callPackage ../common.nix {};
2222

2323
displayName = "C++";

‎modules/kernels/cpp/module.nix

+1-6
Original file line numberDiff line numberDiff line change
@@ -44,17 +44,12 @@ with lib;
4444
type = types.listOf types.str;
4545
default = ["cpp" "hpp" "cxx" "hxx" "c" "h"];
4646
};
47-
48-
settings = {};
4947
};
5048
};
5149

5250
config = mkIf config.kernels.cpp.enable {
5351
builtKernels.cpp = config.pkgs.callPackage ./. {
54-
inherit (config.kernels.cpp) flavor packages extensions settings;
55-
56-
attrs = [config.kernels.cpp.flavor] ++ config.kernels.cpp.attrs;
57-
52+
settings = config.kernels.cpp;
5853
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.cpp;
5954
};
6055
};

‎modules/kernels/go/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66

77
, go
88

9-
, packages
10-
, attrs
11-
, extensions
129
, settings
1310
, settingsSchema
1411
}:
1512

13+
with { inherit (settings) packages attrs extensions; };
14+
1615
with lib;
1716

1817
let

‎modules/kernels/go/module.nix

+11-13
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,16 @@ with lib;
3636
default = ["go"];
3737
};
3838

39-
settings = {
40-
lsp.gopls.enable = mkOption {
41-
type = types.bool;
42-
description = "Enable gopls language server";
43-
default = true;
44-
};
45-
46-
go.gocache = mkOption {
47-
type = types.str;
48-
description = "Value of GOCACHE environment variable";
49-
default = "/home/.gocache";
50-
};
39+
lsp.gopls.enable = mkOption {
40+
type = types.bool;
41+
description = "Enable gopls language server";
42+
default = true;
43+
};
44+
45+
go.gocache = mkOption {
46+
type = types.str;
47+
description = "Value of GOCACHE environment variable";
48+
default = "/home/.gocache";
5149
};
5250
};
5351
};
@@ -56,7 +54,7 @@ with lib;
5654
builtKernels.go = config.pkgs.callPackage ./. {
5755
go = getAttr config.kernels.go.goPackage config.pkgs;
5856

59-
inherit (config.kernels.go) packages attrs extensions settings;
57+
settings = config.kernels.go;
6058
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.go;
6159
};
6260
};

‎modules/kernels/haskell/default.nix

+2-5
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,15 @@
66
, symlinkJoin
77
, makeWrapper
88

9-
, ltsOnly ? true
10-
119
, compilerName
1210
, snapshot
1311

14-
, packages
15-
, attrs
16-
, extensions
1712
, settings
1813
, settingsSchema
1914
}:
2015

16+
with { inherit (settings) packages attrs extensions; };
17+
2118
with lib;
2219

2320
let

‎modules/kernels/haskell/module.nix

+21-22
Original file line numberDiff line numberDiff line change
@@ -32,27 +32,26 @@ with lib;
3232
default = ["hs"];
3333
};
3434

35-
settings = {
36-
lsp.haskell-language-server.enable = mkOption {
37-
description = "Enable haskell-language-server";
38-
type = types.bool;
39-
default = true;
40-
};
41-
lsp.haskell-language-server.debug = mkOption {
42-
description = "Haskell-language-server: enable debug output";
43-
type = types.bool;
44-
default = false;
45-
};
46-
lsp.haskell-language-server.super-debug = mkOption {
47-
description = "Haskell-language-server: enable verbose debug output";
48-
type = types.bool;
49-
default = false;
50-
};
51-
enableHlintOutput = mkOption {
52-
description = "Enable hlint warnings in Jupyter kernel output. Normally you don't want this because it is provided by haskell-language-server.";
53-
type = types.bool;
54-
default = false;
55-
};
35+
lsp.haskell-language-server.enable = mkOption {
36+
description = "Enable haskell-language-server";
37+
type = types.bool;
38+
default = true;
39+
};
40+
lsp.haskell-language-server.debug = mkOption {
41+
description = "Haskell-language-server: enable debug output";
42+
type = types.bool;
43+
default = false;
44+
};
45+
lsp.haskell-language-server.super-debug = mkOption {
46+
description = "Haskell-language-server: enable verbose debug output";
47+
type = types.bool;
48+
default = false;
49+
};
50+
51+
enableHlintOutput = mkOption {
52+
description = "Enable hlint warnings in Jupyter kernel output. Normally you don't want this because it is provided by haskell-language-server.";
53+
type = types.bool;
54+
default = false;
5655
};
5756
};
5857
};
@@ -76,7 +75,7 @@ with lib;
7675
compilerName = config.kernels.haskell.ghcPackage;
7776
snapshot = getAttr config.kernels.haskell.ghcPackage compilers;
7877

79-
inherit (config.kernels.haskell) packages attrs extensions settings;
78+
settings = config.kernels.haskell;
8079
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.haskell;
8180
};
8281
};

‎modules/kernels/julia/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,12 @@
99

1010
, julia
1111

12-
, packages
13-
, attrs
14-
, extensions
1512
, settings
1613
, settingsSchema
1714
}:
1815

16+
with { inherit (settings) packages attrs extensions; };
17+
1918
with lib;
2019

2120
let

‎modules/kernels/julia/module.nix

+21-22
Original file line numberDiff line numberDiff line change
@@ -39,27 +39,26 @@ with lib;
3939
default = ["jl"];
4040
};
4141

42-
settings = {
43-
precompile = mkOption {
44-
description = "Precompile Julia environment for faster imports. In some cases, precompilation can make the build fail, so turning this off can help.";
45-
type = types.bool;
46-
default = true;
47-
};
48-
lsp.LanguageServer.enable = mkOption {
49-
description = "Enable LanguageServer language server";
50-
type = types.bool;
51-
default = true;
52-
};
53-
lsp.LanguageServer.index = mkOption {
54-
description = "LanguageServer: auto-index packages when building environment";
55-
type = types.bool;
56-
default = true;
57-
};
58-
lsp.LanguageServer.debug = mkOption {
59-
description = "LanguageServer: log debug messages to stderr";
60-
type = types.bool;
61-
default = false;
62-
};
42+
precompile = mkOption {
43+
description = "Precompile Julia environment for faster imports. In some cases, precompilation can make the build fail, so turning this off can help.";
44+
type = types.bool;
45+
default = true;
46+
};
47+
48+
lsp.LanguageServer.enable = mkOption {
49+
description = "Enable LanguageServer language server";
50+
type = types.bool;
51+
default = true;
52+
};
53+
lsp.LanguageServer.index = mkOption {
54+
description = "LanguageServer: auto-index packages when building environment";
55+
type = types.bool;
56+
default = true;
57+
};
58+
lsp.LanguageServer.debug = mkOption {
59+
description = "LanguageServer: log debug messages to stderr";
60+
type = types.bool;
61+
default = false;
6362
};
6463
};
6564
};
@@ -68,7 +67,7 @@ with lib;
6867
builtKernels.julia = config.pkgs.callPackage ./. {
6968
julia = getAttr config.kernels.julia.juliaPackage config.pkgs;
7069

71-
inherit (config.kernels.julia) packages attrs extensions settings;
70+
settings = config.kernels.julia;
7271
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.julia;
7372
};
7473
};

‎modules/kernels/octave/default.nix

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
, symlinkJoin
99
, writeTextDir
1010

11-
, packages
12-
, attrs
13-
, extensions
1411
, octave
12+
1513
, settings
1614
, settingsSchema
1715
}:
1816

17+
with { inherit (settings) packages attrs extensions; };
18+
1919
with lib;
2020

2121
let

‎modules/kernels/octave/module.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ with lib;
2727
default = ["m"];
2828
};
2929

30-
settings.extraJupyterConfig = mkOption {
30+
extraJupyterConfig = mkOption {
3131
type = types.str;
3232
default = "";
3333
description = "Extra Jupyter configuration.";
@@ -38,7 +38,7 @@ with lib;
3838
config = mkIf config.kernels.octave.enable {
3939
builtKernels.octave = config.pkgs.callPackage ./. {
4040
octave = config.pkgs.octave;
41-
inherit (config.kernels.octave) packages attrs extensions settings;
41+
settings = config.kernels.octave;
4242
settingsSchema = nixosOptionsToSettingsSchema { componentsToDrop = 2; } options.kernels.octave;
4343
};
4444
};

‎modules/kernels/postgres/default.nix

+2-3
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,12 @@
44
, writeTextDir
55
, symlinkJoin
66

7-
, packages
8-
, attrs
9-
, extensions
107
, settings
118
, settingsSchema
129
}:
1310

11+
with { inherit (settings) packages attrs extensions; };
12+
1413
let
1514
common = callPackage ../common.nix {};
1615

0 commit comments

Comments
 (0)