commit 5188c1ab7a9ee9ff452035ce1df9b5d0ef8d495e · ptr.pet/ark

+2 -2

flake.nix

···

       86
       86
        
           in

     

       87
       87
        
           {

     

       88
       88
        
             lib = tlib;

     

       89
       89
       -
             nixosConfigurations = import ./hosts { inherit lib tlib inputs; };

     

       90
       90
       -
             homeConfigurations = import ./users { inherit lib tlib inputs; };

     

       89
       89
       +
             nixosConfigurations = import ./hosts { inherit lib tlib inputs allPkgs; };

     

       90
       90
       +
             homeConfigurations = import ./users { inherit lib tlib inputs allPkgs; };

     

       91
       91
        
       

     

       92
       92
        
             packages = lib.mapAttrs (_: pkgs: pkgs._exported) allPkgs;

     

       93
       93
        
             legacyPackages = allPkgs;

+5 -7

hosts/default.nix

···

       2
       2
        
         inputs,

     

       3
       3
        
         lib,

     

       4
       4
        
         tlib,

     

       5
       5
       +
         allPkgs,

     

       5
       6
        
         ...

     

       6
       7
        
       }:

     

       7
       8
        
       let

     
···

       12
       13
        
         ];

     

       13
       14
        
       

     

       14
       15
        
         mkSystem =

     

       15
       15
       -
           name: system:

     

       16
       16
       -
           let

     

       17
       17
       -
             pkgs = tlib.makePkgs system;

     

       18
       18
       -
           in

     

       16
       16
       +
           name: pkgs:

     

       19
       17
        
           lib.nixosSystem {

     

       20
       20
       -
             inherit system;

     

       18
       18
       +
             system = pkgs.system;

     

       21
       19
        
             modules = baseModules ++ [

     

       22
       20
        
               { networking.hostName = name; }

     

       23
       21
        
               { nixpkgs.pkgs = pkgs; }

     
···

       29
       27
        
         systems = {

     

       30
       28
        
           # lungmen = "x86_64-linux";

     

       31
       29
        
           # tkaronto = "x86_64-linux";

     

       32
       32
       -
           wolumonde = "x86_64-linux";

     

       33
       33
       -
           wsl = "x86_64-linux";

     

       30
       30
       +
           wolumonde = allPkgs.x86_64-linux;

     

       31
       31
       +
           wsl = allPkgs.x86_64-linux;

     

       34
       32
        
         };

     

       35
       33
        
       in

     

       36
       34
        
       lib.mapAttrs mkSystem systems

+4 -6

users/default.nix

···

       2
       2
        
         inputs,

     

       3
       3
        
         lib,

     

       4
       4
        
         tlib,

     

       5
       5
       +
         allPkgs,

     

       5
       6
        
         ...

     

       6
       7
        
       }:

     

       7
       8
        
       let

     

       8
       9
        
         mkHome =

     

       9
       9
       -
           name: system:

     

       10
       10
       -
           let

     

       11
       11
       -
             pkgs = tlib.makePkgs system;

     

       12
       12
       -
           in

     

       10
       10
       +
           name: pkgs:

     

       13
       11
        
           import "${inputs.home}/modules" {

     

       14
       12
        
             inherit pkgs;

     

       15
       13
        
             configuration = import (./. + "/${name}/default.nix");

     

       16
       16
       -
             extraSpecialArgs = {inherit tlib inputs;};

     

       14
       14
       +
             extraSpecialArgs = {inherit tlib inputs pkgs;};

     

       17
       15
        
           };

     

       18
       16
        
       

     

       19
       17
        
         users = {

     

       20
       20
       -
           "dusk@devel.mobi" = "x86_64-linux";

     

       18
       18
       +
           "dusk@devel.mobi" = allPkgs.x86_64-linux;

     

       21
       19
        
         };

     

       22
       20
        
       in

     

       23
       21
        
       lib.mapAttrs mkHome users