public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #33085 from gnidorah/rootston 

rootston module: better defaults
rootston module, orbment/bemenu: change my maintainership
This commit is contained in:
Michael Weiss 2017-12-27 12:01:44 +01:00 committed by GitHub
parent e8db78639c c955c131f7
commit b15eea6f31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
nixos/modules/programs/rootston.nix
View File

@ -10,6 +10,7 @@ let
if [[ "$#" -ge 1 ]]; then if [[ "$#" -ge 1 ]]; then
exec ${pkgs.rootston}/bin/rootston "$@" exec ${pkgs.rootston}/bin/rootston "$@"
else else
${cfg.extraSessionCommands}
exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile} exec ${pkgs.rootston}/bin/rootston -C ${cfg.configFile}
fi fi
''; '';
@ -21,14 +22,28 @@ in {
Wayland compositor you should e.g. use Sway instead). You can manually Wayland compositor you should e.g. use Sway instead). You can manually
start the compositor by running "rootston" from a terminal''; 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 { extraPackages = mkOption {
type = with types; listOf package; type = with types; listOf package;
default = with pkgs; [ default = with pkgs; [
xwayland rxvt_unicode dmenu westonLite xwayland rofi
]; ];
defaultText = literalExample '' defaultText = literalExample ''
with pkgs; [ with pkgs; [
xwayland dmenu rxvt_unicode westonLite xwayland rofi
] ]
''; '';
example = literalExample "[ ]"; example = literalExample "[ ]";
@ -55,9 +70,8 @@ in {
Logo+q = close Logo+q = close
Logo+m = maximize Logo+m = maximize
Alt+Tab = next_window Alt+Tab = next_window
Logo+Return = exec urxvt Logo+Return = exec weston-terminal
# Note: Dmenu will only work properly while e.g. urxvt is running. Logo+d = exec rofi -show run
Logo+d = exec dmenu_run
''; '';
description = '' description = ''
Default configuration for rootston (used when called without any Default configuration for rootston (used when called without any
@ -82,7 +96,8 @@ in {
hardware.opengl.enable = mkDefault true; hardware.opengl.enable = mkDefault true;
fonts.enableDefaultFonts = mkDefault true; fonts.enableDefaultFonts = mkDefault true;
programs.dconf.enable = mkDefault true;
}; };
meta.maintainers = with lib.maintainers; [ primeos ]; meta.maintainers = with lib.maintainers; [ primeos gnidorah ];
} }

1
pkgs/applications/window-managers/orbment/bemenu.nix
View File

@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
description = "A dynamic menu library and client program inspired by dmenu"; description = "A dynamic menu library and client program inspired by dmenu";
homepage = src.meta.homepage; homepage = src.meta.homepage;
license = with licenses; [ gpl3 lgpl3 ]; license = with licenses; [ gpl3 lgpl3 ];
maintainers = with maintainers; [ gnidorah ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }