commit 293da497c3dc6c6e595f81076ec6dd5a2fa06f52 · pyrox.dev/nixpkgs

-1

nixos/modules/module-list.nix

···

       539
       539
        
         ./services/x11/window-managers/fluxbox.nix

     

       540
       540
        
         ./services/x11/window-managers/icewm.nix

     

       541
       541
        
         ./services/x11/window-managers/bspwm.nix

     

       542
       542
       -
         ./services/x11/window-managers/bspwm-unstable.nix

     

       543
       542
        
         ./services/x11/window-managers/metacity.nix

     

       544
       543
        
         ./services/x11/window-managers/none.nix

     

       545
       544
        
         ./services/x11/window-managers/twm.nix

-48

nixos/modules/services/x11/window-managers/bspwm-unstable.nix

···

       1
       1
       -
       { config, lib, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       5
       -
       let

     

       6
       6
       -
         cfg = config.services.xserver.windowManager.bspwm-unstable;

     

       7
       7
       -
       in

     

       8
       8
       -
       

     

       9
       9
       -
       {

     

       10
       10
       -
         options = {

     

       11
       11
       -
           services.xserver.windowManager.bspwm-unstable = {

     

       12
       12
       -
               enable = mkEnableOption "bspwm-unstable";

     

       13
       13
       -
               startThroughSession = mkOption {

     

       14
       14
       -
                   type = with types; bool;

     

       15
       15
       -
                   default = false;

     

       16
       16
       -
                   description = "

     

       17
       17
       -
                       Start the window manager through the script defined in 

     

       18
       18
       -
                       sessionScript. Defaults to the the bspwm-session script

     

       19
       19
       -
                       provided by bspwm

     

       20
       20
       -
                   ";

     

       21
       21
       -
               };

     

       22
       22
       -
               sessionScript = mkOption {

     

       23
       23
       -
                   default = "${pkgs.bspwm-unstable}/bin/bspwm-session";

     

       24
       24
       -
                   defaultText = "(pkgs.bspwm-unstable)/bin/bspwm-session";

     

       25
       25
       -
                   description = "

     

       26
       26
       -
                       The start-session script to use. Defaults to the

     

       27
       27
       -
                       provided bspwm-session script from the bspwm package.

     

       28
       28
       -
       

     

       29
       29
       -
                       Does nothing unless `bspwm.startThroughSession` is enabled

     

       30
       30
       -
                   ";

     

       31
       31
       -
               };

     

       32
       32
       -
           };

     

       33
       33
       -
         };

     

       34
       34
       -
       

     

       35
       35
       -
         config = mkIf cfg.enable {

     

       36
       36
       -
           services.xserver.windowManager.session = singleton {

     

       37
       37
       -
             name = "bspwm-unstable";

     

       38
       38
       -
             start = if cfg.startThroughSession

     

       39
       39
       -
               then cfg.sessionScript

     

       40
       40
       -
               else ''

     

       41
       41
       -
                   export _JAVA_AWT_WM_NONREPARENTING=1

     

       42
       42
       -
                   SXHKD_SHELL=/bin/sh ${pkgs.sxhkd-unstable}/bin/sxhkd -f 100 &

     

       43
       43
       -
                   ${pkgs.bspwm-unstable}/bin/bspwm

     

       44
       44
       -
               '';

     

       45
       45
       -
           };

     

       46
       46
       -
           environment.systemPackages = [ pkgs.bspwm-unstable ];

     

       47
       47
       -
         };

     

       48
       48
       -
       }

+56 -27

nixos/modules/services/x11/window-managers/bspwm.nix

···

       9
       9
        
       {

     

       10
       10
        
         options = {

     

       11
       11
        
           services.xserver.windowManager.bspwm = {

     

       12
       12
       -
               enable = mkEnableOption "bspwm";

     

       13
       13
       -
               startThroughSession = mkOption {

     

       14
       14
       -
                   type = with types; bool;

     

       15
       15
       -
                   default = false;

     

       16
       16
       -
                   description = "

     

       17
       17
       -
                       Start the window manager through the script defined in 

     

       18
       18
       -
                       sessionScript. Defaults to the the bspwm-session script

     

       19
       19
       -
                       provided by bspwm

     

       20
       20
       -
                   ";

     

       12
       12
       +
             enable = mkEnableOption "bspwm";

     

       13
       13
       +
       

     

       14
       14
       +
             package = mkOption {

     

       15
       15
       +
               type        = types.package;

     

       16
       16
       +
               default     = pkgs.bspwm;

     

       17
       17
       +
               defaultText = "pkgs.bspwm";

     

       18
       18
       +
               example     = "pkgs.bspwm-unstable";

     

       19
       19
       +
               description = ''

     

       20
       20
       +
                 bspwm package to use.

     

       21
       21
       +
               '';

     

       22
       22
       +
             };

     

       23
       23
       +
             configFile = mkOption {

     

       24
       24
       +
               type        = with types; nullOr path;

     

       25
       25
       +
               example     = "${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc";

     

       26
       26
       +
               default     = null;

     

       27
       27
       +
               description = ''

     

       28
       28
       +
                 Path to the bspwm configuration file.

     

       29
       29
       +
                 If null, $HOME/.config/bspwm/bspwmrc will be used.

     

       30
       30
       +
               '';

     

       31
       31
       +
             };

     

       32
       32
       +
       

     

       33
       33
       +
             sxhkd = {

     

       34
       34
       +
               package = mkOption {

     

       35
       35
       +
                 type        = types.package;

     

       36
       36
       +
                 default     = pkgs.sxhkd;

     

       37
       37
       +
                 defaultText = "pkgs.sxhkd";

     

       38
       38
       +
                 example     = "pkgs.sxhkd-unstable";

     

       39
       39
       +
                 description = ''

     

       40
       40
       +
                   sxhkd package to use.

     

       41
       41
       +
                 '';

     

       21
       42
        
               };

     

       22
       22
       -
               sessionScript = mkOption {

     

       23
       23
       -
                   default = "${pkgs.bspwm}/bin/bspwm-session";

     

       24
       24
       -
                   defaultText = "(pkgs.bspwm)/bin/bspwm-session";

     

       25
       25
       -
                   description = "

     

       26
       26
       -
                       The start-session script to use. Defaults to the

     

       27
       27
       -
                       provided bspwm-session script from the bspwm package.

     

       28
       28
       -
       

     

       29
       29
       -
                       Does nothing unless `bspwm.startThroughSession` is enabled

     

       30
       30
       -
                   ";

     

       43
       43
       +
               configFile = mkOption {

     

       44
       44
       +
                 type        = with types; nullOr path;

     

       45
       45
       +
                 example     = "${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc";

     

       46
       46
       +
                 default     = null;

     

       47
       47
       +
                 description = ''

     

       48
       48
       +
                   Path to the sxhkd configuration file.

     

       49
       49
       +
                   If null, $HOME/.config/sxhkd/sxhkdrc will be used.

     

       50
       50
       +
                 '';

     

       31
       51
        
               };

     

       52
       52
       +
             };

     

       32
       53
        
           };

     

       33
       54
        
         };

     

       34
       55
        
       

     

       35
       56
        
         config = mkIf cfg.enable {

     

       36
       57
        
           services.xserver.windowManager.session = singleton {

     

       37
       37
       -
             name = "bspwm";

     

       38
       38
       -
             start = if cfg.startThroughSession

     

       39
       39
       -
               then cfg.sessionScript

     

       40
       40
       -
               else ''

     

       41
       41
       -
                   export _JAVA_AWT_WM_NONREPARENTING=1

     

       42
       42
       -
                   SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &

     

       43
       43
       -
                   ${pkgs.bspwm}/bin/bspwm

     

       44
       44
       -
               '';

     

       58
       58
       +
             name  = "bspwm";

     

       59
       59
       +
             start = ''

     

       60
       60
       +
               export _JAVA_AWT_WM_NONREPARENTING=1

     

       61
       61
       +
               SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""} &

     

       62
       62
       +
               ${cfg.package}/bin/bspwm ${optionalString (cfg.configFile != null) "-c \"${cfg.configFile}\""}

     

       63
       63
       +
               waitPID=$!

     

       64
       64
       +
             '';

     

       45
       65
        
           };

     

       46
       46
       -
           environment.systemPackages = [ pkgs.bspwm ];

     

       66
       66
       +
           environment.systemPackages = [ cfg.package ];

     

       47
       67
        
         };

     

       68
       68
       +
       

     

       69
       69
       +
         imports = [

     

       70
       70
       +
          (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm-unstable" "enable" ]

     

       71
       71
       +
            "Use services.xserver.windowManager.bspwm.enable and set services.xserver.windowManager.bspwm.package to pkgs.bspwm-unstable to use the unstable version of bspwm.")

     

       72
       72
       +
          (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "startThroughSession" ]

     

       73
       73
       +
            "bspwm package does not provide bspwm-session anymore.")

     

       74
       74
       +
          (mkRemovedOptionModule [ "services" "xserver" "windowManager" "bspwm" "sessionScript" ]

     

       75
       75
       +
            "bspwm package does not provide bspwm-session anymore.")

     

       76
       76
       +
         ];

     

       48
       77
        
       }

-1

nixos/modules/services/x11/window-managers/default.nix

···

       10
       10
        
         imports = [

     

       11
       11
        
           ./afterstep.nix

     

       12
       12
        
           ./bspwm.nix

     

       13
       13
       -
           ./bspwm-unstable.nix

     

       14
       13
        
           ./compiz.nix

     

       15
       14
        
           ./dwm.nix

     

       16
       15
        
           ./exwm.nix