commit 174b5bd8f595e4517c072dc17396fb5fbef36e38 · kitten.sh/system

+1 -1

modules/desktop/affinity.nix

···

       60
       60
        
               };

     

       61
       61
        
               nix.sliceConfig = mkIf cfg.affinity.isolateNixDaemon {

     

       62
       62
        
                 CPUQuota = "80%";

     

       63
       63
       +
                 IOWeight = 90;

     

       63
       64
        
                 ManagedOOMMemoryPressure = "kill";

     

       64
       65
        
                 ManagedOOMMemoryPressureLimit = "80%";

     

       65
       65
       -
                 Nice = 9;

     

       66
       66
        
               };

     

       67
       67
        
             };

     

       68
       68
        
             services = {

+2 -26

modules/desktop/default.nix

···

       18
       18
        
         };

     

       19
       19
        
       } // helpers.linuxAttrs {

     

       20
       20
        
         imports = [

     

       21
       21
       -
           ./services.nix

     

       22
       21
        
           ./session.nix

     

       23
       22
        
           ./affinity.nix

     

       24
       23
        
           ./fonts.nix

     

       25
       24
        
           ./rawaccel.nix

     

       25
       25
       +
           ./audio.nix

     

       26
       26
       +
           ./networking.nix

     

       26
       27
        
         ];

     

       27
       28
        
       

     

       28
       29
        
         config = mkIf cfg.enable {

     

       29
       30
        
           users.users."${user}".extraGroups = [ "video" ];

     

       30
       30
       -
       

     

       31
       31
       -
           networking = {

     

       32
       32
       -
             firewall = {

     

       33
       33
       -
               enable = mkDefault true;

     

       34
       34
       -
               checkReversePath = "loose";

     

       35
       35
       -
             };

     

       36
       36
       -
             nftables = {

     

       37
       37
       -
               enable = mkForce true;

     

       38
       38
       -
               checkRuleset = false;

     

       39
       39
       -
               flushRuleset = true;

     

       40
       40
       -
             };

     

       41
       41
       -
             networkmanager = {

     

       42
       42
       -
               enable = mkDefault true;

     

       43
       43
       -
               wifi = {

     

       44
       44
       -
                 backend = "iwd";

     

       45
       45
       -
                 powersave = true;

     

       46
       46
       -
               };

     

       47
       47
       -
             };

     

       48
       48
       -
           };

     

       49
       49
       -
       

     

       50
       50
       -
           hardware = {

     

       51
       51
       -
             steam-hardware.enable = true;

     

       52
       52
       -
           };

     

       53
       53
       -
       

     

       54
       54
       -
           security.rtkit.enable = true;

     

       55
       31
        
         };

     

       56
       32
        
       }

+67

modules/desktop/networking.nix

