From ececaafee17dcdef24fae812e0a2721ed392e968 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Tue, 26 Dec 2017 22:57:00 +0300
Subject: [PATCH 1/2] rootston module: better defaults

---
 nixos/modules/programs/rootston.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
index a8fe2b22be5..c2ae01e5270 100644
--- a/nixos/modules/programs/rootston.nix
+++ b/nixos/modules/programs/rootston.nix
@@ -10,6 +10,7 @@ let
     if [[ "$#" -ge 1 ]]; then
       exec ${pkgs.rootston}/bin/rootston "$@"
     else
+      ${cfg.extraSessionCommands}
       exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
     fi
   '';
@@ -21,14 +22,28 @@ in {
       Wayland compositor you should e.g. use Sway instead). You can manually
       start the compositor by running "rootston" from a terminal'';
 
+    extraSessionCommands = mkOption {
+      type = types.lines;
+      default = "";
+      example = ''
+        # Define a keymap (US QWERTY is the default)
+        export XKB_DEFAULT_LAYOUT=de,us
+        export XKB_DEFAULT_VARIANT=nodeadkeys
+        export XKB_DEFAULT_OPTIONS=grp:alt_shift_toggle,caps:escape
+      '';
+      description = ''
+        Shell commands executed just before rootston is started.
+      '';
+    };
+
     extraPackages = mkOption {
       type = with types; listOf package;
       default = with pkgs; [
-        xwayland rxvt_unicode dmenu
+        westonLite xwayland rofi
       ];
       defaultText = literalExample ''
         with pkgs; [
-          xwayland dmenu rxvt_unicode
+          westonLite xwayland rofi
         ]
       '';
       example = literalExample "[ ]";
@@ -55,9 +70,8 @@ in {
         Logo+q = close
         Logo+m = maximize
         Alt+Tab = next_window
-        Logo+Return = exec urxvt
-        # Note: Dmenu will only work properly while e.g. urxvt is running.
-        Logo+d = exec dmenu_run
+        Logo+Return = exec weston-terminal
+        Logo+d = exec rofi -show run
       '';
       description = ''
         Default configuration for rootston (used when called without any
@@ -82,6 +96,7 @@ in {
 
     hardware.opengl.enable = mkDefault true;
     fonts.enableDefaultFonts = mkDefault true;
+    programs.dconf.enable = mkDefault true;
   };
 
   meta.maintainers = with lib.maintainers; [ primeos ];

From c955c131f7e26370f44583a2dc1ca01bbe5584b9 Mon Sep 17 00:00:00 2001
From: gnidorah <gnidorah@users.noreply.github.com>
Date: Wed, 27 Dec 2017 10:21:34 +0300
Subject: [PATCH 2/2] rootston module, orbment/bemenu: change my maintainership

---
 nixos/modules/programs/rootston.nix                  | 2 +-
 pkgs/applications/window-managers/orbment/bemenu.nix | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/programs/rootston.nix b/nixos/modules/programs/rootston.nix
index c2ae01e5270..1946b1db657 100644
--- a/nixos/modules/programs/rootston.nix
+++ b/nixos/modules/programs/rootston.nix
@@ -99,5 +99,5 @@ in {
     programs.dconf.enable = mkDefault true;
   };
 
-  meta.maintainers = with lib.maintainers; [ primeos ];
+  meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
 }
diff --git a/pkgs/applications/window-managers/orbment/bemenu.nix b/pkgs/applications/window-managers/orbment/bemenu.nix
index a708ad08afa..065b81948c2 100644
--- a/pkgs/applications/window-managers/orbment/bemenu.nix
+++ b/pkgs/applications/window-managers/orbment/bemenu.nix
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
     description = "A dynamic menu library and client program inspired by dmenu";
     homepage = src.meta.homepage;
     license = with licenses; [ gpl3 lgpl3 ];
-    maintainers = with maintainers; [ gnidorah ];
     platforms = platforms.linux;
   };
 }