primrose/.files
1
0
Fork 0
mirror of https://codeberg.org/leana8959/.files.git synced 2025-12-06 06:39:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

nix: options refactor

Browse source
This commit is contained in:
Primrose 2024-05-26 12:33:17 +02:00
parent fa5bbfb199
commit f329c3af7c
Signed by: primrose
GPG key ID: 4E887A4CA9714ADA
6 changed files with 143 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

32
nix/configurations/combinators.nix
View file

@ -5,20 +5,9 @@
...
}:
let
defaultOptions.options =
let
inherit (inputs.nixpkgs) lib;
in
{
cmus.enable = lib.mkOption { default = false; };
extraUtils.enable = lib.mkOption { default = false; };
extraLanguageServers.enable = lib.mkOption { default = false; };
universityTools.enable = lib.mkOption { default = false; };
git.signCommits = lib.mkOption { default = false; };
};
mkNixOS =
name: sys: opts:
name: sys: hmOpts:
withSystem sys (
{ pkgs, ... }:
let
@ -34,8 +23,6 @@ let
"${self}/nix/hosts/${name}"
"${self}/nix/layouts"
inputs.agenix.nixosModules.default
defaultOptions
opts
inputs.home-manager.nixosModules.home-manager
{
home-manager = {
@ -45,8 +32,7 @@ let
users.leana.imports = [
"${self}/nix/home/_"
"${self}/nix/home/${name}"
defaultOptions
opts
hmOpts
];
};
}
@ -55,7 +41,7 @@ let
);
mkDarwin =
name: sys: opts:
name: sys: hmOptns:
withSystem sys (
{ pkgs, ... }:
let
@ -71,8 +57,6 @@ let
"${self}/nix/hosts/_"
"${self}/nix/hosts/_darwin"
"${self}/nix/hosts/${name}"
defaultOptions
opts
inputs.home-manager.darwinModules.home-manager
{
home-manager = {
@ -82,8 +66,7 @@ let
users.leana.imports = [
"${self}/nix/home/_"
"${self}/nix/home/${name}"
defaultOptions
opts
hmOptns
];
};
}
@ -92,7 +75,7 @@ let
);
mkHomeManager =
name: sys: opts:
name: sys: hmOpts:
withSystem sys (
{ pkgs, ... }:
let
@ -107,13 +90,12 @@ let
modules = [
"${self}/nix/home/_"
"${self}/nix/home/${name}"
defaultOptions
opts
hmOpts
];
}
);
many = func: builtins.mapAttrs (name: opts: func name (opts.system) (opts.settings or { }));
many = func: builtins.mapAttrs (name: hmOpts: func name (hmOpts.system) (hmOpts.settings or { }));
in
{
# promote helper functions into the arguments

29
nix/configurations/default.nix
View file

@ -13,17 +13,20 @@
bismuth = {
system = "aarch64-darwin";
settings = {
extraLanguageServers.enable = true;
extraUtils.enable = true;
cmus.enable = true;
universityTools.enable = true;
git.signCommits = true;
extra.lang-servers.enable = true;
extra.utilities.enable = true;
extra.university.enable = true;
extra.workflow.enable = true;
programs.git.signing.signByDefault = true;
programs.cmus.enable = true;
};
};
# MacBook Air 2014
tungsten = {
system = "x86_64-darwin";
settings.cmus.enable = true;
settings = {
programs.cmus.enable = true;
};
};
};
@ -37,8 +40,10 @@
# Inria
hydragyrum = {
system = "x86_64-linux";
extraLanguageServers.enable = true;
extraUtils.enable = true;
settings = {
extra.lang-servers.enable = true;
extra.utilities.enable = true;
};
};
};
@ -47,10 +52,10 @@
carbon = {
system = "x86_64-linux";
settings = {
extraLanguageServers.enable = true;
extraUtils.enable = true;
cmus.enable = true;
universityTools.enable = true;
extra.lang-servers.enable = true;
extra.utilities.enable = true;
extra.university.enable = true;
programs.cmus.enable = true;
};
};
};