diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers')
-rw-r--r-- | infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix | 4 | ||||
-rw-r--r-- | infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix | 14 |
2 files changed, 15 insertions, 3 deletions
diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix b/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix index 6e19e3572c79..6f1db2110f87 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/evilwm.nix @@ -16,8 +16,8 @@ in services.xserver.windowManager.session = singleton { name = "evilwm"; start = '' - ${pkgs.evilwm}/bin/evilwm & - waitPID=$! + ${pkgs.evilwm}/bin/evilwm & + waitPID=$! ''; }; environment.systemPackages = [ pkgs.evilwm ]; diff --git a/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix b/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix index dc1d957c1709..88e13f4dbfb0 100644 --- a/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix +++ b/infra/libkookie/nixpkgs/nixos/modules/services/x11/window-managers/exwm.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.exwm; loadScript = pkgs.writeText "emacs-exwm-load" '' - (require 'exwm) + ${cfg.loadScript} ${optionalString cfg.enableDefaultConfig '' (require 'exwm-config) (exwm-config-default) @@ -19,6 +19,18 @@ in options = { services.xserver.windowManager.exwm = { enable = mkEnableOption "exwm"; + loadScript = mkOption { + default = "(require 'exwm)"; + example = literalExample '' + (require 'exwm) + (exwm-enable) + ''; + description = '' + Emacs lisp code to be run after loading the user's init + file. If enableDefaultConfig is true, this will be run + before loading the default config. + ''; + }; enableDefaultConfig = mkOption { default = true; type = lib.types.bool; |