about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2014-08-01 18:18:58 +0200
committeraszlig <aszlig@redmoonstudios.org>2014-08-01 18:18:58 +0200
commitb6994282fb333cba164d09a1afb44588ee1668ca (patch)
tree78dd7a2ede0a1af7749f9f9f1e2e63b2cc51723d /modules
parent55bd6d355508df4cf3725b7cb0cdb9248a0add7a (diff)
common: Include modules using module-list.
This also means that we now have to explicitly enable a certain feature,
such as vuizvui.i3 (which is the only module right now).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules')
-rw-r--r--modules/i3/default.nix4
-rw-r--r--modules/module-list.nix3
2 files changed, 6 insertions, 1 deletions
diff --git a/modules/i3/default.nix b/modules/i3/default.nix
index 1d88a6e7..05e468f0 100644
--- a/modules/i3/default.nix
+++ b/modules/i3/default.nix
@@ -35,6 +35,8 @@ let
 in
 {
   options.vuizvui.i3 = {
+    enable = mkEnableOption "i3";
+
     workspaces = mkOption {
       type = types.attrsOf (types.submodule ./workspace.nix);
       default = listToAttrs (imap mkDefaultWorkspace wsNumberSymbols);
@@ -62,7 +64,7 @@ in
 
   config.vuizvui.i3.workspaces = defaultWorkspaces;
 
-  config.services.xserver.windowManager = {
+  config.services.xserver.windowManager = mkIf config.vuizvui.i3.enable {
     default = "i3";
 
     i3.enable = true;
diff --git a/modules/module-list.nix b/modules/module-list.nix
new file mode 100644
index 00000000..84cd81e1
--- /dev/null
+++ b/modules/module-list.nix
@@ -0,0 +1,3 @@
+[
+  ./i3
+]