commit ed6afea1e83ae8822652de881786f9d3568ca6c5 · pyrox.dev/nix

+23 -6

flake.lock

···

       68
        
               ]

     

       69
        
             },

     

       70
        
             "locked": {

     

       71
       -
               "lastModified": 1711742460,

     

       72
       -
               "narHash": "sha256-0O4v6e4a1toxXZ2gf5INhg4WPE5C5T+SVvsBt+45Mcc=",

     

       73
        
               "owner": "zhaofengli",

     

       74
        
               "repo": "attic",

     

       75
       -
               "rev": "4dbdbee45728d8ce5788db6461aaaa89d98081f0",

     

       76
        
               "type": "github"

     

       77
        
             },

     

       78
        
             "original": {

     
···

       656
        
               ]

     

       657
        
             },

     

       658
        
             "locked": {

     

       659
       -
               "lastModified": 1716725378,

     

       660
       -
               "narHash": "sha256-bNTVDAVBLFSSTU+q54cJnntmFKBi+F/D8sSqlZwBGiM=",

     

       661
        
               "owner": "nix-community",

     

       662
        
               "repo": "lib-aggregate",

     

       663
       -
               "rev": "dbc9130fe1455e0f6ee4d8f5f799f9be551f866b",

     

       664
        
               "type": "github"

     

       665
        
             },

     

       666
        
             "original": {

     
···

       1201
        
               "nvim": "nvim",

     

       1202
        
               "prismlauncher": "prismlauncher",

     

       1203
        
               "snowfall": "snowfall",

     

       0
        
       
     

       1204
        
               "systems": "systems_2",

     

       1205
        
               "wayland": "wayland"

     

       1206
        
             }

     
···

       1258
        
             "original": {

     

       1259
        
               "owner": "snowfallorg",

     

       1260
        
               "repo": "lib",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       1261
        
               "type": "github"

     

       1262
        
             }

     

       1263
        
           },

···

       68
        
               ]

     

       69
        
             },

     

       70
        
             "locked": {

     

       71
       +
               "lastModified": 1717279440,

     

       72
       +
               "narHash": "sha256-kH04ReTjxOpQumgWnqy40vvQLSnLGxWP6RF3nq5Esrk=",

     

       73
        
               "owner": "zhaofengli",

     

       74
        
               "repo": "attic",

     

       75
       +
               "rev": "717cc95983cdc357bc347d70be20ced21f935843",

     

       76
        
               "type": "github"

     

       77
        
             },

     

       78
        
             "original": {

     
···

       656
        
               ]

     

       657
        
             },

     

       658
        
             "locked": {

     

       659
       +
               "lastModified": 1717330178,

     

       660
       +
               "narHash": "sha256-rRZjmC3xcPpHTJHnEy3T99O86Ecjao5YhakzaoNiRcs=",

     

       661
        
               "owner": "nix-community",

     

       662
        
               "repo": "lib-aggregate",

     

       663
       +
               "rev": "64d43e2bbc6eab8d1cbdfba96d90a71e15a847d7",

     

       664
        
               "type": "github"

     

       665
        
             },

     

       666
        
             "original": {

     
···

       1201
        
               "nvim": "nvim",

     

       1202
        
               "prismlauncher": "prismlauncher",

     

       1203
        
               "snowfall": "snowfall",

     

       1204
       +
               "stable": "stable",

     

       1205
        
               "systems": "systems_2",

     

       1206
        
               "wayland": "wayland"

     

       1207
        
             }

     
···

       1259
        
             "original": {

     

       1260
        
               "owner": "snowfallorg",

     

       1261
        
               "repo": "lib",

     

       1262
       +
               "type": "github"

     

       1263
       +
             }

     

       1264
       +
           },

     

       1265
       +
           "stable": {

     

       1266
       +
             "locked": {

     

       1267
       +
               "lastModified": 1717144377,

     

       1268
       +
               "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=",

     

       1269
       +
               "owner": "nixos",

     

       1270
       +
               "repo": "nixpkgs",

     

       1271
       +
               "rev": "805a384895c696f802a9bf5bf4720f37385df547",

     

       1272
       +
               "type": "github"

     

       1273
       +
             },

     

       1274
       +
             "original": {

     

       1275
       +
               "owner": "nixos",

     

       1276
       +
               "ref": "nixos-24.05",

     

       1277
       +
               "repo": "nixpkgs",

     

       1278
        
               "type": "github"

     

       1279
        
             }

     

       1280
        
           },

+32 -46

flake.nix

