commit c41fb88403ad795d916ea002f3921e1c636a368e · kitten.sh/system

+11 -27

flake.lock

···

       57
       57
        
               "flake-compat": "flake-compat",

     

       58
       58
        
               "nixpkgs": [

     

       59
       59
        
                 "nixpkgs"

     

       60
       60
       -
               ],

     

       61
       61
       -
               "rust-overlay": "rust-overlay"

     

       60
       60
       +
               ]

     

       62
       61
        
             },

     

       63
       62
        
             "locked": {

     

       64
       64
       -
               "lastModified": 1738646237,

     

       65
       65
       -
               "narHash": "sha256-++0dXoZO9l5oceiGQsJmtUI5WXlPMw6QKjpg7vGPl3w=",

     

       66
       66
       -
               "owner": "tpwrules",

     

       63
       63
       +
               "lastModified": 1740250957,

     

       64
       64
       +
               "narHash": "sha256-FTmaWVUuJY4ibBcAyTKGEv8EGqiUquSUg9kV+DAYZIo=",

     

       65
       65
       +
               "owner": "kitten",

     

       67
       66
        
               "repo": "nixos-apple-silicon",

     

       68
       68
       -
               "rev": "3d1c6c27b14c4b8fcbdaec779e715f30cb72ed15",

     

       67
       67
       +
               "rev": "b27e311a81eba2cf149d36fabe550bab7994d355",

     

       69
       68
        
               "type": "github"

     

       70
       69
        
             },

     

       71
       70
        
             "original": {

     

       72
       72
       -
               "owner": "tpwrules",

     

       71
       71
       +
               "owner": "kitten",

     

       72
       72
       +
               "ref": "next",

     

       73
       73
        
               "repo": "nixos-apple-silicon",

     

       74
       74
        
               "type": "github"

     

       75
       75
        
             }

     
