patch of add spindle to nixery box · round #0 · pull #1 · tangled.org/infra

+157 -1

flake.lock

···

       73
        
               "type": "github"

     

       74
        
             }

     

       75
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       76
        
           "nixery-flake": {

     

       77
        
             "flake": false,

     

       78
        
             "locked": {

     
···

       121
        
               "type": "github"

     

       122
        
             }

     

       123
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       124
        
           "root": {

     

       125
        
             "inputs": {

     

       126
        
               "colmena": "colmena",

     

       127
        
               "disko": "disko",

     

       128
        
               "nixery-flake": "nixery-flake",

     

       129
       -
               "nixpkgs": "nixpkgs_2"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       130
        
             }

     

       131
        
           },

     

       132
        
           "stable": {

     
···

       144
        
               "repo": "nixpkgs",

     

       145
        
               "type": "github"

     

       146
        
             }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       147
        
           }

     

       148
        
         },

     

       149
        
         "root": "root",

···

       73
        
               "type": "github"

     

       74
        
             }

     

       75
        
           },

     

       76
       +
           "gitignore": {

     

       77
       +
             "inputs": {

     

       78
       +
               "nixpkgs": [

     

       79
       +
                 "tangled",

     

       80
       +
                 "nixpkgs"

     

       81
       +
               ]

     

       82
       +
             },

     

       83
       +
             "locked": {

     

       84
       +
               "lastModified": 1709087332,

     

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

     

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

     

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

     

       88
       +
               "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",

     

       89
       +
               "type": "github"

     

       90
       +
             },

     

       91
       +
             "original": {

     

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

     

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

     

       94
       +
               "type": "github"

     

       95
       +
             }

     

       96
       +
           },

     

       97
       +
           "htmx-src": {

     

       98
       +
             "flake": false,

     

       99
       +
             "locked": {

     

       100
       +
               "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=",

     

       101
       +
               "type": "file",

     

       102
       +
               "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"

     

       103
       +
             },

     

       104
       +
             "original": {

     

       105
       +
               "type": "file",

     

       106
       +
               "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js"

     

       107
       +
             }

     

       108
       +
           },

     

       109
       +
           "htmx-ws-src": {

     

       110
       +
             "flake": false,

     

       111
       +
             "locked": {

     

       112
       +
               "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=",

     

       113
       +
               "type": "file",

     

       114
       +
               "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"

     

       115
       +
             },

     

       116
       +
             "original": {

     

       117
       +
               "type": "file",

     

       118
       +
               "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2"

     

       119
       +
             }

     

       120
       +
           },

     

       121
       +
           "ibm-plex-mono-src": {

     

       122
       +
             "flake": false,

     

       123
       +
             "locked": {

     

       124
       +
               "lastModified": 1731402384,

     

       125
       +
               "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=",

     

       126
       +
               "type": "tarball",

     

       127
       +
               "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"

     

       128
       +
             },

     

       129
       +
             "original": {

     

       130
       +
               "type": "tarball",

     

       131
       +
               "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"

     

       132
       +
             }

     

       133
       +
           },

     

       134
       +
           "indigo": {

     

       135
       +
             "flake": false,

     

       136
       +
             "locked": {

     

       137
       +
               "lastModified": 1745333930,

     

       138
       +
               "narHash": "sha256-83fIHqDE+dfnZ88HaNuwfKFO+R0RKAM1WxMfNh/Matk=",

     

       139
       +
               "owner": "oppiliappan",

     

       140
       +
               "repo": "indigo",

     

       141
       +
               "rev": "e4e59280737b8676611fc077a228d47b3e8e9491",

     

       142
       +
               "type": "github"

     

       143
       +
             },

     

       144
       +
             "original": {

     

       145
       +
               "owner": "oppiliappan",

     

       146
       +
               "repo": "indigo",

     

       147
       +
               "type": "github"

     

       148
       +
             }

     

       149
       +
           },

     

       150
       +
           "inter-fonts-src": {

     

       151
       +
             "flake": false,

     

       152
       +
             "locked": {

     

       153
       +
               "lastModified": 1731687360,

     

       154
       +
               "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=",

     

       155
       +
               "type": "tarball",

     

       156
       +
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       157
       +
             },

     

       158
       +
             "original": {

     

       159
       +
               "type": "tarball",

     

       160
       +
               "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip"

     

       161
       +
             }

     

       162
       +
           },

     

       163
       +
           "lucide-src": {

     

       164
       +
             "flake": false,

     

       165
       +
             "locked": {

     

       166
       +
               "lastModified": 1742302029,

     

       167
       +
               "narHash": "sha256-OyPVtpnC4/AAmPq84Wt1r1Gcs48d9KG+UBCtZK87e9k=",

     

       168
       +
               "type": "tarball",

     

       169
       +
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"

     

       170
       +
             },

     

       171
       +
             "original": {

     

       172
       +
               "type": "tarball",

     

       173
       +
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.483.0/lucide-icons-0.483.0.zip"

     

       174
       +
             }

     

       175
       +
           },

     

       176
        
           "nixery-flake": {

     

       177
        
             "flake": false,

     

       178
        
             "locked": {

     
···

       221
        
               "type": "github"

     

       222
        
             }

     

       223
        
           },

     

       224
       +
           "nixpkgs_3": {

     

       225
       +
             "locked": {

     

       226
       +
               "lastModified": 1746904237,

     

       227
       +
               "narHash": "sha256-3e+AVBczosP5dCLQmMoMEogM57gmZ2qrVSrmq9aResQ=",

     

       228
       +
               "owner": "nixos",

     

       229
       +
               "repo": "nixpkgs",

     

       230
       +
               "rev": "d89fc19e405cb2d55ce7cc114356846a0ee5e956",

     

       231
       +
               "type": "github"

     

       232
       +
             },

     

       233
       +
             "original": {

     

       234
       +
               "owner": "nixos",

     

       235
       +
               "ref": "nixos-unstable",

     

       236
       +
               "repo": "nixpkgs",

     

       237
       +
               "type": "github"

     

       238
       +
             }

     

       239
       +
           },

     

       240
        
           "root": {

     

       241
        
             "inputs": {

     

       242
        
               "colmena": "colmena",

     

       243
        
               "disko": "disko",

     

       244
        
               "nixery-flake": "nixery-flake",

     

       245
       +
               "nixpkgs": "nixpkgs_2",

     

       246
       +
               "tangled": "tangled"

     

       247
       +
             }

     

       248
       +
           },

     

       249
       +
           "sqlite-lib-src": {

     

       250
       +
             "flake": false,

     

       251
       +
             "locked": {

     

       252
       +
               "lastModified": 1706631843,

     

       253
       +
               "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=",

     

       254
       +
               "type": "tarball",

     

       255
       +
               "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip"

     

       256
       +
             },

     

       257
       +
             "original": {

     

       258
       +
               "type": "tarball",

     

       259
       +
               "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip"

     

       260
        
             }

     

       261
        
           },

     

       262
        
           "stable": {

     
···

       274
        
               "repo": "nixpkgs",

     

       275
        
               "type": "github"

     

       276
        
             }

     

       277
       +
           },

     

       278
       +
           "tangled": {

     

       279
       +
             "inputs": {

     

       280
       +
               "gitignore": "gitignore",

     

       281
       +
               "htmx-src": "htmx-src",

     

       282
       +
               "htmx-ws-src": "htmx-ws-src",

     

       283
       +
               "ibm-plex-mono-src": "ibm-plex-mono-src",

     

       284
       +
               "indigo": "indigo",

     

       285
       +
               "inter-fonts-src": "inter-fonts-src",

     

       286
       +
               "lucide-src": "lucide-src",

     

       287
       +
               "nixpkgs": "nixpkgs_3",

     

       288
       +
               "sqlite-lib-src": "sqlite-lib-src"

     

       289
       +
             },

     

       290
       +
             "locked": {

     

       291
       +
               "lastModified": 1751887204,

     

       292
       +
               "narHash": "sha256-ZWSyoH2zN6mJQYUzWnycoPIqY+S5HK5dXWvf6/4YMrg=",

     

       293
       +
               "ref": "refs/heads/master",

     

       294
       +
               "rev": "bcf82fd393c9c7db455a7a948d315ba1c20f7f52",

     

       295
       +
               "revCount": 878,

     

       296
       +
               "type": "git",

     

       297
       +
               "url": "https://tangled.sh/@tangled.sh/core"

     

       298
       +
             },

     

       299
       +
             "original": {

     

       300
       +
               "type": "git",

     

       301
       +
               "url": "https://tangled.sh/@tangled.sh/core"

     

       302
       +
             }

     

       303
        
           }

     

       304
        
         },

     

       305
        
         "root": "root",

