commit 528f7bfd5dc757308de3e2f977c1e5333cb0d0d9 · pyrox.dev/nixpkgs

+19 -5
nixos/modules/programs/sway.nix
···

       26
       26
        
           };

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         swayPackage = pkgs.sway.override {

     

       29
       29
       +
         defaultSwayPackage = pkgs.sway.override {

     

       30
       30
        
           extraSessionCommands = cfg.extraSessionCommands;

     

       31
       31
        
           extraOptions = cfg.extraOptions;

     

       32
       32
        
           withBaseWrapper = cfg.wrapperFeatures.base;

     
···

       41
       41
        
             ~/.config/sway/config to modify the default configuration. See

     

       42
       42
        
             <https://github.com/swaywm/sway/wiki> and

     

       43
       43
        
             "man 5 sway" for more information'');

     

       44
       44
       +
       

     

       45
       45
       +
           package = mkOption {

     

       46
       46
       +
             type = with types; nullOr package;

     

       47
       47
       +
             default = defaultSwayPackage;

     

       48
       48
       +
             defaultText = literalExpression "pkgs.sway";

     

       49
       49
       +
             description = lib.mdDoc ''

     

       50
       50
       +
               Sway package to use. Will override the options

     

       51
       51
       +
               'wrapperFeatures', 'extraSessionCommands', and 'extraOptions'.

     

       52
       52
       +
               Set to <code>null</code> to not add any Sway package to your

     

       53
       53
       +
               path. This should be done if you want to use the Home Manager Sway

     

       54
       54
       +
               module to install Sway.

     

       55
       55
       +
             '';

     

       56
       56
       +
           };

     

       44
       57
        
       

     

       45
       58
        
           wrapperFeatures = mkOption {

     

       46
       59
        
             type = wrapperOptions;

     
···

       121
       134
        
             }

     

       122
       135
        
           ];

     

       123
       136
        
           environment = {

     

       124
       124
       -
             systemPackages = [ swayPackage ] ++ cfg.extraPackages;

     

       137
       137
       +
             systemPackages = optional (cfg.package != null) cfg.package ++ cfg.extraPackages;

     

       125
       138
        
             # Needed for the default wallpaper:

     

       126
       126
       -
             pathsToLink = [ "/share/backgrounds/sway" ];

     

       139
       139
       +
             pathsToLink = optionals (cfg.package != null) [ "/share/backgrounds/sway" ];

     

       127
       140
        
             etc = {

     

       128
       128
       -
               "sway/config".source = mkOptionDefault "${swayPackage}/etc/sway/config";

     

       129
       141
        
               "sway/config.d/nixos.conf".source = pkgs.writeText "nixos.conf" ''

     

       130
       142
        
                 # Import the most important environment variables into the D-Bus and systemd

     

       131
       143
        
                 # user environments (e.g. required for screen sharing and Pinentry prompts):

     

       132
       144
        
                 exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP

     

       133
       145
        
               '';

     

       146
       146
       +
             } // optionalAttrs (cfg.package != null) {

     

       147
       147
       +
               "sway/config".source = mkOptionDefault "${cfg.package}/etc/sway/config";

     

       134
       148
        
             };

     

       135
       149
        
           };

     

       136
       150
        
           security.polkit.enable = true;

     
···

       139
       153
        
           fonts.enableDefaultFonts = mkDefault true;

     

       140
       154
        
           programs.dconf.enable = mkDefault true;

     

       141
       155
        
           # To make a Sway session available if a display manager like SDDM is enabled:

     

       142
       142
       -
           services.xserver.displayManager.sessionPackages = [ swayPackage ];

     

       156
       156
       +
           services.xserver.displayManager.sessionPackages = optionals (cfg.package != null) [ cfg.package ];

     

       143
       157
        
           programs.xwayland.enable = mkDefault true;

     

       144
       158
        
           # For screen sharing (this option only has an effect with xdg.portal.enable):

     

       145
       159
        
           xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-wlr ];