···

       374
       374
        
                 "nixpkgs"

     

       375
       375
        
               ],

     

       376
       376
        
               "pre-commit-hooks-nix": "pre-commit-hooks-nix",

     

       377
       377
       -
               "rust-overlay": "rust-overlay_2"

     

       377
       377
       +
               "rust-overlay": "rust-overlay"

     

       378
       378
        
             },

     

       379
       379
        
             "locked": {

     

       380
       380
        
               "lastModified": 1737639419,

     
···

       492
       492
        
           },

     

       493
       493
        
           "nixpkgs": {

     

       494
       494
        
             "locked": {

     

       495
       495
       -
               "lastModified": 1739482815,

     

       496
       496
       -
               "narHash": "sha256-/5Lwtmp/8j+ro32gXzitucSdyjJ6QehfJCL58WNA7N0=",

     

       495
       495
       +
               "lastModified": 1740019556,

     

       496
       496
       +
               "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=",

     

       497
       497
        
               "owner": "nixos",

     

       498
       498
        
               "repo": "nixpkgs",

     

       499
       499
       -
               "rev": "ba0939c506a03c60a765cd7f7c43794816540eec",

     

       499
       499
       +
               "rev": "dad564433178067be1fbdfcce23b546254b6d641",

     

       500
       500
        
               "type": "github"

     

       501
       501
        
             },

     

       502
       502
        
             "original": {

     
···

       826
       826
        
             }

     

       827
       827
        
           },

     

       828
       828
        
           "rust-overlay": {

     

       829
       829
       -
             "flake": false,

     

       830
       830
       -
             "locked": {

     

       831
       831
       -
               "lastModified": 1686795910,

     

       832
       832
       -
               "narHash": "sha256-jDa40qRZ0GRQtP9EMZdf+uCbvzuLnJglTUI2JoHfWDc=",

     

       833
       833
       -
               "owner": "oxalica",

     

       834
       834
       -
               "repo": "rust-overlay",

     

       835
       835
       -
               "rev": "5c2b97c0a9bc5217fc3dfb1555aae0fb756d99f9",

     

       836
       836
       -
               "type": "github"

     

       837
       837
       -
             },

     

       838
       838
       -
             "original": {

     

       839
       839
       -
               "owner": "oxalica",

     

       840
       840
       -
               "repo": "rust-overlay",

     

       841
       841
       -
               "type": "github"

     

       842
       842
       -
             }

     

       843
       843
       -
           },

     

       844
       844
       -
           "rust-overlay_2": {

     

       845
       829
        
             "inputs": {

     

       846
       830
        
               "nixpkgs": [

     

       847
       831
        
                 "lanzaboote",

+7 -1

flake.nix

···

       13
       13
        
           };

     

       14
       14
        
       

     

       15
       15
        
           apple-silicon = {

     

       16
       16
       -
             url = "github:tpwrules/nixos-apple-silicon";

     

       16
       16
       +
             url = "github:kitten/nixos-apple-silicon/next";

     

       17
       17
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       18
       18
        
           };

     

       19
       19
        
       

     
···

       112
       112
        
             inherit overlays;

     

       113
       113
        
             system = "aarch64-linux";

     

       114
       114
        
             hostname = "ramune";

     

       115
       115
       +
           };

     

       116
       116
       +
       

     

       117
       117
       +
           nixosConfigurations."sodacream" = mkSystem {

     

       118
       118
       +
             inherit overlays;

     

       119
       119
       +
             system = "aarch64-linux";

     

       120
       120
       +
             hostname = "sodacream";

     

       115
       121
        
           };

     

       116
       122
        
       

     

       117
       123
        
           packages = eachSystem (system: {

+3 -2

home/apps/firefox.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
        
       with lib;

     

       4
       4
        
       let

     
···

       19
       19
        
         config = mkIf (cfg.enable && cfg.firefox.enable) {

     

       20
       20
        
           programs.firefox = {

     

       21
       21
        
             enable = true;

     

       22
       22
       +
             package = with pkgs; (wrapFirefox (firefox-unwrapped.override { pipewireSupport = true; }) {});

     

       22
       23
        
             profiles.default = {

     

       23
       24
        
               settings = {

     

       24
       25
        
                 "browser.aboutConfig.showWarning" = false;

     
···

       36
       37
        
                 "extensions.activeThemeID" = "firefox-compact-dark@mozilla.org";

     

       37
       38
        
                 "font.default.x-western" = "sans-serif";

     

       38
       39
        
                 "font.name.sans-serif.x-western" = "Inter";

     

       39
       39
       -
                 "dom.ipc.processCount" = 4;

     

       40
       40
        
                 "toolkit.legacyUserProfileCustomizations.stylesheets" = true;

     

       41
       41
       +
                 "gfx.webrender.all" = true;

     

       41
       42
        
               };

     

       42
       43
        
             };

     

       43
       44
        
           };

+2 -1

home/apps/ghostty.nix

···

       72
       72
        
               window-theme = ghostty

     

       73
       73
        
               window-colorspace = display-p3

     

       74
       74
        
               window-save-state = always

     

       75
       75
       -
               window-decoration = server

     

       75
       75
       +
               window-decoration = client

     

       76
       76
       +
               window-inherit-working-directory = true

     

       76
       77
        
               unfocused-split-opacity = 0.9

     

       77
       78
        
       

     

       78
       79
        
               adjust-underline-thickness = -1

+53 -8

home/base/git.nix

···

       5
       5
        
         cfg = config.modules.git;

     

       6
       6
        
         home = config.home.homeDirectory;

     

       7
       7
        
       

     

       8
       8
       +
         excludesFile = pkgs.writeTextFile {

     

       9
       9
       +
           name = ".gitignore";

     

       10
       10
       +
           text = ''

     

       11
       11
       +
             # macOS: General

     

       12
       12
       +
             .DS_Store

     

       13
       13
       +
             .AppleDouble

     

       14
       14
       +
             .LSOverride

     

       15
       15
       +
             ._*

     

       16
       16
       +
       

     

       17
       17
       +
             # macOS: Files that might appear in the root of a volume

     

       18
       18
       +
             .DocumentRevisions-V100

     

       19
       19
       +
             .fseventsd

     

       20
       20
       +
             .Spotlight-V100

     

       21
       21
       +
             .TemporaryItems

     

       22
       22
       +
             .Trashes

     

       23
       23
       +
             .VolumeIcon.icns

     

       24
       24
       +
             .com.apple.timemachine.donotpresent

     

       25
       25
       +
       

     

       26
       26
       +
             # Xcode

     

       27
       27
       +
             xcuserdata/

     

       28
       28
       +
       

     

       29
       29
       +
             # Linux: hidden files

     

       30
       30
       +
             *~

     

       31
       31
       +
             .fuse_hidden*

     

       32
       32
       +
             .directory

     

       33
       33
       +
             .Trash-*

     

       34
       34
       +
             .nfs*

     

       35
       35
       +
           '';

     

       36
       36
       +
         };

     

       37
       37
       +
       

     

       8
       38
        
         userType = types.submodule {

     

       9
       39
        
           options = {

     

       10
       40
        
             name = mkOption {

     
···

       80
       110
        
               tag.gpgSign = true;

     

       81
       111
        
               push.gpgSign = "if-asked";

     

       82
       112
        
       

     

       113
       113
       +
               column.ui = "auto";

     

       83
       114
        
               color.ui = "auto";

     

       84
       115
        
               init.defaultBranch = "main";

     

       116
       116
       +
               help.autocorrect = "prompt";

     

       85
       117
        
       

     

       86
       118
        
               branch.sort = "-committerdate";

     

       87
       87
       -
               tag.sort = "-taggerdate";

     

       119
       119
       +
               tag.sort = "-version:refname";

     

       120
       120
       +
               commit.verbose = true;

     

       88
       121
        
       

     

       89
       122
        
               status = {

     

       90
       123
        
                 showUntrackedFiles = "all";

     
···

       95
       128
        
                 tool = "vimdiff";

     

       96
       129
        
                 submodule = "log";

     

       97
       130
        
                 algorithm = "histogram";

     

       131
       131
       +
                 colorMoved = "plain";

     

       98
       132
        
                 colorMovedWS = "allow-indentation-change";

     

       133
       133
       +
                 mnemonicPrefix = true;

     

       99
       134
        
                 compactionHeuristic = true;

     

       100
       100
       -
                 context = 10;

     

       135
       135
       +
                 rename = true;

     

       101
       136
        
               };

     

       102
       137
        
       

     

       103
       138
        
               push = {

     

       104
       139
        
                 default = "simple";

     

       105
       140
        
                 autoSetupRemote = true;

     

       106
       106
       -
                 followtags = true;

     

       141
       141
       +
                 followTags = true;

     

       142
       142
       +
                 atomic = true;

     

       107
       143
        
               };

     

       108
       144
        
       

     

       109
       145
        
               rebase = {

     

       110
       110
       -
                 autosquash = true;

     

       111
       111
       -
                 autostash = true;

     

       146
       146
       +
                 autoSquash = true;

     

       147
       147
       +
                 autoStash = true;

     

       112
       148
        
                 updateRefs = true;

     

       113
       149
        
                 missingCommitsCheck = "error";

     

       114
       150
        
               };

     
···

       121
       157
        
       

     

       122
       158
        
               fetch = {

     

       123
       159
        
                 prune = true;

     

       124
       124
       -
                 prunetags = true;

     

       160
       160
       +
                 pruneTags = true;

     

       161
       161
       +
                 all = true;

     

       125
       162
        
               };

     

       126
       163
        
       

     

       127
       164
        
               gitget = {

     
···

       130
       167
        
                 skip-host = true;

     

       131
       168
        
               };

     

       132
       169
        
       

     

       133
       133
       -
               core.autocrlf = false;

     

       170
       170
       +
               rerere = {

     

       171
       171
       +
                 enabled = true;

     

       172
       172
       +
                 autoupdate = true;

     

       173
       173
       +
               };

     

       174
       174
       +
       

     

       175
       175
       +
               core = {

     

       176
       176
       +
                 autocrlf = false;

     

       177
       177
       +
                 excludesfile = toString excludesFile;

     

       178
       178
       +
               };

     

       179
       179
       +
       

     

       134
       180
        
               pull.rebase = true;

     

       135
       135
       -
               rerere.enabled = true;

     

       136
       181
        
               difftool.prompt = false;

     

       137
       182
        
               mergetool.prompt = true;

     

       138
       183
        
               transfer.fsckobjects = true;

-1

home/default.nix

···

       4
       4
        
         imports = [

     

       5
       5
        
           ./base

     

       6
       6
        
           ./development

     

       7
       7
       -
           ./desktop

     

       8
       7
        
           ./apps

     

       9
       8
        
         ];

     

       10
       9
        
       }

-20

home/desktop/default.nix

···

       1
       1
       -
       { lib, helpers, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       with lib; {

     

       4
       4
       -
         options.modules.desktop = {

     

       5
       5
       -
           enable = mkOption {

     

       6
       6
       -
             default = false;

     

       7
       7
       -
             example = true;

     

       8
       8
       -
             description = "Whether to enable Desktop options.";

     

       9
       9
       -
             type = types.bool;

     

       10
       10
       -
           };

     

       11
       11
       -
         };

     

       12
       12
       -
       

     

       13
       13
       -
         config.modules.desktop = {

     

       14
       14
       -
           enable = if helpers.isLinux then (mkDefault false) else (mkForce false);

     

       15
       15
       -
         };

     

       16
       16
       -
       } // helpers.linuxAttrs {

     

       17
       17
       -
         imports = [

     

       18
       18
       -
           ./theme.nix

     

       19
       19
       -
         ];

     

       20
       20
       -
       }

-39

home/desktop/theme.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       let

     

       5
       5
       -
         cfg = config.modules.desktop;

     

       6
       6
       -
       in {

     

       7
       7
       -
         options.modules.desktop.theme = {

     

       8
       8
       -
           enable = mkOption {

     

       9
       9
       -
             default = cfg.enable;

     

       10
       10
       -
             example = true;

     

       11
       11
       -
             description = "Whether to enable default theme.";

     

       12
       12
       -
             type = types.bool;

     

       13
       13
       -
           };

     

       14
       14
       -
         };

     

       15
       15
       -
       

     

       16
       16
       -
         config = mkIf cfg.theme.enable {

     

       17
       17
       -
           fonts.fontconfig.enable = true;

     

       18
       18
       -
       

     

       19
       19
       -
           services.xsettingsd = {

     

       20
       20
       -
             enable = true;

     

       21
       21
       -
             settings = {

     

       22
       22
       -
               "Gtk/CursorThemeName" = "Bibata-Modern-Classic";

     

       23
       23
       -
               "Xft/Antialias" = true;

     

       24
       24
       -
               "Xft/Hinting" = true;

     

       25
       25
       -
               "Xft/HintStyle" = "hintslight";

     

       26
       26
       -
               "Xft/RGBA" = "rgb";

     

       27
       27
       -
               "Xft/dpi" = 163;

     

       28
       28
       -
             };

     

       29
       29
       -
           };

     

       30
       30
       -
       

     

       31
       31
       -
           home.pointerCursor = {

     

       32
       32
       -
             name = "Bibata-Modern-Classic";

     

       33
       33
       -
             package = pkgs.bibata-cursors;

     

       34
       34
       -
             size = 24;

     

       35
       35
       -
             gtk.enable = true;

     

       36
       36
       -
             x11.enable = true;

     

       37
       37
       -
           };

     

       38
       38
       -
         };

     

       39
       39
       -
       }

+2 -1

home/development/js.nix

···

       40
       40
        
             NODE_REPL_HISTORY = "${config.xdg.stateHome}/node_repl_history";

     

       41
       41
        
             NPM_CONFIG_USERCONFIG = "${NPMRC_PATH}";

     

       42
       42
        
             NPM_CONFIG_CACHE = "${config.xdg.cacheHome}/npm";

     

       43
       43
       -
             NPM_CONFIG_TMP = "${config.xdg.runtimeDir}/npm";

     

       43
       43
       +
             NPM_CONFIG_TMP = "$XDG_RUNTIME_DIR/npm";

     

       44
       44
        
             VOLTA_HOME = "${config.xdg.dataHome}/volta";

     

       45
       45
        
       

     

       46
       46
        
             COREPACK_ENABLE_AUTO_PIN = "0"; # disable corepack creating packageManager entries

     

       47
       47
       +
             COREPACK_INTEGRITY_KEYS = "0";

     

       47
       48
        
           };

     

       48
       49
        
       

     

       49
       50
        
           home.file.".yarnrc".text = ''

-1

machines/pepper/home.nix

···

       3
       3
        
       {

     

       4
       4
        
         modules = {

     

       5
       5
        
           development.enable = false;

     

       6
       6
       -
           desktop.enable = true;

     

       7
       6
        
           apps = {

     

       8
       7
        
             enable = true;

     

       9
       8
        
             discord.enable = true;

+30

machines/sodacream/configuration.nix

···

       1
       1
       +
       { user, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         imports = [

     

       5
       5
       +
           ./hardware.nix

     

       6
       6
       +
         ];

     

       7
       7
       +
       

     

       8
       8
       +
         users.users."${user}" = {

     

       9
       9
       +
           isNormalUser = true;

     

       10
       10
       +
           extraGroups = [ "wheel" ];

     

       11
       11
       +
           hashedPassword = "$6$DEmCOeiSFe6ymGox$WMWddbT9PkkfDT6JS4WuJsM3mQHI0e9kg0t42UowO79dWAcSU0K//KKlcebSosoMRz5mUEw5TFvbrv1aRHqYa/";

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         modules = {

     

       15
       15
       +
           desktop = {

     

       16
       16
       +
             enable = true;

     

       17
       17
       +
             rawaccel.enable = false;

     

       18
       18
       +
             affinity.performanceCores = [ 4 5 6 7 ];

     

       19
       19
       +
           };

     

       20
       20
       +
           fonts.enable = true;

     

       21
       21
       +
           server = {

     

       22
       22
       +
             enable = true;

     

       23
       23
       +
             sshd.enable = true;

     

       24
       24
       +
             tailscale.enable = true;

     

       25
       25
       +
           };

     

       26
       26
       +
         };

     

       27
       27
       +
       

     

       28
       28
       +
         system.stateVersion = "25.05";

     

       29
       29
       +
       }

     

       30
       30
       +

+90

machines/sodacream/hardware.nix

···

       1
       1
       +
       { lib, inputs, modulesPath, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       {

     

       5
       5
       +
         imports = with inputs; [

     

       6
       6
       +
           apple-silicon.nixosModules.apple-silicon-support

     

       7
       7
       +
           (modulesPath + "/installer/scan/not-detected.nix")

     

       8
       8
       +
         ];

     

       9
       9
       +
       

     

       10
       10
       +
         networking.hostId = "1a99cdb0";

     

       11
       11
       +
       

     

       12
       12
       +
         boot = {

     

       13
       13
       +
           supportedFilesystems = [ "btrfs" ];

     

       14
       14
       +
           loader = {

     

       15
       15
       +
             systemd-boot.enable = true;

     

       16
       16
       +
             efi.canTouchEfiVariables = false;

     

       17
       17
       +
           };

     

       18
       18
       +
           kernelParams = [

     

       19
       19
       +
             "zswap.enabled=1"

     

       20
       20
       +
             "zswap.compressor=zstd"

     

       21
       21
       +
             "zswap.zpool=zsmalloc"

     

       22
       22
       +
             "zswap.max_pool_percent=20"

     

       23
       23
       +
             "apple_dcp.show_notch=1"

     

       24
       24
       +
             "nvme_apple.flush_interval=1000"

     

       25
       25
       +
           ];

     

       26
       26
       +
           initrd.luks.devices."cryptroot".device = "/dev/disk/by-label/NIXOS_LUKS";

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         fileSystems."/" = {

     

       30
       30
       +
           device = "/dev/disk/by-label/NIXROOT";

     

       31
       31
       +
           fsType = "btrfs";

     

       32
       32
       +
           options = [ "subvol=@root" "compress=zstd" "noatime" ];

     

       33
       33
       +
         };

     

       34
       34
       +
       

     

       35
       35
       +
         fileSystems."/nix" = {

     

       36
       36
       +
           device = "/dev/disk/by-label/NIXROOT";

     

       37
       37
       +
           fsType = "btrfs";

     

       38
       38
       +
           options = [ "subvol=@nix" "compress=zstd" "noatime" ];

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         fileSystems."/home" = {

     

       42
       42
       +
           device = "/dev/disk/by-label/NIXROOT";

     

       43
       43
       +
           fsType = "btrfs";

     

       44
       44
       +
           options = [ "subvol=@home" "noatime" ];

     

       45
       45
       +
         };

     

       46
       46
       +
       

     

       47
       47
       +
         fileSystems."/var/log" = {

     

       48
       48
       +
           device = "/dev/disk/by-label/NIXROOT";

     

       49
       49
       +
           fsType = "btrfs";

     

       50
       50
       +
           options = [ "subvol=@log" "noatime" ];

     

       51
       51
       +
         };

     

       52
       52
       +
       

     

       53
       53
       +
         fileSystems."/swap" = {

     

       54
       54
       +
           device = "/dev/disk/by-label/NIXROOT";

     

       55
       55
       +
           fsType = "btrfs";

     

       56
       56
       +
           options = [ "subvol=@swap" "noatime" ];

     

       57
       57
       +
         };

     

       58
       58
       +
       

     

       59
       59
       +
         fileSystems."/boot" = {

     

       60
       60
       +
           device = "/dev/disk/by-uuid/9B6C-1522";

     

       61
       61
       +
           fsType = "vfat";

     

       62
       62
       +
           options = [ "fmask=0022" "dmask=0022" ];

     

       63
       63
       +
         };

     

       64
       64
       +
       

     

       65
       65
       +
         swapDevices = [

     

       66
       66
       +
           {

     

       67
       67
       +
             device = "/swap/swapfile";

     

       68
       68
       +
             size = 16 * 1024;

     

       69
       69
       +
           }

     

       70
       70
       +
         ];

     

       71
       71
       +
       

     

       72
       72
       +
         nixpkgs.overlays = [ inputs.apple-silicon.overlays.apple-silicon-overlay ];

     

       73
       73
       +
       

     

       74
       74
       +
         hardware = {

     

       75
       75
       +
           enableAllFirmware = true;

     

       76
       76
       +
           graphics.enable = true;

     

       77
       77
       +
           bluetooth.enable = true;

     

       78
       78
       +
           wirelessRegulatoryDatabase = true;

     

       79
       79
       +
           asahi.useExperimentalGPUDriver = true;

     

       80
       80
       +
         };

     

       81
       81
       +
       

     

       82
       82
       +
         services.udev.extraRules = ''

     

       83
       83
       +
           ACTION=="add|change", KERNEL=="nvme[0-9]*n[0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="none"

     

       84
       84
       +
         '';

     

       85
       85
       +
       

     

       86
       86
       +
         systemd.services = {

     

       87
       87
       +
           mount-pstore.enable = mkDefault false;

     

       88
       88
       +
           ModemManager.enable = mkDefault false;

     

       89
       89
       +
         };

     

       90
       90
       +
       }

+16

machines/sodacream/home.nix

···

       1
       1
       +
       { ... }: {

     

       2
       2
       +
         modules = {

     

       3
       3
       +
           development = {

     

       4
       4
       +
             enable = true;

     

       5
       5
       +
             js.enable = true;

     

       6
       6
       +
             zig.enable = true;

     

       7
       7
       +
             terraform.enable = false;

     

       8
       8
       +
             react-native.enable = false;

     

       9
       9
       +
           };

     

       10
       10
       +
           apps = {

     

       11
       11
       +
             enable = true;

     

       12
       12
       +
             firefox.enable = true;

     

       13
       13
       +
             ghostty.enable = true;

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
       }

-1

modules/apps/games.nix

···

       34
       34
        
       

     

       35
       35
        
           hardware.steam-hardware.enable = true;

     

       36
       36
        
           users.users."${user}".extraGroups = [ "gamemode" ];

     

       37
       37
       -
           services.system76-scheduler.enable = true;

     

       38
       37
        
       

     

       39
       38
        
           environment.systemPackages = [

     

       40
       39
        
             (pkgs.lutris.override {

+2 -1

modules/base/linux.nix

···

       50
       50
        
             "quiet"

     

       51
       51
        
             "splash"

     

       52
       52
        
             "boot.shell_on_fail"

     

       53
       53
       -
             "rd.systemd.show_status=false"

     

       53
       53
       +
             "rd.systemd.show_status=auto"

     

       54
       54
        
             "rd.udev.log_level=3"

     

       55
       55
       +
             "udev.log_priority=3"

     

       55
       56
        
             "nmi_watchdog=0"

     

       56
       57
        
             "mitigations=off"

     

       57
       58
        
           ];

+99

modules/desktop/affinity.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       let

     

       5
       5
       +
         cfg = config.modules.desktop;

     

       6
       6
       +
       

     

       7
       7
       +
         concat = concatMapStringsSep "," toString;

     

       8
       8
       +
         performance = concat cfg.affinity.performanceCores;

     

       9
       9
       +
         efficiency = concat cfg.affinity.efficiencyCores;

     

       10
       10
       +
       in {

     

       11
       11
       +
         options.modules.desktop.affinity = {

     

       12
       12
       +
           enable = mkOption {

     

       13
       13
       +
             default = cfg.enable;

     

       14
       14
       +
             example = true;

     

       15
       15
       +
             description = "Tweak CPU affinity into performance and efficiency core slices";

     

       16
       16
       +
             type = types.bool;

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
           performanceCores = mkOption {

     

       20
       20
       +
             type = with types; listOf ints.unsigned;

     

       21
       21
       +
             default = [ ];

     

       22
       22
       +
             description = "List of performance CPUs";

     

       23
       23
       +
           };

     

       24
       24
       +
       

     

       25
       25
       +
           efficiencyCores = mkOption {

     

       26
       26
       +
             type = with types; listOf ints.unsigned;

     

       27
       27
       +
             default = [ 0 1 2 3 ];

     

       28
       28
       +
             description = "List of efficiency CPUs";

     

       29
       29
       +
           };

     

       30
       30
       +
       

     

       31
       31
       +
           isolateNixDaemon = mkOption {

     

       32
       32
       +
             default = cfg.affinity.enable;

     

       33
       33
       +
             type = types.bool;

     

       34
       34
       +
           };

     

       35
       35
       +
         };

     

       36
       36
       +
       

     

       37
       37
       +
         config = mkIf cfg.affinity.enable {

     

       38
       38
       +
           boot.kernelParams = [ "rcu_nocbs=all" ]

     

       39
       39
       +
             ++ optionals (efficiency != "") [ "irqaffinity=${efficiency}" ]

     

       40
       40
       +
             ++ optionals (performance != "") [ "nohz_full=${performance}" ];

     

       41
       41
       +
       

     

       42
       42
       +
           systemd = {

     

       43
       43
       +
             user.slices = {

     

       44
       44
       +
               background.sliceConfig = {

     

       45
       45
       +
                 AllowedCPUs = efficiency;

     

       46
       46
       +
                 Delegate = "cpuset";

     

       47
       47
       +
                 CPUWeight = 80;

     

       48
       48
       +
                 Nice = 6;

     

       49
       49
       +
                 IOSchedulingClass = "idle";

     

       50
       50
       +
               };

     

       51
       51
       +
               session.sliceConfig = {

     

       52
       52
       +
                 StartupAllowedCPUs = mkIf (performance != "") "${efficiency},${performance}";

     

       53
       53
       +
                 AllowedCPUs = efficiency;

     

       54
       54
       +
                 Delegate = "cpuset";

     

       55
       55
       +
                 Nice = 9;

     

       56
       56
       +
                 IOSchedulingClass = "idle";

     

       57
       57
       +
               };

     

       58
       58
       +
               app.sliceConfig = {

     

       59
       59
       +
                 Nice = 0;

     

       60
       60
       +
                 IOSchedulingClass = "best-effort";

     

       61
       61
       +
                 IOSchedulingPriority = 0;

     

       62
       62
       +
               };

     

       63
       63
       +
             };

     

       64
       64
       +
             slices = {

     

       65
       65
       +
               system.sliceConfig = {

     

       66
       66
       +
                 AllowedCPUs = efficiency;

     

       67
       67
       +
                 Nice = 12;

     

       68
       68
       +
                 IOSchedulingClass = "idle";

     

       69
       69
       +
               };

     

       70
       70
       +
               nix.sliceConfig = mkIf cfg.affinity.isolateNixDaemon {

     

       71
       71
       +
                 CPUQuota = "80%";

     

       72
       72
       +
                 ManagedOOMMemoryPressure = "kill";

     

       73
       73
       +
                 ManagedOOMMemoryPressureLimit = "80%";

     

       74
       74
       +
                 Nice = 9;

     

       75
       75
       +
               };

     

       76
       76
       +
             };

     

       77
       77
       +
             services = {

     

       78
       78
       +
               nix-daemon.serviceConfig = mkIf cfg.affinity.isolateNixDaemon {

     

       79
       79
       +
                 Slice = "nix.slice";

     

       80
       80
       +
                 OOMScoreAdjust = 950;

     

       81
       81
       +
               };

     

       82
       82
       +
               "user@" = {

     

       83
       83
       +
                 overrideStrategy = "asDropin";

     

       84
       84
       +
                 serviceConfig.Delegate = "cpuset";

     

       85
       85
       +
               };

     

       86
       86
       +
             };

     

       87
       87
       +
           };

     

       88
       88
       +
       

     

       89
       89
       +
           powerManagement = {

     

       90
       90
       +
             powerDownCommands = "systemctl stop system76-scheduler";

     

       91
       91
       +
             resumeCommands = "systemctl start system76-scheduler";

     

       92
       92
       +
           };

     

       93
       93
       +
       

     

       94
       94
       +
           assertions = singleton {

     

       95
       95
       +
             assertion = mutuallyExclusive cfg.affinity.performanceCores cfg.affinity.efficiencyCores;

     

       96
       96
       +
             message = "Performance and efficiency CPU cores must not overlap";

     

       97
       97
       +
           };

     

       98
       98
       +
         };

     

       99
       99
       +
       }

+1

modules/desktop/default.nix

···

       20
       20
        
         imports = [

     

       21
       21
        
           ./services.nix

     

       22
       22
        
           ./session.nix

     

       23
       23
       +
           ./affinity.nix

     

       23
       24
        
           ./fonts.nix

     

       24
       25
        
           ./rawaccel.nix

     

       25
       26
        
         ];

-1

modules/desktop/services.nix

···

       50
       50
        
           services = {

     

       51
       51
        
             hardware.bolt.enable = true;

     

       52
       52
        
             printing.enable = true;

     

       53
       53
       -
             flatpak.enable = true;

     

       54
       53
        
             colord.enable = true;

     

       55
       54
        
             fwupd.enable = true;

     

       56
       55

+13 -1

modules/desktop/session.nix

···

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         config = mkIf cfg.session.enable {

     

       17
       17
       -
           boot.plymouth.enable = true;

     

       17
       17
       +
           boot = {

     

       18
       18
       +
             plymouth.enable = true;

     

       19
       19
       +
             initrd.verbose = mkDefault false;

     

       20
       20
       +
             consoleLogLevel = 0;

     

       21
       21
       +
             loader.timeout = 0;

     

       22
       22
       +
             kernelParams = [ "console=tty1" "vt.global_cursor_default=0" ];

     

       23
       23
       +
           };

     

       18
       24
        
       

     

       19
       25
        
           services = {

     

       20
       26
        
             desktopManager.plasma6.enable = true;

     
···

       32
       38
        
             systemPackages = with pkgs.kdePackages; [

     

       33
       39
        
               sddm-kcm

     

       34
       40
        
               qtmultimedia

     

       41
       41
       +
               pkgs.apple-cursor

     

       35
       42
        
             ];

     

       36
       43
        
             plasma6 = {

     

       37
       44
        
               excludePackages = with pkgs.kdePackages; [

     

       45
       45
       +
                 discover

     

       38
       46
        
                 ffmpegthumbs

     

       39
       47
        
                 plasma-browser-integration

     

       40
       48
        
                 kate

     
···

       56
       64
        
           xdg.portal = {

     

       57
       65
        
             enable = true;

     

       58
       66
        
             xdgOpenUsePortal = true;

     

       67
       67
       +
             extraPortals = with pkgs; [

     

       68
       68
       +
               kdePackages.xdg-desktop-portal-kde

     

       69
       69
       +
               xdg-desktop-portal-gtk

     

       70
       70
       +
             ];

     

       59
       71
        
           };

     

       60
       72
        
         };

     

       61
       73
        
       }