+3 -1

flake.nix

···

       2
        
         description = "nix infra for tangled";

     

       3
        
         inputs = {

     

       4
        
           nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";

     

       0
        
       
     

       5
        
           colmena.url = "github:zhaofengli/colmena/release-0.4.x";

     

       6
        
           disko = {

     

       7
        
             url = "github:nix-community/disko";

     
···

       16
        
         };

     

       17
        
       

     

       18
        
         outputs =

     

       19
       -
           { nixpkgs, disko, colmena, nixery-flake, ... }:

     

       20
        
           {

     

       21
        
             nixosConfigurations.nixery = nixpkgs.lib.nixosSystem {

     

       22
        
               system = "x86_64-linux";

     

       23
        
               modules = [

     

       24
        
                 disko.nixosModules.disko

     

       0
        
       
     

       25
        
                 ./hosts/nixery/configuration.nix

     

       26
        
               ];

     

       27
        
             };

···

       2
        
         description = "nix infra for tangled";

     

       3
        
         inputs = {

     

       4
        
           nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";

     

       5
       +
           tangled.url = "git+https://tangled.sh/@tangled.sh/core";

     

       6
        
           colmena.url = "github:zhaofengli/colmena/release-0.4.x";

     

       7
        
           disko = {

     

       8
        
             url = "github:nix-community/disko";

     
···

       17
        
         };

     

       18
        
       

     

       19
        
         outputs =

     

       20
       +
           { nixpkgs, disko, colmena, nixery-flake, tangled, ... }:

     

       21
        
           {

     

       22
        
             nixosConfigurations.nixery = nixpkgs.lib.nixosSystem {

     

       23
        
               system = "x86_64-linux";

     

       24
        
               modules = [

     

       25
        
                 disko.nixosModules.disko

     

       26
       +
                 tangled.nixosModules.spindle

     

       27
        
                 ./hosts/nixery/configuration.nix

     

       28
        
               ];

     

       29
        
             };

hosts/nixery/configuration.nix

···

       19
        
         networking.hostName = "nixery";

     

       20
        
         services = {

     

       21
        
           openssh.enable = true;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       22
        
         };

     

       23
        
       

     

       24
        
         virtualisation.docker = {

···

       19
        
         networking.hostName = "nixery";

     

       20
        
         services = {

     

       21
        
           openssh.enable = true;

     

       22
       +
           tangled-spindle = {

     

       23
       +
             enable = true;

     

       24
       +
             server = {

     

       25
       +
               owner = "did:plc:hwevmowznbiukdf6uk5dwrrq";

     

       26
       +
               hostname = "spindle.tangled.sh";

     

       27
       +
               listenAddr = "0.0.0.0:6555";

     

       28
       +
             };

     

       29
       +
           };

     

       30
        
         };

     

       31
        
       

     

       32
        
         virtualisation.docker = {