···

       1
       1
       +
       { lib, pkgs, config, user, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         inherit (generators) toLua;

     

       6
       6
       +
         cfg = config.modules.desktop;

     

       7
       7
       +
       in {

     

       8
       8
       +
         options.modules.desktop.networking = {

     

       9
       9
       +
           enable = mkOption {

     

       10
       10
       +
             default = cfg.enable;

     

       11
       11
       +
             example = true;

     

       12
       12
       +
             description = "Whether to enable networking.";

     

       13
       13
       +
             type = types.bool;

     

       14
       14
       +
           };

     

       15
       15
       +
       

     

       16
       16
       +
           printing = mkOption {

     

       17
       17
       +
             default = cfg.networking.enable;

     

       18
       18
       +
             example = true;

     

       19
       19
       +
             description = "Whether to enable printing.";

     

       20
       20
       +
             type = types.bool;

     

       21
       21
       +
           };

     

       22
       22
       +
         };

     

       23
       23
       +
       

     

       24
       24
       +
         config = mkIf cfg.networking.enable {

     

       25
       25
       +
           networking = {

     

       26
       26
       +
             firewall = {

     

       27
       27
       +
               enable = mkDefault true;

     

       28
       28
       +
               checkReversePath = "loose";

     

       29
       29
       +
               allowedUDPPorts = [ 5353 ];

     

       30
       30
       +
             };

     

       31
       31
       +
             nftables = {

     

       32
       32
       +
               enable = mkForce true;

     

       33
       33
       +
               checkRuleset = false;

     

       34
       34
       +
               flushRuleset = true;

     

       35
       35
       +
             };

     

       36
       36
       +
             networkmanager = {

     

       37
       37
       +
               enable = mkDefault true;

     

       38
       38
       +
               dns = mkDefault (if config.servies.resolved.enable then "systemd-resolved" else "default");

     

       39
       39
       +
               connectionConfig = {

     

       40
       40
       +
                 "connection.mdns" = mkDefault 2;

     

       41
       41
       +
                 "connection.llmnr" = 0;

     

       42
       42
       +
               };

     

       43
       43
       +
               wifi = {

     

       44
       44
       +
                 backend = "iwd";

     

       45
       45
       +
                 powersave = true;

     

       46
       46
       +
               };

     

       47
       47
       +
             };

     

       48
       48
       +
           };

     

       49
       49
       +
       

     

       50
       50
       +
           services = {

     

       51
       51
       +
             resolved = {

     

       52
       52
       +
               enable = true;

     

       53
       53
       +
               llmnr = "false";

     

       54
       54
       +
               extraConfig = ''

     

       55
       55
       +
                 [Resolve]

     

       56
       56
       +
                 MulticastDNS=yes

     

       57
       57
       +
               '';

     

       58
       58
       +
             };

     

       59
       59
       +
       

     

       60
       60
       +
             printing = mkIf cfg.networking.printing {

     

       61
       61
       +
               enable = true;

     

       62
       62
       +
               stateless = true;

     

       63
       63
       +
               webInterface = false;

     

       64
       64
       +
             };

     

       65
       65
       +
           };

     

       66
       66
       +
         };

     

       67
       67
       +
       }

+27 -41

modules/desktop/services.nix modules/desktop/audio.nix

···

       5
       5
        
         inherit (generators) toLua;

     

       6
       6
        
         cfg = config.modules.desktop;

     

       7
       7
        
       in {

     

       8
       8
       -
         options.modules.desktop.services = {

     

       8
       8
       +
         options.modules.desktop.audio = {

     

       9
       9
        
           enable = mkOption {

     

       10
       10
       -
             default = cfg.enable;

     

       10
       10
       +
             default = true;

     

       11
       11
        
             example = true;

     

       12
       12
       -
             description = "Whether to enable services.";

     

       12
       12
       +
             description = "Whether to enable Pipewire audio.";

     

       13
       13
        
             type = types.bool;

     

       14
       14
        
           };

     

       15
       15
        
       

     

       16
       16
       -
           pipewire = {

     

       17
       17
       -
             enable = mkOption {

     

       18
       18
       -
               default = cfg.services.enable;

     

       19
       19
       -
               example = true;

     

       20
       20
       -
               description = "Whether to enable Pipewire low latency.";

     

       21
       21
       -
               type = types.bool;

     

       22
       22
       -
             };

     

       23
       23
       -
       

     

       24
       24
       -
             lowLatency = mkOption {

     

       25
       25
       -
               default = true;

     

       26
       26
       -
               example = true;

     

       27
       27
       -
               description = "Whether to enable Pipewire low latency.";

     

       28
       28
       -
               type = types.bool;

     

       29
       29
       -
             };

     

       16
       16
       +
           lowLatency = mkOption {

     

       17
       17
       +
             default = true;

     

       18
       18
       +
             example = true;

     

       19
       19
       +
             description = "Whether to enable Pipewire low latency.";

     

       20
       20
       +
             type = types.bool;

     

       21
       21
       +
           };

     

       30
       22
        
       

     

       31
       31
       -
             quantum = mkOption {

     

       32
       32
       -
               description = "Minimum quantum to set";

     

       33
       33
       -
               type = types.int;

     

       34
       34
       -
               default = 64;

     

       35
       35
       -
               example = 32;

     

       36
       36
       -
             };

     

       23
       23
       +
           quantum = mkOption {

     

       24
       24
       +
             description = "Minimum quantum to set";

     

       25
       25
       +
             type = types.int;

     

       26
       26
       +
             default = 64;

     

       27
       27
       +
             example = 32;

     

       28
       28
       +
           };

     

       37
       29
        
       

     

       38
       38
       -
             rate = mkOption {

     

       39
       39
       -
               description = "Rate to set";

     

       40
       40
       -
               type = types.int;

     

       41
       41
       -
               default = 48000;

     

       42
       42
       -
               example = 96000;

     

       43
       43
       -
             };

     

       30
       30
       +
           rate = mkOption {

     

       31
       31
       +
             description = "Rate to set";

     

       32
       32
       +
             type = types.int;

     

       33
       33
       +
             default = 48000;

     

       34
       34
       +
             example = 96000;

     

       44
       35
        
           };

     

       45
       36
        
         };

     

       46
       37
        
       

     

       47
       47
       -
         config = mkIf cfg.services.enable {

     

       48
       48
       -
           users.users."${user}".extraGroups = [ "video" ];

     

       38
       38
       +
         config = mkIf cfg.audio.enable {

     

       39
       39
       +
           security.rtkit.enable = true;

     

       49
       40
        
       

     

       50
       41
        
           services = {

     

       51
       51
       -
             hardware.bolt.enable = true;

     

       52
       52
       -
             printing.enable = true;

     

       53
       53
       -
             colord.enable = true;

     

       54
       54
       -
             fwupd.enable = true;

     

       55
       55
       -
       

     

       56
       42
        
             pipewire = let

     

       57
       57
       -
               quantum = cfg.services.pipewire.quantum;

     

       58
       58
       -
               rate = cfg.services.pipewire.rate;

     

       43
       43
       +
               quantum = cfg.audio.quantum;

     

       44
       44
       +
               rate = cfg.audio.rate;

     

       59
       45
        
               qr = "${toString quantum}/${toString rate}";

     

       60
       46
        
             in {

     

       61
       61
       -
               enable = cfg.services.pipewire.enable;

     

       47
       47
       +
               enable = cfg.audio.enable;

     

       62
       48
        
               pulse.enable = true;

     

       63
       49
        
               jack.enable = true;

     

       64
       50
        
               alsa = {

     

       65
       51
        
                 enable = true;

     

       66
       66
       -
                 support32Bit = true;

     

       52
       52
       +
                 support32Bit = mkDefault true;

     

       67
       53
        
               };

     

       68
       54
        
       

     

       69
       55
        
               # write extra config

     

       70
       70
       -
               extraConfig.pipewire = mkIf cfg.services.pipewire.lowLatency {

     

       56
       56
       +
               extraConfig.pipewire = mkIf cfg.audio.lowLatency {

     

       71
       57
        
                 "99-lowlatency" = {

     

       72
       58
        
                   context = {

     

       73
       59
        
                     properties.default.clock.min-quantum = quantum;