summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstuebinm2024-03-04 18:56:23 +0100
committerstuebinm2024-03-04 18:56:23 +0100
commit911e1fd4986c0556321457a5606f0e747ef556c6 (patch)
treeb141211dffec9b166416abc9ef92cac4f46d038e
parent0b7bf6205fa36e48c597bce55a65820d81cbeaec (diff)
import custom modules by default
which has the nice side-effect that they now show up on my `man configuration.nix'. (also I don't have to manually import things anymore)
Diffstat (limited to '')
-rw-r--r--flake.nix3
-rw-r--r--flora/configuration.nix2
2 files changed, 2 insertions, 3 deletions
diff --git a/flake.nix b/flake.nix
index be32a3e..371d0ea 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
inputs.nixpkgs.lib.nixosSystem rec {
system = "x86_64-linux";
modules = [ config ] ++ imports;
+ extraModules = builtins.attrValues self.nixosModules;
pkgs = nixpkgs;
specialArgs = {
@@ -147,7 +148,7 @@
};
nixosModules = {
- glitchtip = import ./modules/glitchtip.nix;
+ # glitchtip = import ./modules/glitchtip.nix;
bookwyrm = import ./modules/bookwyrm.nix;
mollysocket = import ./modules/mollysocket.nix;
};
diff --git a/flora/configuration.nix b/flora/configuration.nix
index d124f99..40cd3a5 100644
--- a/flora/configuration.nix
+++ b/flora/configuration.nix
@@ -13,8 +13,6 @@
./services/ntfy.nix
./services/murmur.nix
./services/monit.nix
-
- ../modules/mollysocket.nix
];
# Use the GRUB 2 boot loader.