a1ffabe4de
The default config of i3 provides a key binding to reload, so changes take effect immediately: ``` bindsym $mod+Shift+c reload ``` Unfortunately the current module uses the store path of the `configFile` option. So when I change the config in NixOS, a store path will be created, but the current i3 process will continue to use the old one, hence a restart of i3 is required currently. This change links the config to `/etc/i3/config` and alters the X startup script accordingly so after each rebuild, the config can be reloaded.
78 lines
1.9 KiB
Nix
78 lines
1.9 KiB
Nix
{ config, lib, pkgs, ... }:
|
|
|
|
with lib;
|
|
|
|
let
|
|
cfg = config.services.xserver.windowManager.i3;
|
|
in
|
|
|
|
{
|
|
options.services.xserver.windowManager.i3 = {
|
|
enable = mkEnableOption "i3 window manager";
|
|
|
|
configFile = mkOption {
|
|
default = null;
|
|
type = with types; nullOr path;
|
|
description = ''
|
|
Path to the i3 configuration file.
|
|
If left at the default value, $HOME/.i3/config will be used.
|
|
'';
|
|
};
|
|
|
|
extraSessionCommands = mkOption {
|
|
default = "";
|
|
type = types.lines;
|
|
description = ''
|
|
Shell commands executed just before i3 is started.
|
|
'';
|
|
};
|
|
|
|
package = mkOption {
|
|
type = types.package;
|
|
default = pkgs.i3;
|
|
defaultText = "pkgs.i3";
|
|
example = "pkgs.i3-gaps";
|
|
description = ''
|
|
i3 package to use.
|
|
'';
|
|
};
|
|
|
|
extraPackages = mkOption {
|
|
type = with types; listOf package;
|
|
default = with pkgs; [ dmenu i3status i3lock ];
|
|
example = literalExample ''
|
|
with pkgs; [
|
|
dmenu
|
|
i3status
|
|
i3lock
|
|
]
|
|
'';
|
|
description = ''
|
|
Extra packages to be installed system wide.
|
|
'';
|
|
};
|
|
};
|
|
|
|
config = mkIf cfg.enable {
|
|
services.xserver.windowManager.session = [{
|
|
name = "i3";
|
|
start = ''
|
|
${cfg.extraSessionCommands}
|
|
|
|
${cfg.package}/bin/i3 ${optionalString (cfg.configFile != null)
|
|
"-c /etc/i3/config"
|
|
} &
|
|
waitPID=$!
|
|
'';
|
|
}];
|
|
environment.systemPackages = [ cfg.package ] ++ cfg.extraPackages;
|
|
environment.etc."i3/config" = mkIf (cfg.configFile != null) {
|
|
source = cfg.configFile;
|
|
};
|
|
};
|
|
|
|
imports = [
|
|
(mkRemovedOptionModule [ "services" "xserver" "windowManager" "i3-gaps" "enable" ]
|
|
"Use services.xserver.windowManager.i3.enable and set services.xserver.windowManager.i3.package to pkgs.i3-gaps to use i3-gaps.")
|
|
];
|
|
}
|