nix: update to latest nixos-unstable

[sourcephile-nix.git] / nixos / modules.nix

diff --git a/nixos/modules.nix b/nixos/modules.nix
index 5c6e81ae28541b1d5288ba9acdc39c37a2fa9059..de29f8031adeb6ee0c7fdffb579f42f65946dbc0 100644 (file)
--- a/nixos/modules.nix
+++ b/nixos/modules.nix
@@ -1,34 +1,38 @@
 { pkgs, lib, config, ... }:
 # NOTE: list explicitely the modules loaded by defaults.nix,
 # its clearer, safer and more flexible if not quicker.
-{ imports = [
-  modules/services/mail/dovecot.nix
-  modules/services/mail/rspamd/dkim.nix
-  modules/services/networking/domains.nix
-  modules/services/networking/shorewall.nix
-  modules/services/networking/shorewall6.nix
-  #modules/services/security/x509.nix
-  ];
-}
-
-/*
-# NOTE: this modules.nix file is put in the imports of the configuration.nix,
-# but using the lib.findFiles defined in the nixpkgs.overlays leads to an infinite recursion,
-# hence it is redefined here:
-let findFiles = pattern:
-      with builtins;
-      let go = curr:
-        let dir = readDir curr; in
-        let files = lib.filterAttrs (name: type:
-          type == "regular" &&
-          match pattern name != null) dir; in
-        let dirs = lib.filterAttrs (name: type: type == "directory") dir; in
-        map (name: "${curr}/${name}") (attrNames files) ++
-        lib.concatMap (name: go "${curr}/${name}") (attrNames dirs)
-        ;
-      in root: go (toPath root);
-in
 {
-  imports = findFiles ".*\\.nix" ./modules;
+imports = [
+  #modules/services/databases/openldap.nix
+  #modules/services/mail/public-inbox.nix
+  modules/services/mail/postfix.nix
+  modules/services/networking/upnpc.nix
+  #modules/services/security/tor.nix
+  #modules/services/backup/syncoid.nix
+  #modules/services/torrent/transmission.nix
+  #modules/security/gnupg.nix
+  #modules/services/networking/biboumi.nix
+  #modules/services/networking/croc.nix
+  #modules/services/networking/netns.nix
+  #modules/services/networking/openvpn.nix
+  #/home/julm/src/nix/nixpkgs/.git-worktree/transmission/nixos/modules/services/torrent/transmission.nix
+  #/home/julm/src/nix/nixpkgs/nixos/modules/services/torrent/transmission.nix
+  #modules/services/mail/mlmmj.nix
+  #modules/services/games/freeciv.nix
+  #modules/tasks/network-interfaces.nix
+];
+disabledModules = [
+  #"tasks/network-interfaces.nix"
+  "services/mail/mlmmj.nix"
+  #"security/gnupg.nix"
+  #"services/mail/public-inbox.nix"
+  #"services/security/tor.nix"
+  #"services/backup/syncoid.nix"
+  #"services/networking/biboumi.nix"
+  #"services/networking/croc.nix"
+  #"services/networking/netns.nix"
+  #"services/networking/openvpn.nix"
+  #"services/torrent/transmission.nix"
+  #"services/games/freeciv.nix"
+];
 }
-*/