commit 5cb378f61bf5891d6d5a03ac18b4d04f35bdad06 · pyrox.dev/nix

+191 -1

flake.lock

···

       276
       276
        
               "type": "github"

     

       277
       277
        
             }

     

       278
       278
        
           },

     

       279
       279
       +
           "devshell": {

     

       280
       280
       +
             "inputs": {

     

       281
       281
       +
               "flake-utils": "flake-utils_4",

     

       282
       282
       +
               "nixpkgs": [

     

       283
       283
       +
                 "topology",

     

       284
       284
       +
                 "nixpkgs"

     

       285
       285
       +
               ]

     

       286
       286
       +
             },

     

       287
       287
       +
             "locked": {

     

       288
       288
       +
               "lastModified": 1713532798,

     

       289
       289
       +
               "narHash": "sha256-wtBhsdMJA3Wa32Wtm1eeo84GejtI43pMrFrmwLXrsEc=",

     

       290
       290
       +
               "owner": "numtide",

     

       291
       291
       +
               "repo": "devshell",

     

       292
       292
       +
               "rev": "12e914740a25ea1891ec619bb53cf5e6ca922e40",

     

       293
       293
       +
               "type": "github"

     

       294
       294
       +
             },

     

       295
       295
       +
             "original": {

     

       296
       296
       +
               "owner": "numtide",

     

       297
       297
       +
               "repo": "devshell",

     

       298
       298
       +
               "type": "github"

     

       299
       299
       +
             }

     

       300
       300
       +
           },

     

       279
       301
        
           "dns": {

     

       280
       302
        
             "inputs": {

     

       281
       303
        
               "flake-utils": [

     
···

       376
       398
        
               "owner": "edolstra",

     

       377
       399
        
               "repo": "flake-compat",

     

       378
       400
        
               "rev": "b4a34015c698c7793d592d66adbab377907a2be8",

     

       401
       401
       +
               "type": "github"

     

       402
       402
       +
             },

     

       403
       403
       +
             "original": {

     

       404
       404
       +
               "owner": "edolstra",

     

       405
       405
       +
               "repo": "flake-compat",

     

       406
       406
       +
               "type": "github"

     

       407
       407
       +
             }

     

       408
       408
       +
           },

     

       409
       409
       +
           "flake-compat_5": {

     

       410
       410
       +
             "flake": false,

     

       411
       411
       +
             "locked": {

     

       412
       412
       +
               "lastModified": 1696426674,

     

       413
       413
       +
               "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",

     

       414
       414
       +
               "owner": "edolstra",

     

       415
       415
       +
               "repo": "flake-compat",

     

       416
       416
       +
               "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",

     

       379
       417
        
               "type": "github"

     

       380
       418
        
             },

     

       381
       419
        
             "original": {

     
···

       539
       577
        
               "systems": "systems_4"

     

       540
       578
        
             },

     

       541
       579
        
             "locked": {

     

       580
       580
       +
               "lastModified": 1701680307,

     

       581
       581
       +
               "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",

     

       582
       582
       +
               "owner": "numtide",

     

       583
       583
       +
               "repo": "flake-utils",

     

       584
       584
       +
               "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",

     

       585
       585
       +
               "type": "github"

     

       586
       586
       +
             },

     

       587
       587
       +
             "original": {

     

       588
       588
       +
               "owner": "numtide",

     

       589
       589
       +
               "repo": "flake-utils",

     

       590
       590
       +
               "type": "github"

     

       591
       591
       +
             }

     

       592
       592
       +
           },

     

       593
       593
       +
           "flake-utils_5": {

     

       594
       594
       +
             "inputs": {

     

       595
       595
       +
               "systems": "systems_5"

     

       596
       596
       +
             },

     

       597
       597
       +
             "locked": {

     

       542
       598
        
               "lastModified": 1710146030,

     

       543
       599
        
               "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",

     

       544
       600
        
               "owner": "numtide",

     
···

       620
       676
        
             "inputs": {

     

       621
       677
        
               "nixpkgs": [

     

       622
       678
        
                 "prismlauncher",

     

       679
       679
       +
                 "pre-commit-hooks",

     

       680
       680
       +
                 "nixpkgs"

     

       681
       681
       +
               ]

     

       682
       682
       +
             },

     

       683
       683
       +
             "locked": {

     

       684
       684
       +
               "lastModified": 1709087332,

     

       685
       685
       +
               "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",

     

       686
       686
       +
               "owner": "hercules-ci",

     

       687
       687
       +
               "repo": "gitignore.nix",

     

       688
       688
       +
               "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",

     

       689
       689
       +
               "type": "github"

     

       690
       690
       +
             },

     

       691
       691
       +
             "original": {

     

       692
       692
       +
               "owner": "hercules-ci",

     

       693
       693
       +
               "repo": "gitignore.nix",

     

       694
       694
       +
               "type": "github"

     

       695
       695
       +
             }

     

       696
       696
       +
           },

     

       697
       697
       +
           "gitignore_3": {

     

       698
       698
       +
             "inputs": {

     

       699
       699
       +
               "nixpkgs": [

     

       700
       700
       +
                 "topology",

     

       623
       701
        
                 "pre-commit-hooks",

     

       624
       702
        
                 "nixpkgs"

     

       625
       703
        
               ]

     
···

       740
       818
        
           },

     

       741
       819
        
           "lib-aggregate": {

     

       742
       820
        
             "inputs": {

     

       743
       743
       -
               "flake-utils": "flake-utils_4",

     

       821
       821
       +
               "flake-utils": "flake-utils_5",

     

       744
       822
        
               "nixpkgs-lib": "nixpkgs-lib_2"

     

       745
       823
        
             },

     

       746
       824
        
             "locked": {

     
···

       1087
       1165
        
               "type": "github"

     

       1088
       1166
        
             }

     

       1089
       1167
        
           },

     

       1168
       1168
       +
           "nix-search": {

     

       1169
       1169
       +
             "inputs": {

     

       1170
       1170
       +
               "flake-compat": [

     

       1171
       1171
       +
                 "flake-compat"

     

       1172
       1172
       +
               ],

     

       1173
       1173
       +
               "flake-utils": [

     

       1174
       1174
       +
                 "flake-utils"

     

       1175
       1175
       +
               ],

     

       1176
       1176
       +
               "nixpkgs": [

     

       1177
       1177
       +
                 "nixpkgs"

     

       1178
       1178
       +
               ]

     

       1179
       1179
       +
             },

     

       1180
       1180
       +
             "locked": {

     

       1181
       1181
       +
               "lastModified": 1720284519,

     

       1182
       1182
       +
               "narHash": "sha256-GAGgfUXXgXdxZOtoJ9kE9Kby/7mthcSA/1Oh7nR3o0U=",

     

       1183
       1183
       +
               "owner": "diamondburned",

     

       1184
       1184
       +
               "repo": "nix-search",

     

       1185
       1185
       +
               "rev": "b075a39227150cce4af9452621c0eb5ce92790f0",

     

       1186
       1186
       +
               "type": "github"

     

       1187
       1187
       +
             },

     

       1188
       1188
       +
             "original": {

     

       1189
       1189
       +
               "owner": "diamondburned",

     

       1190
       1190
       +
               "repo": "nix-search",

     

       1191
       1191
       +
               "type": "github"

     

       1192
       1192
       +
             }

     

       1193
       1193
       +
           },

     

       1090
       1194
        
           "nixd": {

     

       1091
       1195
        
             "inputs": {

     

       1092
       1196
        
               "flake-parts": [

     
···

       1227
       1331
        
               "type": "github"

     

       1228
       1332
        
             }

     

       1229
       1333
        
           },

     

       1334
       1334
       +
           "nixpkgs-stable_2": {

     

       1335
       1335
       +
             "locked": {

     

       1336
       1336
       +
               "lastModified": 1710695816,

     

       1337
       1337
       +
               "narHash": "sha256-3Eh7fhEID17pv9ZxrPwCLfqXnYP006RKzSs0JptsN84=",

     

       1338
       1338
       +
               "owner": "NixOS",

     

       1339
       1339
       +
               "repo": "nixpkgs",

     

       1340
       1340
       +
               "rev": "614b4613980a522ba49f0d194531beddbb7220d3",

     

       1341
       1341
       +
               "type": "github"

     

       1342
       1342
       +
             },

     

       1343
       1343
       +
             "original": {

     

       1344
       1344
       +
               "owner": "NixOS",

     

       1345
       1345
       +
               "ref": "nixos-23.11",

     

       1346
       1346
       +
               "repo": "nixpkgs",

     

       1347
       1347
       +
               "type": "github"

     

       1348
       1348
       +
             }

     

       1349
       1349
       +
           },

     

       1230
       1350
        
           "nixpkgs_2": {

     

       1231
       1351
        
             "locked": {

     

       1232
       1352
        
               "lastModified": 1719285171,

     
···

       1361
       1481
        
               "type": "github"

     

       1362
       1482
        
             }

     

       1363
       1483
        
           },

     

       1484
       1484
       +
           "pre-commit-hooks_2": {

     

       1485
       1485
       +
             "inputs": {

     

       1486
       1486
       +
               "flake-compat": "flake-compat_5",

     

       1487
       1487
       +
               "flake-utils": [

     

       1488
       1488
       +
                 "topology",

     

       1489
       1489
       +
                 "flake-utils"

     

       1490
       1490
       +
               ],

     

       1491
       1491
       +
               "gitignore": "gitignore_3",

     

       1492
       1492
       +
               "nixpkgs": [

     

       1493
       1493
       +
                 "topology",

     

       1494
       1494
       +
                 "nixpkgs"

     

       1495
       1495
       +
               ],

     

       1496
       1496
       +
               "nixpkgs-stable": "nixpkgs-stable_2"

     

       1497
       1497
       +
             },

     

       1498
       1498
       +
             "locked": {

     

       1499
       1499
       +
               "lastModified": 1714478972,

     

       1500
       1500
       +
               "narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",

     

       1501
       1501
       +
               "owner": "cachix",

     

       1502
       1502
       +
               "repo": "pre-commit-hooks.nix",

     

       1503
       1503
       +
               "rev": "2849da033884f54822af194400f8dff435ada242",

     

       1504
       1504
       +
               "type": "github"

     

       1505
       1505
       +
             },

     

       1506
       1506
       +
             "original": {

     

       1507
       1507
       +
               "owner": "cachix",

     

       1508
       1508
       +
               "repo": "pre-commit-hooks.nix",

     

       1509
       1509
       +
               "type": "github"

     

       1510
       1510
       +
             }

     

       1511
       1511
       +
           },

     

       1364
       1512
        
           "prismlauncher": {

     

       1365
       1513
        
             "inputs": {

     

       1366
       1514
        
               "flake-compat": [

     
···

       1414
       1562
        
               "nh": "nh",

     

       1415
       1563
        
               "nix-index": "nix-index",

     

       1416
       1564
        
               "nix-index-database": "nix-index-database",

     

       1565
       1565
       +
               "nix-search": "nix-search",

     

       1417
       1566
        
               "nixd": "nixd",

     

       1418
       1567
        
               "nixos-generators": "nixos-generators",

     

       1419
       1568
        
               "nixpkgs": "nixpkgs_2",

     
···

       1425
       1574
        
               "snowfall-lib": "snowfall-lib",

     

       1426
       1575
        
               "stable": "stable",

     

       1427
       1576
        
               "systems": "systems_3",

     

       1577
       1577
       +
               "topology": "topology",

     

       1428
       1578
        
               "wayland": "wayland"

     

       1429
       1579
        
             }

     

       1430
       1580
        
           },

     
···

       1539
       1689
        
             "original": {

     

       1540
       1690
        
               "owner": "nix-systems",

     

       1541
       1691
        
               "repo": "default",

     

       1692
       1692
       +
               "type": "github"

     

       1693
       1693
       +
             }

     

       1694
       1694
       +
           },

     

       1695
       1695
       +
           "systems_5": {

     

       1696
       1696
       +
             "locked": {

     

       1697
       1697
       +
               "lastModified": 1681028828,

     

       1698
       1698
       +
               "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",

     

       1699
       1699
       +
               "owner": "nix-systems",

     

       1700
       1700
       +
               "repo": "default",

     

       1701
       1701
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       1702
       1702
       +
               "type": "github"

     

       1703
       1703
       +
             },

     

       1704
       1704
       +
             "original": {

     

       1705
       1705
       +
               "owner": "nix-systems",

     

       1706
       1706
       +
               "repo": "default",

     

       1707
       1707
       +
               "type": "github"

     

       1708
       1708
       +
             }

     

       1709
       1709
       +
           },

     

       1710
       1710
       +
           "topology": {

     

       1711
       1711
       +
             "inputs": {

     

       1712
       1712
       +
               "devshell": "devshell",

     

       1713
       1713
       +
               "flake-utils": [

     

       1714
       1714
       +
                 "flake-utils"

     

       1715
       1715
       +
               ],

     

       1716
       1716
       +
               "nixpkgs": [

     

       1717
       1717
       +
                 "nixpkgs"

     

       1718
       1718
       +
               ],

     

       1719
       1719
       +
               "pre-commit-hooks": "pre-commit-hooks_2"

     

       1720
       1720
       +
             },

     

       1721
       1721
       +
             "locked": {

     

       1722
       1722
       +
               "lastModified": 1715634843,

     

       1723
       1723
       +
               "narHash": "sha256-YrECYhEXY7g8Ji5luq8mdRaLRGiwTPCSDEeVP91DyDY=",

     

       1724
       1724
       +
               "owner": "oddlama",

     

       1725
       1725
       +
               "repo": "nix-topology",

     

       1726
       1726
       +
               "rev": "9ed5c7b5c5cd5bed9e204e8b9d69f4be1954abd3",

     

       1727
       1727
       +
               "type": "github"

     

       1728
       1728
       +
             },

     

       1729
       1729
       +
             "original": {

     

       1730
       1730
       +
               "owner": "oddlama",

     

       1731
       1731
       +
               "repo": "nix-topology",

     

       1542
       1732
        
               "type": "github"

     

       1543
       1733
        
             }

     

       1544
       1734
        
           },

+34 -10

flake.nix

···

       137
       137
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       138
       138
        
             inputs.flake-utils.follows = "flake-utils";

     

       139
       139
        
           };

     

       140
       140
       +
           nix-search = {

     

       141
       141
       +
             url = "github:diamondburned/nix-search";

     

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

     

       143
       143
       +
             inputs.flake-utils.follows = "flake-utils";

     

       144
       144
       +
             inputs.flake-compat.follows = "flake-compat";

     

       145
       145
       +
           };

     

       140
       146
        
           nixos-generators = {

     

       141
       147
        
             url = "github:nix-community/nixos-generators";

     

       142
       148
        
             inputs.nixpkgs.follows = "nixpkgs";

     
···

       180
       186
        
           my-pkgs = {

     

       181
       187
        
             url = "git+https://git.pyrox.dev/pyrox/pkgs";

     

       182
       188
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       189
       189
       +
           };

     

       190
       190
       +
           topology = {

     

       191
       191
       +
             url = "github:oddlama/nix-topology";

     

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

     

       193
       193
       +
             inputs.flake-utils.follows = "flake-utils";

     

       183
       194
        
           };

     

       184
       195
        
           wayland = {

     

       185
       196
        
             url = "github:nix-community/nixpkgs-wayland";

     
···

       204
       215
        
                 namespace = "py";

     

       205
       216
        
               };

     

       206
       217
        
             };

     

       207
       207
       -
           in

     

       208
       208
       -
           lib.mkFlake {

     

       209
       209
       -
             # Nixpkgs configuration

     

       210
       210
       -
             channels-config = {

     

       211
       211
       -
               allowUnfree = true;

     

       212
       212
       -
             };

     

       213
       213
       -
       

     

       214
       214
       -
             # Overlays for Nixpkgs.

     

       215
       218
        
             overlays = [

     

       216
       219
        
               self.overlays.pyronet-packages

     

       217
       220
        
               self.overlays.nix-index

     
···

       222
       225
        
               inputs.nixd.overlays.default

     

       223
       226
        
               inputs.nur.overlay

     

       224
       227
        
               inputs.prismlauncher.overlays.default

     

       228
       228
       +
               inputs.topology.overlays.default

     

       225
       229
        
               inputs.wayland.overlays.default

     

       226
       230
        
             ];

     

       231
       231
       +
           in

     

       232
       232
       +
           lib.mkFlake {

     

       233
       233
       +
             # Nixpkgs configuration

     

       234
       234
       +
             channels-config = {

     

       235
       235
       +
               allowUnfree = true;

     

       236
       236
       +
             };

     

       237
       237
       +
       

     

       238
       238
       +
             # Overlays for Nixpkgs.

     

       239
       239
       +
             inherit overlays;

     

       227
       240
        
       

     

       228
       241
        
             # Home-manager configurations

     

       229
       242
        
             homes = {

     
···

       242
       255
        
                 buildbot-nix.nixosModules.buildbot-worker

     

       243
       256
        
                 ctp.nixosModules.catppuccin

     

       244
       257
        
                 lix-module.nixosModules.default

     

       258
       258
       +
                 topology.nixosModules.default

     

       245
       259
        
               ];

     

       246
       260
        
               hosts = {

     

       247
       261
        
                 # Zaphod, my personal Framework 16 laptop

     
···

       274
       288
        
               # Export packages and systems as checks for buildbot-nix

     

       275
       289
        
               checks =

     

       276
       290
        
                 let

     

       277
       277
       -
                   pkgs = channels.nixpkgs;

     

       278
       278
       -
                   inherit (pkgs) system;

     

       291
       291
       +
                   inherit (channels.nixpkgs) system;

     

       279
       292
        
                   packages = lib.mapAttrs' (n: lib.nameValuePair "package-${n}") self.packages.${system};

     

       280
       293
        
                   devShells = lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self.devShells.${system};

     

       281
       294
        
                 in

     

       282
       295
        
                 packages // devShells;

     

       283
       296
        
             };

     

       284
       297
        
             deploy = lib.mkDeploy { inherit (inputs) self; };

     

       298
       298
       +
             topology = import inputs.topology {

     

       299
       299
       +
               pkgs = import inputs.nixpkgs {

     

       300
       300
       +
                 inherit overlays;

     

       301
       301
       +
                 system = "x86_64-linux";

     

       302
       302
       +
               };

     

       303
       303
       +
               modules = [

     

       304
       304
       +
                 ./topology.nix

     

       305
       305
       +
                 { nixosConfigurations = self.nixosConfigurations; }

     

       306
       306
       +
               ];

     

       307
       307
       +
             };

     

       308
       308
       +
       

     

       285
       309
        
           };

     

       286
       310
        
       }

+78

topology.nix

···

       1
       1
       +
       { config, ... }:

     

       2
       2
       +
       let

     

       3
       3
       +
         inherit (config.lib.topology) mkInternet mkConnection;

     

       4
       4
       +
         mkTS = addresses: {

     

       5
       5
       +
           inherit addresses;

     

       6
       6
       +
           network = "tailscale";

     

       7
       7
       +
           virtual = true;

     

       8
       8
       +
         };

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         topology = {

     

       12
       12
       +
       

     

       13
       13
       +
         };

     

       14
       14
       +
         nodes.internet = mkInternet {

     

       15
       15
       +
           connections = [

     

       16
       16
       +
             (mkConnection "marvin" "wlp41s0")

     

       17
       17
       +
             (mkConnection "prefect" "enp1s0")

     

       18
       18
       +
             (mkConnection "thought" "enp1s0")

     

       19
       19
       +
             (mkConnection "zaphod" "wlp1s0")

     

       20
       20
       +
           ];

     

       21
       21
       +
         };

     

       22
       22
       +
         networks.tailscale = {

     

       23
       23
       +
           name = "Tailscale";

     

       24
       24
       +
           cidrv4 = "100.64.0.0/10";

     

       25
       25
       +
           cidrv6 = "fd7a:115c:a1e0::/96";

     

       26
       26
       +
         };

     

       27
       27
       +
         nodes = {

     

       28
       28
       +
           marvin = {

     

       29
       29
       +
             interfaces.enp42s0 = {

     

       30
       30
       +
               renderer.hidePhysicalConnections = true;

     

       31
       31
       +
             };

     

       32
       32
       +
             interfaces.tailscale0 =

     

       33
       33
       +
               mkTS [

     

       34
       34
       +
                 "100.123.15.72"

     

       35
       35
       +
                 "\n"

     

       36
       36
       +
                 "fd7a:115c:a1e0:ab12:4843:cd96:627b:f48"

     

       37
       37
       +
               ]

     

       38
       38
       +
               // {

     

       39
       39
       +
                 physicalConnections = [

     

       40
       40
       +
                   (mkConnection "prefect" "tailscale0")

     

       41
       41
       +
                   (mkConnection "marvin" "tailscale0")

     

       42
       42
       +
                 ];

     

       43
       43
       +
               };

     

       44
       44
       +
           };

     

       45
       45
       +
           zaphod = {

     

       46
       46
       +
             interfaces = {

     

       47
       47
       +
               vboxnet0.virtual = true;

     

       48
       48
       +
               tailscale0 =

     

       49
       49
       +
                 mkTS [

     

       50
       50
       +
                   "100.125.9.36"

     

       51
       51
       +
                   ""

     

       52
       52
       +
                   "fd7a:115c:a1e0:ab12:4843:cd96:627d:924"

     

       53
       53
       +
                 ]

     

       54
       54
       +
                 // {

     

       55
       55
       +
                   physicalConnections = [

     

       56
       56
       +
                     (mkConnection "prefect" "tailscale0")

     

       57
       57
       +
                     (mkConnection "marvin" "tailscale0")

     

       58
       58
       +
                   ];

     

       59
       59
       +
                 };

     

       60
       60
       +
             };

     

       61
       61
       +
           };

     

       62
       62
       +
           prefect = {

     

       63
       63
       +
             interfaces.tailscale0 =

     

       64
       64
       +
               mkTS [

     

       65
       65
       +
                 "100.93.63.54"

     

       66
       66
       +
                 "\n"

     

       67
       67
       +
                 "fd7a:115c:a1e0:ab12:4843:cd96:625d:3f36"

     

       68
       68
       +
               ]

     

       69
       69
       +
               // {

     

       70
       70
       +
                 physicalConnections = [

     

       71
       71
       +
                   (mkConnection "marvin" "tailscale0")

     

       72
       72
       +
                   (mkConnection "zaphod" "tailscale0")

     

       73
       73
       +
                 ];

     

       74
       74
       +
               };

     

       75
       75
       +
           };

     

       76
       76
       +
           thought = { };

     

       77
       77
       +
         };

     

       78
       78
       +
       }