commit 74477583ca4b310a8156037c22565eb4bb9922b9 · pyrox.dev/nix

+4 -10

flake.nix

···

       2
       2
        
         nixConfig = {

     

       3
       3
        
           experimental-features = "nix-command flakes";

     

       4
       4
        
           substitute = "true";

     

       5
       5
       -
           extra-substituters = "https://cache.nixos.org https://nixpkgs-wayland.cachix.org https://nix-community.cachix.org https://nixpkgs-update.cachix.org https://colmena.cachix.org https://hyprland.cachix.org";

     

       6
       6
       -
           extra-trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8= colmena.cachix.org-1:7BzpDnjjH8ki2CT3f6GdOk7QAzPOl+1t3LvTLXqYcSg= hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=";

     

       5
       5
       +
           extra-substituters = "https://cache.nixos.org https://nixpkgs-wayland.cachix.org https://nix-community.cachix.org https://nixpkgs-update.cachix.org https://hyprland.cachix.org";

     

       6
       6
       +
           extra-trusted-public-keys = "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA= nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs= nixpkgs-update.cachix.org-1:6y6Z2JdoL3APdu6/+Iy8eZX2ajf09e4EE9SnxSML1W8= hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=";

     

       7
       7
        
           cores = 0;

     

       8
       8
        
           max-jobs = 8;

     

       9
       9
        
           netrc-file = "/home/thehedgehog/.netrc";

     

       10
       10
        
         };

     

       11
       11
       -
         description = "Pyrox's flaky configurations";

     

       11
       11
       +
         description = "PyroNet machines and services";

     

       12
       12
        
         inputs = {

     

       13
       13
        
           nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";

     

       14
       14
        
           nixos-unstable.url = "github:nixos/nixpkgs/nixos-unstable";

     
···

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

     

       18
       18
        
           alejandra.url = "github:kamadorueda/alejandra";

     

       19
       19
        
           alejandra.inputs.nixpkgs.follows = "nixpkgs";

     

       20
       20
       -
           colmena.url = "github:zhaofengli/colmena";

     

       21
       20
        
           dns.url = "github:kirelagin/dns.nix";

     

       22
       21
        
           dns.inputs.nixpkgs.follows = "nixpkgs";

     

       23
       22
        
           emacs.url = "github:nix-community/emacs-overlay";

     
···

       43
       42
        
           espanso-nixpkgs,

     

       44
       43
        
           agenix,

     

       45
       44
        
           alejandra,

     

       46
       46
       -
           colmena,

     

       47
       45
        
           dns,

     

       48
       46
        
           emacs,

     

       49
       47
        
           golink,

     
···

       61
       59
        
           alejandra-overlay = final: prev: {alejandra = alejandra.defaultPackage.${prev.system};};

     

       62
       60
        
           nixpkgs-update-overlay = final: prev: {nixpkgs-update = nixpkgs-update.defaultPackage.${prev.system};};

     

       63
       61
        
           my-pkgs = final: prev: {my-pkgs = self.packages."${prev.system}";};

     

       64
       64
       -
           colmena-overlay = final: prev: {colmena = colmena.defaultPackage.${prev.system};};

     

       65
       62
        
       

     

       66
       63
        
           system = "x86_64-linux";

     

       67
       64
        
           overlays = [

     
···

       69
       66
        
             (import ./overlays/sumneko.nix)

     

       70
       67
        
             my-pkgs

     

       71
       68
        
             alejandra-overlay

     

       72
       72
       -
             colmena-overlay

     

       73
       69
        
             emacs.overlay

     

       74
       70
        
             golink.overlay

     

       75
       71
        
             lanzaboote.overlays.default

     
···

       91
       87
        
           };

     

       92
       88
        
       

     

       93
       89
        
           lib = nixpkgs.lib;

     

       94
       94
       -
           clib = import ./lib/colmena.nix { inherit inputs overlays; };

     

       95
       90
        
           mkUser = {

     

       96
       91
        
             username ? "pyrox",

     

       97
       92
        
             profile ? "desktop",

     
···

       122
       117
        
                 }

     

       123
       118
        
                 ( mkUser { inherit profile; username = "pyrox";})

     

       124
       119
        
                 ( mkUser { inherit profile; username = "thehedgehog";})

     

       125
       125
       -
                 inputs.colmena.nixosModules.deploymentOptions

     

       120
       120
       +
                 inputs.agenix.nixosModules.default

     

       126
       121
        
               ] ++ extraModules;

     

       127
       122
        
               specialArgs = {inherit self inputs pkgs;};

     

       128
       123
        
             };

     
···

       171
       166
        
             ];

     

       172
       167
        
           };

     

       173
       168
        
       

     

       174
       174
       -
           colmena = clib.mkColmenaFromNixOSConfigurations self.nixosConfigurations;

     

       175
       169
        
         };

     

       176
       170
        
       }

-26

lib/colmena.nix

···

       1
       1
       -
       { inputs, overlays }:

     

       2
       2
       -
       let

     

       3
       3
       -
         inherit (builtins) mapAttrs;

     

       4
       4
       -
       in {

     

       5
       5
       -
       # From https://github.com/otavio/nix-config/blob/master/lib/default.nix

     

       6
       6
       -
         mkColmenaFromNixOSConfigurations = nixosConfigurations:

     

       7
       7
       -
           {

     

       8
       8
       -
             meta = {

     

       9
       9
       -
               description = "Pyrox's Deployments";

     

       10
       10
       -
               nixpkgs = import inputs.nixpkgs {

     

       11
       11
       -
                 system = "x86_64-linux";

     

       12
       12
       -
                 inherit overlays;

     

       13
       13
       -
               };

     

       14
       14
       -
       

     

       15
       15
       -
               specialArgs = {

     

       16
       16
       -
                 inherit inputs;

     

       17
       17
       -
               };

     

       18
       18
       -
             };

     

       19
       19
       -
           } // mapAttrs

     

       20
       20
       -
             (name: value:

     

       21
       21
       -
               {

     

       22
       22
       -
                 nixpkgs.system = value.config.nixpkgs.system;

     

       23
       23
       -
                 imports = value._module.args.modules;

     

       24
       24
       -
               })

     

       25
       25
       -
             nixosConfigurations;

     

       26
       26
       -
       }

+12

lib/default.nix

···

       1
       1
       +
       { inputs, overlays, pkgs }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (builtins) mapAttrs;

     

       4
       4
       +
       in {

     

       5
       5
       +
       

     

       6
       6
       +
         # mkColmena = {

     

       7
       7
       +
         #   hostname,

     

       8
       8
       +
         #

     

       9
       9
       +
         # }: {

     

       10
       10
       +
         #

     

       11
       11
       +
         # };

     

       12
       12
       +
       }