···

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

     

       4
        
           substitute = "true";

     

       5
        
           extra-substituters = [

     

       6
       -
             # Main NixOS Cache

     

       7
        
             "https://cache.nixos.org"

     

       8
       -
             # Colmena Cache

     

       9
        
             "https://colmena.cachix.org"

     

       10
       -
             # Crane Cache

     

       11
        
             "https://crane.cachix.org"

     

       12
       -
             # A bunch of nix community projects

     

       13
        
             "https://isabelroses.cachix.org"

     

       14
       -
             # A bunch of nix community projects

     

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

     

       16
       -
             # Nightly wayland packages

     

       17
        
             "https://nixpkgs-wayland.cachix.org"

     

       18
       -
             # For nh

     

       19
        
             "https://viperml.cachix.org"

     

       20
       -
             # Lix

     

       21
        
             "https://cache.lix.systems"

     

       22
        
           ];

     

       23
        
           trusted-public-keys = [

     
···

       37
        
         description = "PyroNet machines and services";

     

       38
        
       

     

       39
        
         inputs = {

     

       40
       -
           # Snowfall Lib

     

       41
        
           snowfall = {

     

       42
        
             url = "github:snowfallorg/lib";

     

       43
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       44
        
           };

     

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

     

       0
        
       
     

       46
        
           nixpkgs-mesa.url = "github:K900/nixpkgs/mesa-24.1";

     

       47
        
           nixpkgs-nvim.url = "github:nixos/nixpkgs?rev=d5786c1b5dd2d560724b78f3ce51f1f4ef52d053";

     

       48
       -
           # Override certain inputs for other repos to reduce lockfile size and increase code sharing.

     

       49
        
           flake-compat.url = "github:edolstra/flake-compat";

     

       50
        
           systems.url = "github:nix-systems/default";

     

       51
        
           flake-parts = {

     
···

       57
        
             inputs.systems.follows = "systems";

     

       58
        
           };

     

       59
        
           nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";

     

       60
       -
           # Actual inputs

     

       0
        
       
     

       61
        
           agenix = {

     

       62
        
             url = "github:ryantm/agenix";

     

       63
        
             inputs = {

     
···

       114
        
             url = "git+https://iceshrimp.dev/pyrox/packaging";

     

       115
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       116
        
           };

     

       117
       -
           # lanzaboote = {

     

       118
       -
           #   url = "github:nix-community/lanzaboote/11e293475de0c010f86060f0ed74aafe5f593e8b";

     

       119
       -
           #   inputs.flake-compat.follows = "flake-compat";

     

       120
       -
           #   inputs.flake-utils.follows = "flake-utils";

     

       121
       -
           # };

     

       122
        
           lix = {

     

       123
        
             url = "git+https://git.lix.systems/lix-project/lix";

     

       124
        
             flake = false;

     
···

       236
        
               self.overlays.alejandra

     

       237
        
               self.overlays.mesa

     

       238
        
               self.overlays.nix-index

     

       0
        
       
     

       239
        
               inputs.my-pkgs.overlays.cinny

     

       240
        
               inputs.golink.overlay

     

       241
       -
               # inputs.lanzaboote.overlays.default

     

       242
       -
               inputs.lix-module.overlays.default

     

       243
        
               inputs.neovim.overlay

     

       244
        
               inputs.nixd.overlays.default

     

       245
        
               inputs.nur.overlay

     
···

       258
        
       

     

       259
        
             # NixOS Configurations

     

       260
        
             systems = {

     

       0
        
       
     

       261
        
               modules.nixos = with inputs; [

     

       262
        
                 ctp.nixosModules.catppuccin

     

       263
        
                 lix-module.nixosModules.default

     

       264
        
                 agenix.nixosModules.default

     

       265
        
               ];

     

       266
        
               hosts = {

     

       267
       -
               # Zaphod, my personal Framework 16 laptop

     

       268
       -
               zaphod.modules = with inputs; [ hardware.nixosModules.framework-16-7040-amd ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       269
        
       

     

       270
       -
               # Prefect, my main VPS

     

       271
       -
               prefect.modules = with inputs; [

     

       272
       -
                 self.nixosModules.dn42Pingfinder

     

       273
       -
                 mailserver.nixosModule

     

       274
       -
               ];

     

       275
        
       

     

       276
       -
               # (Deep) Thought, a WIP VPS

     

       277
       -
               thought.modules = with inputs; [ self.nixosModules.dn42Pingfinder ];

     

       278
        
       

     

       279
       -
               # Marvin, my main homelab machine

     

       280
       -
               marvin.modules = with inputs; [

     

       281
       -
                 self.nixosModules.forgejoRunner

     

       282
       -
                 iceshrimp.nixosModules.default

     

       283
       -
                 golink.nixosModules.default

     

       284
       -
                 buildbot-nix.nixosModules.buildbot-master

     

       285
       -
                 buildbot-nix.nixosModules.buildbot-worker

     

       286
       -
               ];

     

       287
        
               };

     

       288
        
             };

     

       289
        
       

     

       290
       -
             outputs-builder =

     

       291
       -
               channels:

     

       292
       -
               {

     

       293
       -
                 # Define default packages to use everywhere

     

       294
       -
                 packages = {

     

       295
       -
                   nvim = inputs.nvim.packages.${channels.nixpkgs.system}.neovim;

     

       296
       -
                   customGit = channels.nixpkgs.git.override {

     

       297
       -
                     withLibsecret = true;

     

       298
       -
                     withSsh = true;

     

       299
       -
                   };

     

       300
        
                 };

     

       301
       -
                 formatter = channels.nixpkgs.nixfmt-rfc-style;

     

       302
        
               };

     

       0
        
       
     

       0
        
       
     

       303
        
           };

     

       304
        
       }

···

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

     

       4
        
           substitute = "true";

     

       5
        
           extra-substituters = [

     

       0
        
       
     

       6
        
             "https://cache.nixos.org"

     

       0
        
       
     

       7
        
             "https://colmena.cachix.org"

     

       0
        
       
     

       8
        
             "https://crane.cachix.org"

     

       0
        
       
     

       9
        
             "https://isabelroses.cachix.org"

     

       0
        
       
     

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

     

       0
        
       
     

       11
        
             "https://nixpkgs-wayland.cachix.org"

     

       0
        
       
     

       12
        
             "https://viperml.cachix.org"

     

       0
        
       
     

       13
        
             "https://cache.lix.systems"

     

       14
        
           ];

     

       15
        
           trusted-public-keys = [

     
···

       29
        
         description = "PyroNet machines and services";

     

       30
        
       

     

       31
        
         inputs = {

     

       0
        
       
     

       32
        
           snowfall = {

     

       33
        
             url = "github:snowfallorg/lib";

     

       34
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       35
        
           };

     

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

     

       37
       +
           stable.url = "github:nixos/nixpkgs/nixos-24.05";

     

       38
        
           nixpkgs-mesa.url = "github:K900/nixpkgs/mesa-24.1";

     

       39
        
           nixpkgs-nvim.url = "github:nixos/nixpkgs?rev=d5786c1b5dd2d560724b78f3ce51f1f4ef52d053";

     

       40
       +
           # Overrides

     

       41
        
           flake-compat.url = "github:edolstra/flake-compat";

     

       42
        
           systems.url = "github:nix-systems/default";

     

       43
        
           flake-parts = {

     
···

       49
        
             inputs.systems.follows = "systems";

     

       50
        
           };

     

       51
        
           nixpkgs-lib.url = "github:nix-community/nixpkgs.lib";

     

       52
       +
       

     

       53
       +
           # Inputs

     

       54
        
           agenix = {

     

       55
        
             url = "github:ryantm/agenix";

     

       56
        
             inputs = {

     
···

       107
        
             url = "git+https://iceshrimp.dev/pyrox/packaging";

     

       108
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       109
        
           };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       110
        
           lix = {

     

       111
        
             url = "git+https://git.lix.systems/lix-project/lix";

     

       112
        
             flake = false;

     
···

       224
        
               self.overlays.alejandra

     

       225
        
               self.overlays.mesa

     

       226
        
               self.overlays.nix-index

     

       227
       +
               self.overlays.nixos-option

     

       228
        
               inputs.my-pkgs.overlays.cinny

     

       229
        
               inputs.golink.overlay

     

       230
       +
               # inputs.lix-module.overlays.default

     

       0
        
       
     

       231
        
               inputs.neovim.overlay

     

       232
        
               inputs.nixd.overlays.default

     

       233
        
               inputs.nur.overlay

     
···

       246
        
       

     

       247
        
             # NixOS Configurations

     

       248
        
             systems = {

     

       249
       +
               # Modules for all systems

     

       250
        
               modules.nixos = with inputs; [

     

       251
        
                 ctp.nixosModules.catppuccin

     

       252
        
                 lix-module.nixosModules.default

     

       253
        
                 agenix.nixosModules.default

     

       254
        
               ];

     

       255
        
               hosts = {

     

       256
       +
                 # Zaphod, my personal Framework 16 laptop

     

       257
       +
                 zaphod.modules = with inputs; [

     

       258
       +
                   hardware.nixosModules.framework-16-7040-amd

     

       259
       +
                   lix-module.nixosModules.default

     

       260
       +
                 ];

     

       261
        
       

     

       262
       +
                 # Prefect, my main VPS

     

       263
       +
                 prefect.modules = with inputs; [ mailserver.nixosModule ];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       264
        
       

     

       265
       +
                 # (Deep) Thought, a WIP VPS

     

       266
       +
                 thought.modules = [ self.nixosModules.dn42Pingfinder ];

     

       267
        
       

     

       268
       +
                 # Marvin, my main homelab machine

     

       269
       +
                 marvin.modules = with inputs; [

     

       270
       +
                   iceshrimp.nixosModules.default

     

       271
       +
                   golink.nixosModules.default

     

       272
       +
                   buildbot-nix.nixosModules.buildbot-master

     

       273
       +
                   buildbot-nix.nixosModules.buildbot-worker

     

       274
       +
                 ];

     

       0
        
       
     

       275
        
               };

     

       276
        
             };

     

       277
        
       

     

       278
       +
             outputs-builder = channels: {

     

       279
       +
               # Define default packages to use everywhere

     

       280
       +
               packages = {

     

       281
       +
                 nvim = inputs.nvim.packages.${channels.nixpkgs.system}.neovim;

     

       282
       +
                 customGit = channels.nixpkgs.git.override {

     

       283
       +
                   withLibsecret = true;

     

       284
       +
                   withSsh = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       285
        
                 };

     

       0
        
       
     

       286
        
               };

     

       287
       +
               formatter = channels.nixpkgs.nixfmt-rfc-style;

     

       288
       +
             };

     

       289
        
           };

     

       290
        
       }