commit 02c0a715209612a88882f94f9c6722e3f2fd68f5 · pyrox.dev/nixpkgs

+6 -11

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

···

       16
       16
        
           services.xserver.windowManager.bspwm = {

     

       17
       17
        
             enable = mkEnableOption "bspwm";

     

       18
       18
        
       

     

       19
       19
       -
             package = mkPackageOption pkgs "bspwm" {

     

       20
       20
       -
               example = "bspwm-unstable";

     

       21
       21
       -
             };

     

       19
       19
       +
             package = mkPackageOption pkgs "bspwm" { };

     

       22
       20
        
             configFile = mkOption {

     

       23
       21
        
               type = with types; nullOr path;

     

       24
       22
        
               example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/bspwmrc"'';

     
···

       30
       28
        
             };

     

       31
       29
        
       

     

       32
       30
        
             sxhkd = {

     

       33
       33
       -
               package = mkPackageOption pkgs "sxhkd" {

     

       34
       34
       -
                 example = "sxhkd-unstable";

     

       35
       35
       -
               };

     

       31
       31
       +
               package = mkPackageOption pkgs "sxhkd" { };

     

       36
       32
        
               configFile = mkOption {

     

       37
       33
        
                 type = with types; nullOr path;

     

       38
       34
        
                 example = literalExpression ''"''${pkgs.bspwm}/share/doc/bspwm/examples/sxhkdrc"'';

     
···

       52
       48
        
             start = ''

     

       53
       49
        
               export _JAVA_AWT_WM_NONREPARENTING=1

     

       54
       50
        
               SXHKD_SHELL=/bin/sh ${cfg.sxhkd.package}/bin/sxhkd ${

     

       55
       55
       -
                 optionalString (cfg.sxhkd.configFile != null) "-c \"${cfg.sxhkd.configFile}\""

     

       51
       51
       +
                 optionalString (cfg.sxhkd.configFile != null) "-c ${escapeShellArg cfg.sxhkd.configFile}"

     

       52
       52
       +
               } &

     

       53
       53
       +
               ${cfg.package}/bin/bspwm ${

     

       54
       54
       +
                 optionalString (cfg.configFile != null) "-c ${escapeShellArg cfg.configFile}"

     

       56
       55
        
               } &

     

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

     

       58
       56
        
               waitPID=$!

     

       59
       57
        
             '';

     

       60
       58
        
           };

     
···

       62
       60
        
         };

     

       63
       61
        
       

     

       64
       62
        
         imports = [

     

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

     

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

     

       67
       67
       -
           )

     

       68
       63
        
           (mkRemovedOptionModule [

     

       69
       64
        
             "services"

     

       70
       65
        
             "xserver"

+11 -3

pkgs/by-name/bs/bspwm/package.nix

···

       7
       7
        
         xcbutil,

     

       8
       8
        
         xcbutilkeysyms,

     

       9
       9
        
         xcbutilwm,

     

       10
       10
       +
         nixosTests,

     

       10
       11
        
       }:

     

       11
       12
        
       

     

       12
       13
        
       stdenv.mkDerivation rec {

     

       13
       14
        
         pname = "bspwm";

     

       14
       14
       -
         version = "0.9.10";

     

       15
       15
       +
         version = "0.9.11";

     

       15
       16
        
       

     

       16
       17
        
         src = fetchFromGitHub {

     

       17
       18
        
           owner = "baskerville";

     

       18
       19
        
           repo = "bspwm";

     

       19
       20
        
           rev = version;

     

       20
       20
       -
           sha256 = "0qlv7b4c2mmjfd65y100d11x8iqyg5f6lfiws3cgmpjidhdygnxc";

     

       21
       21
       +
           sha256 = "sha256-5mAw3uSsDozGUJdYE1gD1u0u6Xnik3/LbE654vCFU9E=";

     

       21
       22
        
         };

     

       22
       23
        
       

     

       23
       24
        
         buildInputs = [

     
···

       30
       31
        
       

     

       31
       32
        
         makeFlags = [ "PREFIX=$(out)" ];

     

       32
       33
        
       

     

       34
       34
       +
         passthru.tests = {

     

       35
       35
       +
           inherit (nixosTests) startx;

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       33
       38
        
         meta = with lib; {

     

       34
       39
        
           description = "Tiling window manager based on binary space partitioning";

     

       35
       40
        
           homepage = "https://github.com/baskerville/bspwm";

     

       36
       36
       -
           maintainers = with maintainers; [ meisternu ];

     

       41
       41
       +
           maintainers = with maintainers; [

     

       42
       42
       +
             meisternu

     

       43
       43
       +
             ncfavier

     

       44
       44
       +
           ];

     

       37
       45
        
           license = licenses.bsd2;

     

       38
       46
        
           platforms = platforms.linux;

     

       39
       47
        
         };