summary refs log tree commit diff
path: root/nixos/modules
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-07-15 02:02:46 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-07-15 02:02:46 -0700
commit25e60feb725f1ce58590a097ffe088bbf14717e2 (patch)
tree1cccfe708e755ca59aaa18135d8c1bc516688298 /nixos/modules
parent333f145d7604f07e3b2164b459b46e075fea81f4 (diff)
parent369febb9569bdd3ddb76d8de2db6e27441d13e9f (diff)
downloadnixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar
nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.gz
nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.bz2
nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.lz
nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.xz
nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.tar.zst
nixlib-25e60feb725f1ce58590a097ffe088bbf14717e2.zip
Merge branch 'master.upstream' into staging.upstream
Diffstat (limited to 'nixos/modules')
-rw-r--r--nixos/modules/services/x11/window-managers/default.nix1
-rw-r--r--nixos/modules/services/x11/window-managers/notion.nix32
2 files changed, 33 insertions, 0 deletions
diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 097e4fe70d58..a8b1044ad365 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -16,6 +16,7 @@ in
     ./i3.nix
     ./metacity.nix
     ./openbox.nix
+    ./notion.nix
     ./ratpoison.nix
     ./sawfish.nix
     ./stumpwm.nix
diff --git a/nixos/modules/services/x11/window-managers/notion.nix b/nixos/modules/services/x11/window-managers/notion.nix
new file mode 100644
index 000000000000..1bfc2a86e965
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/notion.nix
@@ -0,0 +1,32 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.notion;
+in
+
+{
+  options = {
+    services.xserver.windowManager.notion = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable the notion tiling window manager.";
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager = {
+      session = [{
+        name = "notion";
+        start = ''
+          ${pkgs.notion}/bin/notion &
+          waitPID=$!
+        '';
+      }];
+    };
+    environment.systemPackages = [ pkgs.notion ];
+  };
+}