gensokyo-zone/infrastructure
1
0
Fork 0
mirror of https://github.com/gensokyo-zone/infrastructure.git synced 2026-02-09 12:29:19 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move to recursiveMod, nixdirfmt

Browse source
This commit is contained in:
kat witch 2021-09-04 01:14:17 +01:00
parent 3a4458eae5
commit 76a479f14e
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
66 changed files with 313 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

17
config/modules/home/settings.nix
View file

@ -1,9 +1,12 @@
{ sources, ... }: {
external = [
(import (sources.arcexprs + "/modules")).home-manager
(import (sources.katexprs + "/modules")).home
(import (sources.impermanence + "/home-manager.nix"))
(import sources.anicca).modules.home
(sources.tf-nix + "/modules/home/secrets.nix")
];
functor = {
enable = true;
external = [
(import (sources.arcexprs + "/modules")).home-manager
(import (sources.katexprs + "/modules")).home
(import (sources.impermanence + "/home-manager.nix"))
(import sources.anicca).modules.home
(sources.tf-nix + "/modules/home/secrets.nix")
];
};
}

11
config/modules/home/vim.nix
View file

@ -39,7 +39,7 @@ let
visible = false;
};
in
mapAttrs opt knownSettings;
mapAttrs opt knownSettings;
};
setExpr = name: value:
@ -47,13 +47,13 @@ let
v =
if isBool value then (if value then "" else "no") + name
else
"${name}=${
"${name}=${
if isList value
then concatStringsSep "," value
else toString value
}";
in
optionalString (value != null) ("set " + v);
optionalString (value != null) ("set " + v);
in
@ -74,7 +74,7 @@ in
settings = mkOption {
type = vimSettingsType;
default = {};
default = { };
example = literalExample ''
{
expandtab = true;
@ -149,7 +149,8 @@ in
];
};
in mkIf cfg.enable {
in
mkIf cfg.enable {
programs.vim.package = vim;
home.packages = [ cfg.package ];
}

2
config/modules/meta/deploy.nix
View file

@ -70,7 +70,7 @@ in
config.tf = mkMerge (singleton
{
imports = [
../../targets/common
../../targets/common.nix
];
deps = {
select.allProviders = true;

4
config/modules/meta/network.nix
View file

@ -31,7 +31,7 @@ with lib;
options = {
nixpkgs.crossOverlays = mkOption {
type = types.listOf types.unspecified;
default = [];
default = [ ];
};
};
config = {
@ -72,7 +72,7 @@ with lib;
nixos = {
extraModules = [
"${toString sources.home-manager}/nixos"
] ++ singleton meta.modules.nixos;
] ++ lib.singleton meta.modules.nixos;
specialArgs = {
inherit (config.network) nodes;
inherit sources meta;

5
config/modules/meta/settings.nix Normal file
View file

@ -0,0 +1,5 @@
{ sources, ... }: {
functor = {
enable = true;
};
}

19
config/modules/nixos/settings.nix
View file

@ -1,10 +1,13 @@
{ sources, ... }: {
external = [
(import (sources.arcexprs + "/modules")).nixos
(import (sources.katexprs + "/modules")).nixos
(import (sources.impermanence + "/nixos.nix"))
(import sources.anicca).modules.nixos
(sources.tf-nix + "/modules/nixos/secrets.nix")
(sources.tf-nix + "/modules/nixos/secrets-users.nix")
];
functor = {
enable = true;
external = [
(import (sources.arcexprs + "/modules")).nixos
(import (sources.katexprs + "/modules")).nixos
(import (sources.impermanence + "/nixos.nix"))
(import sources.anicca).modules.nixos
(sources.tf-nix + "/modules/nixos/secrets.nix")
(sources.tf-nix + "/modules/nixos/secrets-users.nix")
];
};
}