commit f6474306df71bfe6b1b94be5b93bb0458a11e86b · kitten.sh/system

+8 -11

flake.nix

···

       9
       9
        
       

     

       10
       10
        
           apple-silicon = {

     

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

     

       12
       12
       -
             inputs = {

     

       13
       13
       -
               nixpkgs.follows = "nixpkgs";

     

       14
       14
       -
             };

     

       12
       12
       +
             inputs.nixpkgs.follows = "nixpkgs";

     

       15
       13
        
           };

     

       16
       14
        
       

     

       17
       15
        
           lanzaboote = {

     

       18
       16
        
             url = "github:nix-community/lanzaboote";

     

       19
       19
       -
             inputs = {

     

       20
       20
       -
               nixpkgs.follows = "nixpkgs";

     

       21
       21
       -
             };

     

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

     

       22
       18
        
           };

     

       23
       19
        
       

     

       24
       20
        
           agenix = {

     
···

       67
       63
        
           };

     

       68
       64
        
         };

     

       69
       65
        
       

     

       70
       70
       -
         outputs = { apple-silicon, ...} @ inputs: let

     

       66
       66
       +
         outputs = inputs: let

     

       71
       67
        
           inherit (import ./lib/system.nix inputs) mkSystem;

     

       72
       72
       -
           eachSystem = inputs.nixpkgs.lib.genAttrs ["aarch64-darwin" "aarch64-linux" "x86_64-linux"];

     

       68
       68
       +
           eachSystem = inputs.nixpkgs.lib.genAttrs ["aarch64-darwin" "aarch64-linux" "x86_64-darwin" "x86_64-linux"];

     

       69
       69
       +
           eachDarwinSystem = inputs.nixpkgs.lib.genAttrs ["aarch64-darwin" "x86_64-darwin"];

     

       73
       70
        
           overlays = [

     

       74
       71
        
             inputs.nvim-plugins.overlays.default

     

       75
       72
        
             (self: super: {

     
···

       105
       102
        
           };

     

       106
       103
        
       

     

       107
       104
        
           nixosConfigurations."ramune" = mkSystem {

     

       108
       108
       -
             overlays = overlays ++ [

     

       109
       109
       -
               apple-silicon.overlays.apple-silicon-overlay

     

       110
       110
       -
             ];

     

       105
       105
       +
             inherit overlays;

     

       111
       106
        
             system = "aarch64-linux";

     

       112
       107
        
             hostname = "ramune";

     

       113
       108
        
           };

     

       114
       109
        
       

     

       115
       110
        
           packages = eachSystem (system: {

     

       116
       111
        
             inherit (inputs.agenix.packages.${system}) agenix;

     

       112
       112
       +
           }) // eachDarwinSystem (system: {

     

       113
       113
       +
             inherit (inputs.darwin.packages.${system}) darwin-rebuild;

     

       117
       114
        
           });

     

       118
       115
        
         };

     

       119
       116
        
       }

+3 -2

lib/system.nix

···

       27
       27
        
               nixpkgs = {

     

       28
       28
        
                 inherit overlays;

     

       29
       29
        
                 config.allowUnfree = true;

     

       30
       30
       +
                 hostPlatform = system;

     

       30
       31
        
               };

     

       31
       32
        
       

     

       32
       33
        
               networking.hostName = hostname;

     
···

       48
       49
        
             ];

     

       49
       50
        
           };

     

       50
       51
        
       

     

       51
       51
       -
           specialArgs = inputs // {

     

       52
       52
       -
             inherit hostname user;

     

       52
       52
       +
           specialArgs = {

     

       53
       53
       +
             inherit hostname user inputs;

     

       53
       54
        
             helpers = (import ./helpers.nix {

     

       54
       55
        
               inherit lib system;

     

       55
       56
        
             });

+3 -7

machines/cola/hardware.nix

···

       1
       1
       -
       { config, lib, nixos-hardware, modulesPath, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         imports = [

     

       4
       4
       +
         imports = with inputs; [

     

       5
       5
        
           nixos-hardware.nixosModules.common-cpu-intel

     

       6
       6
        
           nixos-hardware.nixosModules.common-pc-ssd

     

       7
       7
        
           nixos-hardware.nixosModules.common-pc

     
···

       62
       62
        
           { device = "/dev/disk/by-label/NIXSWAP"; }

     

       63
       63
        
         ];

     

       64
       64
        
       

     

       65
       65
       -
         # set host and allow unfree

     

       66
       66
       -
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       67
       67
       -
         nixpkgs.config.allowUnfree = true;

     

       68
       68
       -
       

     

       69
       69
       -
         # enable Intel microcode update and firmware

     

       65
       65
       +
         # enable Intel microcode update and firmware

     

       70
       66
        
         hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       71
       67
        
         hardware.enableAllFirmware = true;

     

       72
       68

+1 -1

machines/pepper/configuration.nix

···

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

     

       1
       1
       +
       { user, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         imports = [

+3 -7

machines/pepper/hardware.nix

···

       1
       1
       -
       { config, lib, pkgs, nixos-hardware, lanzaboote, modulesPath, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         imports = [

     

       4
       4
       +
         imports = with inputs; [

     

       5
       5
        
           nixos-hardware.nixosModules.framework-13-7040-amd

     

       6
       6
        
           lanzaboote.nixosModules.lanzaboote

     

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

     
···

       84
       84
        
           HibernateDelaySec=2h

     

       85
       85
        
         '';

     

       86
       86
        
       

     

       87
       87
       -
         # set host and allow unfree

     

       88
       88
       -
         nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

     

       89
       89
       -
         nixpkgs.config.allowUnfree = true;

     

       90
       90
       -
       

     

       91
       91
       -
         # enable AMD microcode update and firmware

     

       87
       87
       +
         # enable AMD microcode update and firmware

     

       92
       88
        
         hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;

     

       93
       89
        
         hardware.enableAllFirmware = true;

     

       94
       90

+3 -7

machines/ramune/hardware.nix

···

       1
       1
       -
       { lib, apple-silicon, modulesPath, ... }:

     

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

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         imports = [

     

       4
       4
       +
         imports = with inputs; [

     

       5
       5
        
           apple-silicon.nixosModules.apple-silicon-support

     

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

     

       7
       7
        
         ];

     
···

       56
       56
        
           { device = "/swap/swapfile"; }

     

       57
       57
        
         ];

     

       58
       58
        
       

     

       59
       59
       -
         nixpkgs = {

     

       60
       60
       -
           hostPlatform = lib.mkDefault "aarch64-linux";

     

       61
       61
       -
           config.allowUnfree = true;

     

       62
       62
       -
           overlays = [ apple-silicon.overlays.apple-silicon-overlay ];

     

       63
       63
       -
         };

     

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

     

       64
       60
        
       

     

       65
       61
        
         hardware.asahi.useExperimentalGPUDriver = true;

     

       66
       62
        
       }

+55 -50

modules/base/nix-config.nix

···

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

     

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

     

       2
       2
        
       

     

       3
       3
       -
       with lib; {

     

       4
       4
       -
         age.secrets."nix-access-tokens.conf".file = ./encrypt/nix-access-tokens.conf.age;

     

       3
       3
       +
       with lib; mkMerge [

     

       4
       4
       +
         {

     

       5
       5
       +
           age.secrets."nix-access-tokens.conf".file = ./encrypt/nix-access-tokens.conf.age;

     

       5
       6
        
       

     

       6
       6
       -
         nixpkgs.config.allowUnfree = true;

     

       7
       7
       +
           nix = {

     

       8
       8
       +
             package = pkgs.nix;

     

       9
       9
       +
             channel.enable = mkForce false;

     

       7
       10
        
       

     

       8
       8
       -
         nix = {

     

       9
       9
       -
           package = pkgs.nix;

     

       10
       10
       -
           channel.enable = mkForce false;

     

       11
       11
       +
             # make flake registry and nix path match flake inputs

     

       12
       12
       +
             registry = mkForce (mapAttrs (_: flake: {inherit flake;}) inputs);

     

       13
       13
       +
             nixPath = mapAttrsToList (n: _: "${n}=flake:${n}") inputs;

     

       11
       14
        
       

     

       12
       12
       -
           # provide for nix-shell and run

     

       13
       13
       -
           nixPath = [ "nixpkgs=${nixpkgs.outPath}" ];

     

       15
       15
       +
             settings = {

     

       16
       16
       +
               # save space

     

       17
       17
       +
               auto-optimise-store = true;

     

       18
       18
       +
               # Enable flakes and new 'nix' command

     

       19
       19
       +
               experimental-features = "nix-command flakes";

     

       20
       20
       +
               # disable global registry

     

       21
       21
       +
               flake-registry = "";

     

       22
       22
       +
               # Workaround for https://github.com/NixOS/nix/issues/9574

     

       23
       23
       +
               nix-path = config.nix.nixPath;

     

       24
       24
       +
               # binary caches

     

       25
       25
       +
               substituters = [

     

       26
       26
       +
                 "https://cache.nixos.org"

     

       27
       27
       +
                 "https://nix-community.cachix.org"

     

       28
       28
       +
               ];

     

       29
       29
       +
               trusted-public-keys = [

     

       30
       30
       +
                 "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="

     

       31
       31
       +
                 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="

     

       32
       32
       +
               ];

     

       33
       33
       +
               trusted-users = [ "root" "@wheel" ];

     

       34
       34
       +
             };

     

       14
       35
        
       

     

       15
       15
       -
           settings = {

     

       16
       16
       -
             # save space

     

       17
       17
       -
             auto-optimise-store = true;

     

       18
       18
       -
             # flakes

     

       19
       19
       -
             experimental-features = [ "nix-command" "flakes" ];

     

       20
       20
       -
             warn-dirty = false;

     

       21
       21
       -
             # binary caches

     

       22
       22
       -
             substituters = [

     

       23
       23
       -
               "https://cache.nixos.org"

     

       24
       24
       -
               "https://nix-community.cachix.org"

     

       25
       25
       -
             ];

     

       26
       26
       -
             trusted-public-keys = [

     

       27
       27
       -
               "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="

     

       28
       28
       -
               "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="

     

       29
       29
       -
             ];

     

       30
       30
       -
             trusted-users = [ "root" "@wheel" ];

     

       31
       31
       -
           };

     

       36
       36
       +
             # auto collect old stores

     

       37
       37
       +
             gc = {

     

       38
       38
       +
               automatic = true;

     

       39
       39
       +
               options = "--delete-older-than 14d";

     

       40
       40
       +
             } // helpers.linuxAttrs {

     

       41
       41
       +
               dates = "weekly";

     

       42
       42
       +
             } // helpers.darwinAttrs {

     

       43
       43
       +
               interval = { Weekday = 0; Hour = 0; Minute = 0; };

     

       44
       44
       +
             };

     

       32
       45
        
       

     

       33
       33
       -
           # auto collect old stores

     

       34
       34
       -
           gc = {

     

       35
       35
       -
             automatic = true;

     

       36
       36
       -
             options = "--delete-older-than 14d";

     

       37
       37
       -
           } // helpers.linuxAttrs {

     

       38
       38
       -
             dates = "weekly";

     

       39
       39
       -
           } // helpers.darwinAttrs {

     

       40
       40
       -
             interval = { Weekday = 0; Hour = 0; Minute = 0; };

     

       46
       46
       +
             extraOptions = ''

     

       47
       47
       +
               !include ${config.age.secrets."nix-access-tokens.conf".path}

     

       48
       48
       +
             '';

     

       41
       49
        
           };

     

       42
       42
       -
       

     

       43
       43
       -
           extraOptions = ''

     

       44
       44
       -
             !include ${config.age.secrets."nix-access-tokens.conf".path}

     

       45
       45
       -
           '';

     

       46
       46
       -
         };

     

       47
       47
       -
       } // helpers.darwinAttrs {

     

       48
       48
       -
         system.stateVersion = 4;

     

       49
       49
       -
         # Disable path verification of $NIX_PATH

     

       50
       50
       -
         system.checks.verifyNixPath = false;

     

       51
       51
       -
         # Auto upgrade nix package and the daemon service.

     

       52
       52
       -
         services.nix-daemon.enable = true;

     

       53
       53
       -
         # Auto-configure build users

     

       54
       54
       -
         nix.configureBuildUsers = true;

     

       55
       55
       -
         # Disable documentation until https://github.com/LnL7/nix-darwin/issues/217 is fixed.

     

       56
       56
       -
         documentation.enable = false;

     

       57
       57
       -
       }

     

       50
       50
       +
         }

     

       51
       51
       +
         (helpers.darwinAttrs {

     

       52
       52
       +
           system.stateVersion = 4;

     

       53
       53
       +
           # Disable path verification of $NIX_PATH

     

       54
       54
       +
           system.checks.verifyNixPath = false;

     

       55
       55
       +
           # Auto upgrade nix package and the daemon service.

     

       56
       56
       +
           services.nix-daemon.enable = true;

     

       57
       57
       +
           # Auto-configure build users

     

       58
       58
       +
           nix.configureBuildUsers = true;

     

       59
       59
       +
           # Disable documentation until https://github.com/LnL7/nix-darwin/issues/217 is fixed.

     

       60
       60
       +
           documentation.enable = false;

     

       61
       61
       +
         })

     

       62
       62
       +
       ]