comparing b224c82f30784681627583e3469f1896c87142ed and master on sapphic.moe/flake

+232 -25

flake.lock

···

       31
       31
        
               ]

     

       32
       32
        
             },

     

       33
       33
        
             "locked": {

     

       34
       34
       -
               "lastModified": 1761906071,

     

       35
       35
       -
               "narHash": "sha256-uq0X0KRzZkKGlkU1ARM+LWCAVvSYJZtTMpuzMO6LXRs=",

     

       34
       34
       +
               "lastModified": 1762198582,

     

       35
       35
       +
               "narHash": "sha256-P9giW/1Crn7ekQt4YIbONJ/hKFaHkTwyhz82FCjh+OM=",

     

       36
       36
        
               "owner": "catppuccin",

     

       37
       37
        
               "repo": "nix",

     

       38
       38
       -
               "rev": "fd1bc7b1af0a576edb13c166c4b1f7b5c7555a73",

     

       38
       38
       +
               "rev": "08716214674ca27914daa52e6fa809cc022b581e",

     

       39
       39
        
               "type": "github"

     

       40
       40
        
             },

     

       41
       41
        
             "original": {

     
···

       82
       82
        
               "type": "github"

     

       83
       83
        
             }

     

       84
       84
        
           },

     

       85
       85
       +
           "darwin-login-items": {

     

       86
       86
       +
             "locked": {

     

       87
       87
       +
               "lastModified": 1763528199,

     

       88
       88
       +
               "narHash": "sha256-8LQ5Wp3AJUp71Elax1R9lNkuEbO2Mrnpq+o8qpbhQyc=",

     

       89
       89
       +
               "owner": "uncenter",

     

       90
       90
       +
               "repo": "nix-darwin-login-items",

     

       91
       91
       +
               "rev": "ab75c315893ca206ddf9529e6e3aac6cb01b2f1a",

     

       92
       92
       +
               "type": "github"

     

       93
       93
       +
             },

     

       94
       94
       +
             "original": {

     

       95
       95
       +
               "owner": "uncenter",

     

       96
       96
       +
               "repo": "nix-darwin-login-items",

     

       97
       97
       +
               "type": "github"

     

       98
       98
       +
             }

     

       99
       99
       +
           },

     

       85
       100
        
           "easy-hosts": {

     

       86
       101
        
             "locked": {

     

       87
       102
        
               "lastModified": 1755470564,

     
···

       100
       115
        
           "flake-compat": {

     

       101
       116
        
             "flake": false,

     

       102
       117
        
             "locked": {

     

       103
       103
       -
               "lastModified": 1747046372,

     

       104
       104
       -
               "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",

     

       118
       118
       +
               "lastModified": 1761588595,

     

       119
       119
       +
               "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=",

     

       105
       120
        
               "owner": "edolstra",

     

       106
       121
        
               "repo": "flake-compat",

     

       107
       107
       -
               "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",

     

       122
       122
       +
               "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",

     

       108
       123
        
               "type": "github"

     

       109
       124
        
             },

     

       110
       125
        
             "original": {

     
···

       145
       160
        
               "type": "github"

     

       146
       161
        
             }

     

       147
       162
        
           },

     

       163
       163
       +
           "flake-compat_4": {

     

       164
       164
       +
             "flake": false,

     

       165
       165
       +
             "locked": {

     

       166
       166
       +
               "lastModified": 1751685974,

     

       167
       167
       +
               "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=",

     

       168
       168
       +
               "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1",

     

       169
       169
       +
               "type": "tarball",

     

       170
       170
       +
               "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1"

     

       171
       171
       +
             },

     

       172
       172
       +
             "original": {

     

       173
       173
       +
               "type": "tarball",

     

       174
       174
       +
               "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"

     

       175
       175
       +
             }

     

       176
       176
       +
           },

     

       148
       177
        
           "flake-parts": {

     

       149
       178
        
             "inputs": {

     

       150
       179
        
               "nixpkgs-lib": "nixpkgs-lib"

     

       151
       180
        
             },

     

       152
       181
        
             "locked": {

     

       153
       153
       -
               "lastModified": 1760948891,

     

       154
       154
       -
               "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=",

     

       182
       182
       +
               "lastModified": 1762040540,

     

       183
       183
       +
               "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=",

     

       155
       184
        
               "owner": "hercules-ci",

     

       156
       185
        
               "repo": "flake-parts",

     

       157
       157
       -
               "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04",

     

       186
       186
       +
               "rev": "0010412d62a25d959151790968765a70c436598b",

     

       158
       187
        
               "type": "github"

     

       159
       188
        
             },

     

       160
       189
        
             "original": {

     
···

       218
       247
        
               "type": "github"

     

       219
       248
        
             }

     

       220
       249
        
           },

     

       250
       250
       +
           "flake-utils_3": {

     

       251
       251
       +
             "inputs": {

     

       252
       252
       +
               "systems": "systems_4"

     

       253
       253
       +
             },

     

       254
       254
       +
             "locked": {

     

       255
       255
       +
               "lastModified": 1694529238,

     

       256
       256
       +
               "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=",

     

       257
       257
       +
               "owner": "numtide",

     

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

     

       259
       259
       +
               "rev": "ff7b65b44d01cf9ba6a71320833626af21126384",

     

       260
       260
       +
               "type": "github"

     

       261
       261
       +
             },

     

       262
       262
       +
             "original": {

     

       263
       263
       +
               "owner": "numtide",

     

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

     

       265
       265
       +
               "type": "github"

     

       266
       266
       +
             }

     

       267
       267
       +
           },

     

       268
       268
       +
           "gomod2nix": {

     

       269
       269
       +
             "inputs": {

     

       270
       270
       +
               "flake-utils": "flake-utils_3",

     

       271
       271
       +
               "nixpkgs": [

     

       272
       272
       +
                 "tangled",

     

       273
       273
       +
                 "nixpkgs"

     

       274
       274
       +
               ]

     

       275
       275
       +
             },

     

       276
       276
       +
             "locked": {

     

       277
       277
       +
               "lastModified": 1754078208,

     

       278
       278
       +
               "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=",

     

       279
       279
       +
               "owner": "nix-community",

     

       280
       280
       +
               "repo": "gomod2nix",

     

       281
       281
       +
               "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf",

     

       282
       282
       +
               "type": "github"

     

       283
       283
       +
             },

     

       284
       284
       +
             "original": {

     

       285
       285
       +
               "owner": "nix-community",

     

       286
       286
       +
               "repo": "gomod2nix",

     

       287
       287
       +
               "type": "github"

     

       288
       288
       +
             }

     

       289
       289
       +
           },

     

       221
       290
        
           "home-manager": {

     

       222
       291
        
             "inputs": {

     

       223
       292
        
               "nixpkgs": [

     
···

       225
       294
        
               ]

     

       226
       295
        
             },

     

       227
       296
        
             "locked": {

     

       228
       228
       -
               "lastModified": 1761878381,

     

       229
       229
       -
               "narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=",

     

       297
       297
       +
               "lastModified": 1762286824,

     

       298
       298
       +
               "narHash": "sha256-xwfiYyn210aNIE/JKc6qmU7qd0619JaYMOGuFKNm9oc=",

     

       230
       299
        
               "owner": "nix-community",

     

       231
       300
        
               "repo": "home-manager",

     

       232
       232
       -
               "rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa",

     

       301
       301
       +
               "rev": "1c75dd70229171f47ff10f4ed184101af7c7a392",

     

       233
       302
        
               "type": "github"

     

       234
       303
        
             },

     

       235
       304
        
             "original": {

     
···

       260
       329
        
               "type": "github"

     

       261
       330
        
             }

     

       262
       331
        
           },

     

       332
       332
       +
           "htmx-src": {

     

       333
       333
       +
             "flake": false,

     

       334
       334
       +
             "locked": {

     

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

     

       336
       336
       +
               "type": "file",

     

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

     

       338
       338
       +
             },

     

       339
       339
       +
             "original": {

     

       340
       340
       +
               "type": "file",

     

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

     

       342
       342
       +
             }

     

       343
       343
       +
           },

     

       344
       344
       +
           "htmx-ws-src": {

     

       345
       345
       +
             "flake": false,

     

       346
       346
       +
             "locked": {

     

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

     

       348
       348
       +
               "type": "file",

     

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

     

       350
       350
       +
             },

     

       351
       351
       +
             "original": {

     

       352
       352
       +
               "type": "file",

     

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

     

       354
       354
       +
             }

     

       355
       355
       +
           },

     

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

     

       357
       357
       +
             "flake": false,

     

       358
       358
       +
             "locked": {

     

       359
       359
       +
               "lastModified": 1731402384,

     

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

     

       361
       361
       +
               "type": "tarball",

     

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

     

       363
       363
       +
             },

     

       364
       364
       +
             "original": {

     

       365
       365
       +
               "type": "tarball",

     

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

     

       367
       367
       +
             }

     

       368
       368
       +
           },

     

       369
       369
       +
           "indigo": {

     

       370
       370
       +
             "flake": false,

     

       371
       371
       +
             "locked": {

     

       372
       372
       +
               "lastModified": 1753693716,

     

       373
       373
       +
               "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=",

     

       374
       374
       +
               "owner": "oppiliappan",

     

       375
       375
       +
               "repo": "indigo",

     

       376
       376
       +
               "rev": "5f170569da9360f57add450a278d73538092d8ca",

     

       377
       377
       +
               "type": "github"

     

       378
       378
       +
             },

     

       379
       379
       +
             "original": {

     

       380
       380
       +
               "owner": "oppiliappan",

     

       381
       381
       +
               "repo": "indigo",

     

       382
       382
       +
               "type": "github"

     

       383
       383
       +
             }

     

       384
       384
       +
           },

     

       385
       385
       +
           "inter-fonts-src": {

     

       386
       386
       +
             "flake": false,

     

       387
       387
       +
             "locked": {

     

       388
       388
       +
               "lastModified": 1731687360,

     

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

     

       390
       390
       +
               "type": "tarball",

     

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

     

       392
       392
       +
             },

     

       393
       393
       +
             "original": {

     

       394
       394
       +
               "type": "tarball",

     

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

     

       396
       396
       +
             }

     

       397
       397
       +
           },

     

       398
       398
       +
           "lucide-src": {

     

       399
       399
       +
             "flake": false,

     

       400
       400
       +
             "locked": {

     

       401
       401
       +
               "lastModified": 1754044466,

     

       402
       402
       +
               "narHash": "sha256-+exBR2OToB1iv7ZQI2S4B0lXA/QRvC9n6U99UxGpJGs=",

     

       403
       403
       +
               "type": "tarball",

     

       404
       404
       +
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"

     

       405
       405
       +
             },

     

       406
       406
       +
             "original": {

     

       407
       407
       +
               "type": "tarball",

     

       408
       408
       +
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"

     

       409
       409
       +
             }

     

       410
       410
       +
           },

     

       263
       411
        
           "nil": {

     

       264
       412
        
             "inputs": {

     

       265
       413
        
               "nixpkgs": [

     
···

       287
       435
        
               ]

     

       288
       436
        
             },

     

       289
       437
        
             "locked": {

     

       290
       290
       -
               "lastModified": 1761339987,

     

       291
       291
       -
               "narHash": "sha256-IUaawVwItZKi64IA6kF6wQCLCzpXbk2R46dHn8sHkig=",

     

       438
       438
       +
               "lastModified": 1762186368,

     

       439
       439
       +
               "narHash": "sha256-dzLBZKccS0jMefj+WAYwsk7gKDluqavC7I4KfFwVh8k=",

     

       292
       440
        
               "owner": "nix-darwin",

     

       293
       441
        
               "repo": "nix-darwin",

     

       294
       294
       -
               "rev": "7cd9aac79ee2924a85c211d21fafd394b06a38de",

     

       442
       442
       +
               "rev": "69921864a70b58787abf5ba189095566c3f0ffd3",

     

       295
       443
        
               "type": "github"

     

       296
       444
        
             },

     

       297
       445
        
             "original": {

     
···

       308
       456
        
               ]

     

       309
       457
        
             },

     

       310
       458
        
             "locked": {

     

       311
       311
       -
               "lastModified": 1761563673,

     

       312
       312
       -
               "narHash": "sha256-d+1TpVAmRjcNBfjZsh2yQSdwUfN7Xgz1blJ185g73+A=",

     

       459
       459
       +
               "lastModified": 1762251193,

     

       460
       460
       +
               "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=",

     

       313
       461
        
               "owner": "nix-community",

     

       314
       462
        
               "repo": "NixOS-WSL",

     

       315
       315
       -
               "rev": "a518cf710e5ebb935518dc7ac98e07e7ee5014c3",

     

       463
       463
       +
               "rev": "e001844d4553aef268f97b32d3a825b6370eed91",

     

       316
       464
        
               "type": "github"

     

       317
       465
        
             },

     

       318
       466
        
             "original": {

     
···

       323
       471
        
           },

     

       324
       472
        
           "nixpkgs": {

     

       325
       473
        
             "locked": {

     

       326
       326
       -
               "lastModified": 1761672384,

     

       327
       327
       -
               "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=",

     

       474
       474
       +
               "lastModified": 1762111121,

     

       475
       475
       +
               "narHash": "sha256-4vhDuZ7OZaZmKKrnDpxLZZpGIJvAeMtK6FKLJYUtAdw=",

     

       328
       476
        
               "owner": "nixos",

     

       329
       477
        
               "repo": "nixpkgs",

     

       330
       330
       -
               "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c",

     

       478
       478
       +
               "rev": "b3d51a0365f6695e7dd5cdf3e180604530ed33b4",

     

       331
       479
        
               "type": "github"

     

       332
       480
        
             },

     

       333
       481
        
             "original": {

     
···

       339
       487
        
           },

     

       340
       488
        
           "nixpkgs-lib": {

     

       341
       489
        
             "locked": {

     

       342
       342
       -
               "lastModified": 1754788789,

     

       343
       343
       -
               "narHash": "sha256-x2rJ+Ovzq0sCMpgfgGaaqgBSwY+LST+WbZ6TytnT9Rk=",

     

       490
       490
       +
               "lastModified": 1761765539,

     

       491
       491
       +
               "narHash": "sha256-b0yj6kfvO8ApcSE+QmA6mUfu8IYG6/uU28OFn4PaC8M=",

     

       344
       492
        
               "owner": "nix-community",

     

       345
       493
        
               "repo": "nixpkgs.lib",

     

       346
       346
       -
               "rev": "a73b9c743612e4244d865a2fdee11865283c04e6",

     

       494
       494
       +
               "rev": "719359f4562934ae99f5443f20aa06c2ffff91fc",

     

       347
       495
        
               "type": "github"

     

       348
       496
        
             },

     

       349
       497
        
             "original": {

     
···

       379
       527
        
           "root": {

     

       380
       528
        
             "inputs": {

     

       381
       529
        
               "catppuccin": "catppuccin",

     

       530
       530
       +
               "darwin-login-items": "darwin-login-items",

     

       382
       531
        
               "easy-hosts": "easy-hosts",

     

       383
       532
        
               "flake-parts": "flake-parts",

     

       384
       533
        
               "home-manager": "home-manager",

     
···

       387
       536
        
               "nixos-wsl": "nixos-wsl",

     

       388
       537
        
               "nixpkgs": "nixpkgs",

     

       389
       538
        
               "ragenix": "ragenix",

     

       390
       390
       -
               "solaar": "solaar"

     

       539
       539
       +
               "solaar": "solaar",

     

       540
       540
       +
               "tangled": "tangled"

     

       391
       541
        
             }

     

       392
       542
        
           },

     

       393
       543
        
           "rust-overlay": {

     
···

       458
       608
        
               "type": "github"

     

       459
       609
        
             }

     

       460
       610
        
           },

     

       611
       611
       +
           "sqlite-lib-src": {

     

       612
       612
       +
             "flake": false,

     

       613
       613
       +
             "locked": {

     

       614
       614
       +
               "lastModified": 1706631843,

     

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

     

       616
       616
       +
               "type": "tarball",

     

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

     

       618
       618
       +
             },

     

       619
       619
       +
             "original": {

     

       620
       620
       +
               "type": "tarball",

     

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

     

       622
       622
       +
             }

     

       623
       623
       +
           },

     

       461
       624
        
           "systems": {

     

       462
       625
        
             "locked": {

     

       463
       626
        
               "lastModified": 1681028828,

     
···

       501
       664
        
               "owner": "nix-systems",

     

       502
       665
        
               "repo": "default",

     

       503
       666
        
               "type": "github"

     

       667
       667
       +
             }

     

       668
       668
       +
           },

     

       669
       669
       +
           "systems_4": {

     

       670
       670
       +
             "locked": {

     

       671
       671
       +
               "lastModified": 1681028828,

     

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

     

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

     

       674
       674
       +
               "repo": "default",

     

       675
       675
       +
               "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",

     

       676
       676
       +
               "type": "github"

     

       677
       677
       +
             },

     

       678
       678
       +
             "original": {

     

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

     

       680
       680
       +
               "repo": "default",

     

       681
       681
       +
               "type": "github"

     

       682
       682
       +
             }

     

       683
       683
       +
           },

     

       684
       684
       +
           "tangled": {

     

       685
       685
       +
             "inputs": {

     

       686
       686
       +
               "flake-compat": "flake-compat_4",

     

       687
       687
       +
               "gomod2nix": "gomod2nix",

     

       688
       688
       +
               "htmx-src": "htmx-src",

     

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

     

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

     

       691
       691
       +
               "indigo": "indigo",

     

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

     

       693
       693
       +
               "lucide-src": "lucide-src",

     

       694
       694
       +
               "nixpkgs": [

     

       695
       695
       +
                 "nixpkgs"

     

       696
       696
       +
               ],

     

       697
       697
       +
               "sqlite-lib-src": "sqlite-lib-src"

     

       698
       698
       +
             },

     

       699
       699
       +
             "locked": {

     

       700
       700
       +
               "lastModified": 1762351433,

     

       701
       701
       +
               "narHash": "sha256-1PGiDLrx1hNGNoUCnmc1Np2t48r7nIxxiTO8JHvaTws=",

     

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

     

       703
       703
       +
               "rev": "dd1bcee8c99bf799130645f32c94d1693f812f0d",

     

       704
       704
       +
               "revCount": 1604,

     

       705
       705
       +
               "type": "git",

     

       706
       706
       +
               "url": "https://tangled.org/@tangled.org/core"

     

       707
       707
       +
             },

     

       708
       708
       +
             "original": {

     

       709
       709
       +
               "type": "git",

     

       710
       710
       +
               "url": "https://tangled.org/@tangled.org/core"

     

       504
       711
        
             }

     

       505
       712
        
           }

     

       506
       713
        
         },

+8 -5

flake.nix

···

       50
       50
        
             url = "github:Svenum/Solaar-Flake/main";

     

       51
       51
        
             inputs.nixpkgs.follows = "nixpkgs";

     

       52
       52
        
           };

     

       53
       53
       +
       

     

       54
       54
       +
           tangled = {

     

       55
       55
       +
             url = "git+https://tangled.org/@tangled.org/core";

     

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

     

       57
       57
       +
           };

     

       58
       58
       +
       

     

       59
       59
       +
           darwin-login-items.url = "github:uncenter/nix-darwin-login-items";

     

       53
       60
        
         };

     

       54
       61
        
       

     

       55
       62
        
         outputs =

     

       56
       56
       -
           inputs@{

     

       57
       57
       -
             flake-parts,

     

       58
       58
       -
             nixos-wsl,

     

       59
       59
       -
             ...

     

       60
       60
       -
           }:

     

       63
       63
       +
           inputs@{ flake-parts, ... }:

     

       61
       64
        
           flake-parts.lib.mkFlake { inherit inputs; } {

     

       62
       65
        
             imports = [

     

       63
       66
        
               inputs.easy-hosts.flakeModule

+20

home/chloe/activation.nix

···

       1
       1
       +
       # macOS Tahoe (26.x) no longer supports symlinks in the Launchpad.

     

       2
       2
       +
       # So, we're forced to copy applications instead of linking them.

     

       3
       3
       +
       # This is computationally slower, but we're left with no choice.

     

       4
       4
       +
       

     

       5
       5
       +
       {

     

       6
       6
       +
         pkgs,

     

       7
       7
       +
         lib,

     

       8
       8
       +
         ...

     

       9
       9
       +
       }:

     

       10
       10
       +
       

     

       11
       11
       +
       {

     

       12
       12
       +
         config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {

     

       13
       13
       +
           targets.darwin.copyApps = {

     

       14
       14
       +
             enable = true;

     

       15
       15
       +
             enableChecks = true;

     

       16
       16
       +
           };

     

       17
       17
       +
       

     

       18
       18
       +
           targets.darwin.linkApps.enable = false;

     

       19
       19
       +
         };

     

       20
       20
       +
       }

+28

home/chloe/autostart.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         osConfig,

     

       4
       4
       +
         pkgs,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       {

     

       9
       9
       +
         config = lib.mkIf osConfig.settings.profiles.graphical.enable {

     

       10
       10
       +
           xdg.configFile = {

     

       11
       11
       +
             # .desktop files for autostart only work on Linux with XDG

     

       12
       12
       +
             "autostart/1password.desktop" = lib.mkIf pkgs.stdenv.hostPlatform.isLinux {

     

       13
       13
       +
               text = ''

     

       14
       14
       +
                 [Desktop Entry]

     

       15
       15
       +
                 Name=1Password

     

       16
       16
       +
                 Exec=1password --silent %U

     

       17
       17
       +
                 Terminal=false

     

       18
       18
       +
                 Type=Application

     

       19
       19
       +
                 Icon=1password

     

       20
       20
       +
                 StartupWMClass=1Password

     

       21
       21
       +
                 Comment=Password manager and secure wallet

     

       22
       22
       +
                 MimeType=x-scheme-handler/onepassword;

     

       23
       23
       +
                 Categories=Office;

     

       24
       24
       +
               '';

     

       25
       25
       +
             };

     

       26
       26
       +
           };

     

       27
       27
       +
         };

     

       28
       28
       +
       }

+3

home/chloe/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         imports = [

     

       3
       3
       +
           ./activation.nix

     

       4
       4
       +
           ./autostart.nix

     

       3
       5
        
           ./catppuccin.nix

     

       4
       6
        
           ./docs.nix

     

       5
       7
        
           ./files.nix

     

       6
       8
        
           ./packages

     

       7
       9
        
           ./programs

     

       10
       10
       +
           ./scripts.nix

     

       8
       11
        
         ];

     

       9
       12
        
       

     

       10
       13
        
         xdg.enable = true;

-23

home/chloe/packages/autostart.nix

···

       1
       1
       -
       { lib, osConfig, pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       {

     

       4
       4
       -
         config = lib.mkIf osConfig.settings.profiles.graphical.enable {

     

       5
       5
       -
           xdg.configFile = {

     

       6
       6
       -
             # .desktop files for autostart only work on Linux with XDG

     

       7
       7
       -
             "autostart/1password.desktop" = lib.mkIf pkgs.stdenv.isLinux {

     

       8
       8
       -
               text = ''

     

       9
       9
       -
                 [Desktop Entry]

     

       10
       10
       -
                 Name=1Password

     

       11
       11
       -
                 Exec=1password --silent %U

     

       12
       12
       -
                 Terminal=false

     

       13
       13
       -
                 Type=Application

     

       14
       14
       -
                 Icon=1password

     

       15
       15
       -
                 StartupWMClass=1Password

     

       16
       16
       -
                 Comment=Password manager and secure wallet

     

       17
       17
       -
                 MimeType=x-scheme-handler/onepassword;

     

       18
       18
       -
                 Categories=Office;

     

       19
       19
       -
               '';

     

       20
       20
       -
             };

     

       21
       21
       -
           };

     

       22
       22
       -
         };

     

       23
       23
       -
       }

+14

home/chloe/packages/base.nix

···

       1
       1
       +
       { pkgs }:

     

       2
       2
       +
       

     

       3
       3
       +
       with pkgs;

     

       4
       4
       +
       [

     

       5
       5
       +
         # dev tools

     

       6
       6
       +
         nodejs

     

       7
       7
       +
         deno

     

       8
       8
       +
         cloudflared

     

       9
       9
       +
         corepack_latest

     

       10
       10
       +
         bun

     

       11
       11
       +
       

     

       12
       12
       +
         # other

     

       13
       13
       +
         _1password-cli

     

       14
       14
       +
       ]

+15

home/chloe/packages/darwin.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         packages = with pkgs; [

     

       9
       9
       +
           # tools

     

       10
       10
       +
           shottr

     

       11
       11
       +
         ];

     

       12
       12
       +
       in

     

       13
       13
       +
       lib.optionals (

     

       14
       14
       +
         osConfig.settings.profiles.graphical.enable && pkgs.stdenv.hostPlatform.isDarwin

     

       15
       15
       +
       ) packages

+7 -10

home/chloe/packages/default.nix

···

       1
       1
       -
       { 

     

       1
       1
       +
       {

     

       2
       2
        
         pkgs,

     

       3
       3
        
         lib,

     

       4
       4
       -
         osConfig, 

     

       4
       4
       +
         osConfig,

     

       5
       5
        
         ...

     

       6
       6
        
       }:

     

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
       -
         defaultPackages = import ./list/default.nix { inherit pkgs; };

     

       10
       10
       -
         guiPackages = import ./list/gui.nix { inherit pkgs lib osConfig; };

     

       9
       9
       +
         basePackages = import ./base.nix { inherit pkgs; };

     

       10
       10
       +
         darwinPackages = import ./darwin.nix { inherit pkgs lib osConfig; };

     

       11
       11
       +
         linuxPackages = import ./linux.nix { inherit pkgs lib osConfig; };

     

       12
       12
       +
         universalPackages = import ./universal.nix { inherit pkgs lib osConfig; };

     

       11
       13
        
       in

     

       12
       14
        
       {

     

       13
       13
       -
         imports = [

     

       14
       14
       -
           ./autostart.nix

     

       15
       15
       -
           ./scripts.nix

     

       16
       16
       -
         ];

     

       17
       17
       -
       

     

       18
       15
        
         config = {

     

       19
       19
       -
           home.packages = defaultPackages ++ guiPackages;

     

       16
       16
       +
           home.packages = basePackages ++ darwinPackages ++ linuxPackages ++ universalPackages;

     

       20
       17
        
         };

     

       21
       18
        
       }

+32

home/chloe/packages/linux.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         packages = with pkgs; [

     

       9
       9
       +
           # messengers

     

       10
       10
       +
           telegram-desktop

     

       11
       11
       +
           vesktop

     

       12
       12
       +
       

     

       13
       13
       +
           # dev tools

     

       14
       14
       +
           httpie-desktop

     

       15
       15
       +
       

     

       16
       16
       +
           # mail

     

       17
       17
       +
           thunderbird

     

       18
       18
       +
       

     

       19
       19
       +
           # games

     

       20
       20
       +
           xivlauncher

     

       21
       21
       +
       

     

       22
       22
       +
           # messengers

     

       23
       23
       +
           discord

     

       24
       24
       +
       

     

       25
       25
       +
           # other GUI apps

     

       26
       26
       +
           obs-studio

     

       27
       27
       +
           _1password-gui

     

       28
       28
       +
         ];

     

       29
       29
       +
       in

     

       30
       30
       +
       lib.optionals (

     

       31
       31
       +
         osConfig.settings.profiles.graphical.enable && pkgs.stdenv.hostPlatform.isLinux

     

       32
       32
       +
       ) packages

-19

home/chloe/packages/list/default.nix

···

       1
       1
       -
       { pkgs }:

     

       2
       2
       -
       

     

       3
       3
       -
       with pkgs; [

     

       4
       4
       -
         # dev tools

     

       5
       5
       -
         nodejs

     

       6
       6
       -
         deno

     

       7
       7
       -
         cloudflared

     

       8
       8
       -
         corepack_latest

     

       9
       9
       -
         bun

     

       10
       10
       -
       

     

       11
       11
       -
         # fonts

     

       12
       12
       -
         iosevka

     

       13
       13
       -
         inter

     

       14
       14
       -
         atkinson-hyperlegible

     

       15
       15
       -
         nerd-fonts.jetbrains-mono

     

       16
       16
       -
       

     

       17
       17
       -
         # other

     

       18
       18
       -
         _1password-cli

     

       19
       19
       -
       ]

-31

home/chloe/packages/list/gui.nix

···

       1
       1
       -
       { pkgs, lib, osConfig }:

     

       2
       2
       -
       

     

       3
       3
       -
       let

     

       4
       4
       -
         # Common GUI packages available on all platforms

     

       5
       5
       -
         commonPackages = with pkgs; [

     

       6
       6
       -
           # cloud

     

       7
       7
       -
           owncloud-client

     

       8
       8
       -
       

     

       9
       9
       -
           # messengers

     

       10
       10
       -
           telegram-desktop

     

       11
       11
       -
           vesktop

     

       12
       12
       -
       

     

       13
       13
       -
           # notes

     

       14
       14
       -
           obsidian

     

       15
       15
       -
       

     

       16
       16
       -
           # dev tools

     

       17
       17
       -
           zed-editor

     

       18
       18
       -
           httpie-desktop

     

       19
       19
       -
       

     

       20
       20
       -
           # mail

     

       21
       21
       -
           thunderbird

     

       22
       22
       -
       

     

       23
       23
       -
           # games

     

       24
       24
       -
           prismlauncher

     

       25
       25
       -
           xivlauncher

     

       26
       26
       -
       

     

       27
       27
       -
           # other GUI apps

     

       28
       28
       -
           obs-studio

     

       29
       29
       -
           _1password-gui

     

       30
       30
       -
         ];

     

       31
       31
       -
       in lib.optionals osConfig.settings.profiles.graphical.enable commonPackages

-15

home/chloe/packages/scripts.nix

···

       1
       1
       -
       { pkgs, ... }:

     

       2
       2
       -
       

     

       3
       3
       -
       {  

     

       4
       4
       -
         home.packages = with pkgs; [

     

       5
       5
       -
           # Convert nix hash to SRI format and fetch from URL

     

       6
       6
       -
           (writeShellScriptBin "shash" ''

     

       7
       7
       -
             nix hash to-sri --type sha256 $(nix-prefetch-url ''$1)

     

       8
       8
       -
           '')

     

       9
       9
       -
       

     

       10
       10
       -
           # Create a Python virtual environment with --copies flag

     

       11
       11
       -
           (writeShellScriptBin "create-venv" ''

     

       12
       12
       -
             nix run nixpkgs#python3 -- -m venv .venv --copies

     

       13
       13
       -
           '')

     

       14
       14
       -
         ];

     

       15
       15
       -
       }

+25

home/chloe/packages/universal.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       let

     

       8
       8
       +
         packages = with pkgs; [

     

       9
       9
       +
           # dev tools

     

       10
       10
       +
           zed-editor

     

       11
       11
       +
       

     

       12
       12
       +
           # fonts

     

       13
       13
       +
           iosevka

     

       14
       14
       +
           inter

     

       15
       15
       +
           atkinson-hyperlegible

     

       16
       16
       +
           nerd-fonts.jetbrains-mono

     

       17
       17
       +
       

     

       18
       18
       +
           # games

     

       19
       19
       +
           prismlauncher

     

       20
       20
       +
       

     

       21
       21
       +
           # notes

     

       22
       22
       +
           obsidian

     

       23
       23
       +
         ];

     

       24
       24
       +
       in

     

       25
       25
       +
       lib.optionals osConfig.settings.profiles.graphical.enable packages

+17 -11

home/chloe/programs/cli/git.nix

···

       7
       7
        
       

     

       8
       8
        
       let

     

       9
       9
        
         signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICM6XP+CNc2CStEDe/W4LfkcRcG98obQiM2aqnydCRbX";

     

       10
       10
       -
         

     

       11
       11
       -
         opSshSignPath = 

     

       10
       10
       +
       

     

       11
       11
       +
         opSshSignPath =

     

       12
       12
        
           if (osConfig ? wsl) then

     

       13
       13
        
             "/mnt/c/Users/Chloe/AppData/Local/1Password/app/8/op-ssh-sign-wsl"

     

       14
       14
        
           else if pkgs.stdenv.hostPlatform.isDarwin then

     

       15
       15
        
             "/Applications/1Password.app/Contents/MacOS/op-ssh-sign"

     

       16
       16
       -
           else 

     

       16
       16
       +
           else

     

       17
       17
        
             "${pkgs._1password-gui}/bin/op-ssh-sign";

     

       18
       18
        
       in

     

       19
       19
        
       {

     

       20
       20
        
         home.file.".ssh/allowed_signers".text = "* ${signingKey}";

     

       21
       21
       -
         

     

       21
       21
       +
       

     

       22
       22
        
         programs.git = {

     

       23
       23
        
           enable = true;

     

       24
       24
       -
           userName = "Chloe";

     

       25
       25
       -
           userEmail = "chloe@sapphic.moe";

     

       26
       24
        
       

     

       27
       27
       -
           extraConfig = lib.mkMerge [

     

       25
       25
       +
           settings = lib.mkMerge [

     

       28
       26
        
             {

     

       29
       29
       -
               user.signingkey = signingKey;

     

       30
       30
       -
               gpg.format = "ssh";

     

       31
       31
       -
               gpg.ssh.program = opSshSignPath;

     

       32
       32
       -
               gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";

     

       27
       27
       +
               user = {

     

       28
       28
       +
                 name = "Chloe A";

     

       29
       29
       +
                 email = "chloe@sapphic.moe";

     

       30
       30
       +
                 signingkey = signingKey;

     

       31
       31
       +
               };

     

       32
       32
       +
       

     

       33
       33
       +
               gpg = {

     

       34
       34
       +
                 format = "ssh";

     

       35
       35
       +
                 ssh.program = opSshSignPath;

     

       36
       36
       +
                 ssh.allowedSignersFile = "~/.ssh/allowed_signers";

     

       37
       37
       +
               };

     

       38
       38
       +
       

     

       33
       39
        
               commit.gpgsign = true;

     

       34
       40
        
             }

     

       35
       41

+1 -7

home/chloe/programs/cli/ssh.nix

···

       4
       4
        
         programs.ssh = {

     

       5
       5
        
           enable = true;

     

       6
       6
        
           enableDefaultConfig = false;

     

       7
       7
       -
           

     

       7
       7
       +
       

     

       8
       8
        
           matchBlocks."*" = lib.mkMerge [

     

       9
       9
        
             # {

     

       10
       10
        
             #   # Default configuration for all hosts

     
···

       18
       18
        
               identityAgent = "\"~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock\"";

     

       19
       19
        
             })

     

       20
       20
        
           ];

     

       21
       21
       -
       

     

       22
       22
       -
           # Fallback TERM for Ghostty if remote does not support xterm-ghostty

     

       23
       23
       -
           extraConfig = ''

     

       24
       24
       -
             Host *

     

       25
       25
       -
               SetEnv TERM=xterm-256color

     

       26
       26
       -
           '';

     

       27
       21
        
         };

     

       28
       22
        
       }

+12 -8

home/chloe/programs/cli/zsh.nix

···

       1
       1
       -
       { lib, pkgs, osConfig, config, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         osConfig,

     

       5
       5
       +
         config,

     

       6
       6
       +
         ...

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       {

     

       4
       10
        
         programs.zsh = {

     
···

       18
       24
        
           '';

     

       19
       25
        
       

     

       20
       26
        
           envExtra = ''

     

       21
       21
       -
             ${lib.optionalString pkgs.stdenv.isLinux ''

     

       22
       22
       -
               export PRISMA_SCHEMA_ENGINE_BINARY="${pkgs.prisma-engines}/bin/schema-engine"

     

       23
       23
       -
               export PRISMA_QUERY_ENGINE_BINARY="${pkgs.prisma-engines}/bin/query-engine"

     

       24
       24
       -
               export PRISMA_QUERY_ENGINE_LIBRARY="${pkgs.prisma-engines}/lib/libquery_engine.node"

     

       25
       25
       -
               export PRISMA_INTROSPECTION_ENGINE_BINARY="${pkgs.prisma-engines}/bin/introspection-engine"

     

       26
       26
       -
               export PRISMA_FMT_BINARY="${pkgs.prisma-engines}/bin/prisma-fmt"

     

       27
       27
       -
             ''}

     

       27
       27
       +
             export PRISMA_SCHEMA_ENGINE_BINARY="${pkgs.prisma-engines}/bin/schema-engine"

     

       28
       28
       +
             export PRISMA_QUERY_ENGINE_BINARY="${pkgs.prisma-engines}/bin/query-engine"

     

       29
       29
       +
             export PRISMA_QUERY_ENGINE_LIBRARY="${pkgs.prisma-engines}/lib/libquery_engine.node"

     

       30
       30
       +
             export PRISMA_INTROSPECTION_ENGINE_BINARY="${pkgs.prisma-engines}/bin/introspection-engine"

     

       31
       31
       +
             export PRISMA_FMT_BINARY="${pkgs.prisma-engines}/bin/prisma-fmt"

     

       28
       32
        
           '';

     

       29
       33
        
       

     

       30
       34
        
           shellAliases = lib.mkMerge [

+9 -2

home/chloe/programs/gui/ghostty.nix

···

       6
       6
        
           package = if pkgs.stdenv.hostPlatform.isLinux then pkgs.ghostty else pkgs.ghostty-bin;

     

       7
       7
        
       

     

       8
       8
        
           settings = {

     

       9
       9
       -
             command = "/bin/zsh";

     

       9
       9
       +
             command = "${pkgs.zsh}/bin/zsh";

     

       10
       10
       +
             auto-update = "off";

     

       10
       11
        
       

     

       11
       12
        
             font-family = "Iosevka";

     

       12
       13
        
             font-size = 14;

     
···

       63
       64
        
             confirm-close-surface = true;

     

       64
       65
        
       

     

       65
       66
        
             shell-integration = "detect";

     

       66
       66
       -
             shell-integration-features = [ "cursor" "sudo" "title" "ssh-env" "ssh-terminfo" ];

     

       67
       67
       +
             shell-integration-features = [

     

       68
       68
       +
               "cursor"

     

       69
       69
       +
               "sudo"

     

       70
       70
       +
               "title"

     

       71
       71
       +
               "ssh-env"

     

       72
       72
       +
               "ssh-terminfo"

     

       73
       73
       +
             ];

     

       67
       74
        
       

     

       68
       75
        
             keybind = [

     

       69
       76
        
               "super+n=new_window"

+15

home/chloe/scripts.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {  

     

       4
       4
       +
         home.packages = with pkgs; [

     

       5
       5
       +
           # Convert nix hash to SRI format and fetch from URL

     

       6
       6
       +
           (writeShellScriptBin "shash" ''

     

       7
       7
       +
             nix hash to-sri --type sha256 $(nix-prefetch-url ''$1)

     

       8
       8
       +
           '')

     

       9
       9
       +
       

     

       10
       10
       +
           # Create a Python virtual environment with --copies flag

     

       11
       11
       +
           (writeShellScriptBin "create-venv" ''

     

       12
       12
       +
             nix run nixpkgs#python3 -- -m venv .venv --copies

     

       13
       13
       +
           '')

     

       14
       14
       +
         ];

     

       15
       15
       +
       }

+6

hosts/juniper/default.nix

···

       1
       1
        
       {

     

       2
       2
       +
         settings = {

     

       3
       3
       +
           profiles = {

     

       4
       4
       +
             graphical.enable = true;

     

       5
       5
       +
             laptop.enable = true;

     

       6
       6
       +
           };

     

       7
       7
       +
         };

     

       2
       8
        
         system.stateVersion = 6; # Initial nix-darwin version

     

       3
       9
        
       }

+7 -1

modules/base/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         imports = [

     

       3
       3
        
           ../shared

     

       4
       4
       -
           

     

       4
       4
       +
       

     

       5
       5
        
           ./nix.nix

     

       6
       6
        
           ./packages.nix

     

       7
       7
        
           ./zsh.nix

     

       8
       8
       +
         ];

     

       9
       9
       +
       

     

       10
       10
       +
         age.identityPaths = [

     

       11
       11
       +
           "/home/chloe/.ssh/id_ed25519.age"

     

       12
       12
       +
           "/home/chloe/.ssh/id_ed25519.auth"

     

       13
       13
       +
           "/home/chloe/.ssh/id_ed25519.sign"

     

       8
       14
        
         ];

     

       9
       15
        
       }

+1

modules/base/packages.nix

+1

modules/darwin/default.nix

···

       7
       7
        
           ./packages.nix

     

       8
       8
        
           ./preferences

     

       9
       9
        
           ./security

     

       10
       10
       +
           ./startup.nix

     

       10
       11
        
           ./users.nix

     

       11
       12
        
         ];

     

       12
       13
        
       }

+2

modules/darwin/extras.nix

···

       3
       3
        
       {

     

       4
       4
        
         imports = [

     

       5
       5
        
           inputs.home-manager.darwinModules.home-manager

     

       6
       6
       +
           inputs.ragenix.darwinModules.default

     

       7
       7
       +
           inputs.darwin-login-items.darwinModules.default

     

       6
       8
        
         ];

     

       7
       9
        
       }

+8 -1

modules/darwin/homebrew.nix

···

       22
       22
        
           # Casks (GUI applications)

     

       23
       23
        
           casks = [

     

       24
       24
        
             "1password"

     

       25
       25
       +
             "bruno"

     

       26
       26
       +
             "crossover"

     

       27
       27
       +
             "discord"

     

       25
       28
        
             "maccy"

     

       29
       29
       +
             "microsoft-edge"

     

       26
       30
        
             "microsoft-teams"

     

       31
       31
       +
             "mos"

     

       27
       32
        
             "music-presence"

     

       28
       28
       -
             "prismlauncher"

     

       33
       33
       +
             "osu"

     

       34
       34
       +
             "signal"

     

       35
       35
       +
             "steam"

     

       29
       36
        
           ];

     

       30
       37
        
       

     

       31
       38
        
           # Mac App Store apps (requires mas-cli)

+16

modules/darwin/preferences/custom.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         # Custom settings not supported directly by nix-darwin.

     

       3
       3
       +
         # TODO: Research other useful custom settings.

     

       4
       4
       +
         # https://github.com/yannbertrand/macos-defaults

     

       5
       5
       +
       

     

       6
       6
       +
         system.defaults.CustomUserPreferences = {

     

       7
       7
       +
           # Lock the size of the dock.

     

       8
       8
       +
           "com.apple.dock".size-immutable = true;

     

       9
       9
       +
       

     

       10
       10
       +
           # Prevent creation of .DS_Store files on network or USB volumes.

     

       11
       11
       +
           "com.apple.desktopservices" = {

     

       12
       12
       +
             DSDontWriteNetworkStores = true;

     

       13
       13
       +
             DSDontWriteUSBStores = true;

     

       14
       14
       +
           };

     

       15
       15
       +
         };

     

       16
       16
       +
       }

+1

modules/darwin/preferences/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         imports = [

     

       3
       3
       +
           ./custom.nix

     

       3
       4
        
           ./dock.nix

     

       4
       5
        
           ./finder.nix

     

       5
       6
        
           ./keyboard.nix

+2

modules/darwin/preferences/dock.nix

···

       2
       2
        
         system.defaults.dock = {

     

       3
       3
        
           orientation = "bottom";

     

       4
       4
        
           show-recents = false;

     

       5
       5
       +
           magnification = true;

     

       6
       6
       +
           largesize = 72;

     

       5
       7
        
           tilesize = 52;

     

       6
       8
        
           minimize-to-application = true;

     

       7
       9
        
         };

+19

modules/darwin/startup.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         config,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       {

     

       9
       9
       +
         environment.loginItems = {

     

       10
       10
       +
           enable = true;

     

       11
       11
       +
           items = [

     

       12
       12
       +
             "/Applications/1Password.app"

     

       13
       13
       +
             "/Applications/Mos.app"

     

       14
       14
       +
             "/Applications/Maccy.app"

     

       15
       15
       +
             "/Users/chloe/Applications/Home Manager Apps/Shottr.app"

     

       16
       16
       +
             "/Applications/Tailscale.app"

     

       17
       17
       +
           ];

     

       18
       18
       +
         };

     

       19
       19
       +
       }

+1 -6

modules/nixos/extras.nix

···

       4
       4
        
         imports = [

     

       5
       5
        
           inputs.home-manager.nixosModules.home-manager

     

       6
       6
        
           inputs.ragenix.nixosModules.default

     

       7
       7
       -
         ];

     

       8
       8
       -
       

     

       9
       9
       -
         age.identityPaths = [

     

       10
       10
       -
           "/home/chloe/.ssh/id_ed25519.age"

     

       11
       11
       -
           "/home/chloe/.ssh/id_ed25519.auth"

     

       12
       12
       -
           "/home/chloe/.ssh/id_ed25519.sign"

     

       7
       7
       +
           inputs.tangled.nixosModules.knot

     

       13
       8
        
         ];

     

       14
       9
        
       }

-1

modules/nixos/packages.nix

···

       3
       3
        
       {

     

       4
       4
        
         environment.systemPackages = with pkgs; [

     

       5
       5
        
           gparted

     

       6
       6
       -
           ragenix

     

       7
       6
        
         ];

     

       8
       7
        
       }

+14

secrets/abuseipdb.age

···

       1
       1
       +
       -----BEGIN AGE ENCRYPTED FILE-----

     

       2
       2
       +
       YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGN2U2dKQSA5eHJO

     

       3
       3
       +
       L0V2dE1tem9DSy92ZnBweG55YjRmVjdrM3FPN24vZUE0K1E2Smx3ClFiQXpiUCt6

     

       4
       4
       +
       N0JBTm0yZWI5Q3lYTjVlWXYzTkZBTFpLY0dqSE5INmlITDgKLT4gc3NoLWVkMjU1

     

       5
       5
       +
       MTkgMUNUOTd3IFYxRXhpWS9tQnl0SEc5RGo2Ymhyb3Jqa0dVN0twcEplK3lLR0tl

     

       6
       6
       +
       SkJBeWsKMFYya3FtRTg0Um9mRnNWbElMWkdMNEE5RlExTkNQaUpGRUEzK2pOdzc0

     

       7
       7
       +
       RQotPiBzc2gtZWQyNTUxOSBlUDNUdFEgVDRrNUNSWXl5bWlXWFEvdmpVZWtsRTJr

     

       8
       8
       +
       WmU3OWhkTFlVeUlpTW1vekxHbwpxOFJPQTFsN2RQUmY0YzRUVlBBR0JiL0FzbHZy

     

       9
       9
       +
       b2pqQzNJd1ZSSElYVHFrCi0+ICctZ3JlYXNlICFofCAlKytiRHFHClZvUQotLS0g

     

       10
       10
       +
       Mi9YUUNMK0pxc1dOSmt1VWxjcG8yUTl4VmQxT3RKQm9JZUoxK1ZyUUZ0Ywr+XbIf

     

       11
       11
       +
       30MbeXvOVwJSQMLcc/m9044pc1UXNcO6aLrbShVeVMs95zg18luAiE0V4ML7Ldrs

     

       12
       12
       +
       LTduxwbz/k3Tr+H4AKTCocXsilVmGhqaEZ6ST0aEjMHvuXFiXSHu8upnBybYrDfy

     

       13
       13
       +
       pp+sJnTp4/SfL9y+WA==

     

       14
       14
       +
       -----END AGE ENCRYPTED FILE-----

+14 -13

secrets/caddy.age

···

       1
       1
        
       -----BEGIN AGE ENCRYPTED FILE-----

     

       2
       2
       -
       YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGN2U2dKQSA3OTRw

     

       3
       3
       -
       N0pLbkIxZ2lvVEkyb0o4RGdZVVEzQ0VtSlp5MVJPMWNPd0xoc0JrCmRRMWR5N2hs

     

       4
       4
       -
       dFRwUVQ3RCtIb2hKT2ZvVlU4UUFBM0dkWmZ0U0lCUERZMUEKLT4gc3NoLWVkMjU1

     

       5
       5
       -
       MTkgMUNUOTd3IERweUM3ekJqTXBNTVYxU3p1OVhwZGxGdDl5bGNLRHBzbW12OHdN

     

       6
       6
       -
       NlpMRmsKendPWjFTZFFmMnpSWWNsa0NDM2kvTTNKYk42M01uS1BpazJzSGErUnE5

     

       7
       7
       -
       MAotPiBzc2gtZWQyNTUxOSBlUDNUdFEgb3prY01iWjBlS1pLSnZnTFJsOXM1NkVL

     

       8
       8
       -
       S3hJZTJ5V21lNFBDN21RTFN5VQpCa1lVNStyVWl5TS9Lcm9ZZHArV3ExWmViVzNv

     

       9
       9
       -
       cm9zNUdzN2ZjcVFkTjFrCi0+IDF3VVg2LWdyZWFzZSAvLUNTTzp0NSAyRUFrdSBp

     

       10
       10
       -
       UH0xIEgKWDJxU2tkQ20wZ29aQzlEWlh4RTQzaHBFV0tUb1hNUVg3aENOT0NxY0Z4

     

       11
       11
       -
       eEtpd3Nwb3BBYmU0a0JKZFBFOXFJYgpKMVNPcTIxNnhUelRmNmFqVGNsQVV6NTRO

     

       12
       12
       -
       d2cKLS0tIDYrQ2tWRWhHcTFGUnVNRU9kaWJCRkRSTXB5YTJvVnpwZ2ttLzhubGg1

     

       13
       13
       -
       N2sKd+UAtI0xQxss7MdlaHSRhAK6sOhBJ84PmnjDYDBhf4Xg2ON/EmD5AmUfcmcD

     

       14
       14
       -
       yEfwQSp1/vvUCtW1CXzEUswCRUzzhufms8GSLC7ehRAbhImhIK0lCKU=

     

       2
       2
       +
       YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGN2U2dKQSA0THNq

     

       3
       3
       +
       UjBzRllITWxyM0tWckVhU0p3SE4zNWhYdmVuUUVyREtLOGxwbFRJCkh3QXFOUW9p

     

       4
       4
       +
       ZWxSUS9LTzJsMFdyK05jOXVBVzI2VUptTFFManZTQnRMUmsKLT4gc3NoLWVkMjU1

     

       5
       5
       +
       MTkgMUNUOTd3IEdKUHhlMG1hakFJcThMdjVWMk5WZ3RzYUZnbE5RdXJycmk3TW9H

     

       6
       6
       +
       TDF5bEUKTTIrbVh6UTZHYnhmV21sUFpSOGYwT3FCT1RacjRscUVabFpYWmh4U3Ft

     

       7
       7
       +
       cwotPiBzc2gtZWQyNTUxOSBlUDNUdFEgTXhVUGFrcExTV05qb2ZuWDkzd0hYSCtl

     

       8
       8
       +
       NjZLaWxFdi9ibmtUcDVzWE5DSQpSVTVvUlpBN2REZ2ZSMkRkWWlNWkFaekxROVVt

     

       9
       9
       +
       bEc4NXBkdVpWTkF0OENVCi0+IEw5e0xlLWdyZWFzZSBUIHdHZHk5IgpwVERQMzZG

     

       10
       10
       +
       ODgwUExoa082aFp2K0NvYmhtT1lvd2MzMlEycGc4YjlwVGNPcy9nS0FQV3lZTkpr

     

       11
       11
       +
       SkkzdXlWdllBCnBGODRBRU9vQnB4THdBQzZycGdMS05mN3R4VWZvaUpnbWZ5M3Zu

     

       12
       12
       +
       blN1cys1VGc4R09TdHdHaDhEQVF3Ci0tLSBYWmNaYkZiSzVQUXp0OU14WmY4cGNR

     

       13
       13
       +
       Mk1VZ1NxOWV3RUxVb0taRWRxZTFrCvVGqFlzVEsdUx95OQNCI1lmXdAXY5SxwJ6q

     

       14
       14
       +
       PI7Cj+zq+5BjUYqwPnu2KcMMKEtmBReSyL791bRn16PSzIS3yn2DzmIM72oea9hd

     

       15
       15
       +
       WJCud87qCxejIF3LgczKUqpTILzXtM7jzR2CNhoBSc9VDDA3U+ku4jOnxfj6

     

       15
       16
        
       -----END AGE ENCRYPTED FILE-----

+14

secrets/destiny-labeler.age

···

       1
       1
       +
       -----BEGIN AGE ENCRYPTED FILE-----

     

       2
       2
       +
       YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IGN2U2dKQSBoNkJV

     

       3
       3
       +
       T04yWG9PbFdmRGc0bUhNaU4yTGl2S0lDZERlZ2FYbGNKSFdqMmkwCmdqVzlRYVhJ

     

       4
       4
       +
       NmN1VWYrbklIbFVvVUcxSHJnL09ydUVUV2tmaURVMUpKZ2sKLT4gc3NoLWVkMjU1

     

       5
       5
       +
       MTkgMUNUOTd3IFMvcVFvQ2M3UUpIZEdkRmtrSUtLaGZscHl0WGM2WFpjMlBPRlN1

     

       6
       6
       +
       K1p1MkkKYXg3d04weWdqRGY4RWJtdGZLUytvM1dQanBxVm4zUm91TXFDNjFhNDZk

     

       7
       7
       +
       dwotPiBzc2gtZWQyNTUxOSBlUDNUdFEgRUUxWVNLUDR3aVZUbENPai9LclhZTzZS

     

       8
       8
       +
       SDJjbDUyeXhqemdxWWlzdHZBSQpTMnhLWXp4MTE1eDVmUVoxYXNUZ2JrSWlFNGtr

     

       9
       9
       +
       NklWbmhCcWIxTzZEcEdFCi0+IDxsVypbQjJELWdyZWFzZSB5SnNuYGNjCjRDaXlC

     

       10
       10
       +
       cWdLd1EKLS0tIElObUx3SldVcTdtcVozc3A3Q0FROWZlV2JWckFESHBzQTVlNjlH

     

       11
       11
       +
       VEJ3YVUKWFcj2Hf3rGa7+aiJKUktkdOmVRF2c7VgKajt/EC3Z61jnMn9rMPWf9ZE

     

       12
       12
       +
       PlsfqBNOlLOiLfdEQnrwC3t2ajETUExrjUUhZ3n23rFT7SzB8giiDXEg9r6pV6Vk

     

       13
       13
       +
       aevt9JaLH123SxZURnkTJQ==

     

       14
       14
       +
       -----END AGE ENCRYPTED FILE-----

+2

secrets/secrets.nix

···

       10
       10
        
         ];

     

       11
       11
        
       in

     

       12
       12
        
       {

     

       13
       13
       +
         "abuseipdb.age".publicKeys = keys;

     

       13
       14
        
         "bluesky-pds.age".publicKeys = keys;

     

       14
       15
        
         "caddy.age".publicKeys = keys;

     

       16
       16
       +
         "destiny-labeler.age".publicKeys = keys;

     

       15
       17
        
         "glance.age".publicKeys = keys;

     

       16
       18
        
         "lanyard.age".publicKeys = keys;

     

       17
       19
        
         "minio.age".publicKeys = keys;

+64

services/adguardhome/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         services.adguardhome = {

     

       3
       3
       +
           enable = true;

     

       4
       4
       +
       

     

       5
       5
       +
           # We'll be using Tailscale Services to serve AdGuard Home as a subdomain in our tailnet.

     

       6
       6
       +
           host = "127.0.0.1";

     

       7
       7
       +
           port = 3000;

     

       8
       8
       +
       

     

       9
       9
       +
           settings = {

     

       10
       10
       +
             # AdGuard Home keeps insisting on forcing the Russian language on me for some reason.

     

       11
       11
       +
             language = "en";

     

       12
       12
       +
       

     

       13
       13
       +
             # Use the auto theme so it matches the user's system theme.

     

       14
       14
       +
             theme = "auto";

     

       15
       15
       +
       

     

       16
       16
       +
             dns = {

     

       17
       17
       +
               # Since we're not exposing AdGuard Home to the public internet, we can disable rate limiting.

     

       18
       18
       +
               ratelimit = 0;

     

       19
       19
       +
       

     

       20
       20
       +
               bootstrap_dns = [

     

       21
       21
       +
                 "9.9.9.9" # Quad9

     

       22
       22
       +
                 "1.1.1.1" # Cloudflare

     

       23
       23
       +
               ];

     

       24
       24
       +
       

     

       25
       25
       +
               upstream_dns = [

     

       26
       26
       +
                 "https://dns10.quad9.net/dns-query"

     

       27
       27
       +
                 "https://doh.mullvad.net/dns-query"

     

       28
       28
       +
                 "https://security.cloudflare-dns.com/dns-query"

     

       29
       29
       +
       

     

       30
       30
       +
                 # Resolve DNS queries for 100.* IPs with Tailscale's Magic DNS.

     

       31
       31
       +
                 "[/100.in-addr.arpa/]100.100.100.100"

     

       32
       32
       +
               ];

     

       33
       33
       +
       

     

       34
       34
       +
               allowed_clients = [

     

       35
       35
       +
                 "100.64.0.0/10" # Tailscale IP range

     

       36
       36
       +
                 "127.0.0.1/24" # localhost

     

       37
       37
       +
               ];

     

       38
       38
       +
             };

     

       39
       39
       +
       

     

       40
       40
       +
             clients.persistent = [

     

       41
       41
       +
               {

     

       42
       42
       +
                 name = "macOS";

     

       43
       43
       +
                 ids = [ "100.118.131.42" ];

     

       44
       44
       +
               }

     

       45
       45
       +
               {

     

       46
       46
       +
                 name = "Android";

     

       47
       47
       +
                 ids = [ "100.113.214.72" ];

     

       48
       48
       +
               }

     

       49
       49
       +
               {

     

       50
       50
       +
                 name = "UpCloud";

     

       51
       51
       +
                 ids = [ "100.96.154.98" ];

     

       52
       52
       +
               }

     

       53
       53
       +
               {

     

       54
       54
       +
                 name = "Windows";

     

       55
       55
       +
                 ids = [ "100.124.27.32" ];

     

       56
       56
       +
               }

     

       57
       57
       +
               {

     

       58
       58
       +
                 name = "Windows Subsystem for Linux";

     

       59
       59
       +
                 ids = [ "100.127.166.121" ];

     

       60
       60
       +
               }

     

       61
       61
       +
             ];

     

       62
       62
       +
           };

     

       63
       63
       +
         };

     

       64
       64
       +
       }

+52 -12

services/bluesky-pds/default.nix

···

       1
       1
       -
       { config, ... }:

     

       1
       1
       +
       { config, lib, ... }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
        
         age.secrets.bluesky-pds = {

     
···

       14
       14
        
           settings = {

     

       15
       15
        
             PDS_HOSTNAME = "pds.sappho.systems";

     

       16
       16
        
             PDS_PORT = 3333;

     

       17
       17
       +
             PDS_CRAWLERS = lib.concatStringsSep "," [

     

       18
       18
       +
               "https://bsky.network"

     

       19
       19
       +
               "https://relay.cerulea.blue"

     

       20
       20
       +
               "https://relay.upcloud.world"

     

       21
       21
       +
               "https://atproto.africa"

     

       22
       22
       +
             ];

     

       17
       23
        
           };

     

       18
       24
        
           environmentFiles = [ config.age.secrets.bluesky-pds.path ];

     

       19
       25
        
         };

     

       20
       26
        
       

     

       21
       27
        
         services.caddy.virtualHosts."pds.sappho.systems" = {

     

       22
       22
       -
           listenAddresses = [ "::" ];

     

       28
       28
       +
           serverAliases = [ "*.pds.sappho.systems" ];

     

       23
       29
        
           extraConfig = ''

     

       24
       30
        
             import common

     

       25
       25
       -
             import tls_cloudflare

     

       26
       26
       -
             reverse_proxy http://127.0.0.1:3333

     

       27
       27
       -
           '';

     

       28
       28
       -
         };

     

       31
       31
       +
             import tls_bunny

     

       29
       32
        
       

     

       30
       30
       -
         services.caddy.virtualHosts."*.pds.sappho.systems" = {

     

       31
       31
       -
           listenAddresses = [ "::" ];

     

       32
       32
       -
           extraConfig = ''

     

       33
       33
       -
             import common

     

       34
       34
       -
             import tls_cloudflare

     

       35
       35
       -
             reverse_proxy http://127.0.0.1:3333

     

       33
       33
       +
             handle / {

     

       34
       34
       +
               respond <<EOF

     

       35
       35
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⡀⢀⠀⢀⠀⠀⠀⠀

     

       36
       36
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⢧⢳⣾⣂⣾⡁⣴⠀⠀

     

       37
       37
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⠓⣬⠾⠋⠉⢸⣷⣋⣤⡦

     

       38
       38
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢯⡞⠃⠀⠀⠀⡼⠊⣠⡏⠀

     

       39
       39
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣶⣄⣀⣀⡴⣡⡴⠃⠀⠀

     

       40
       40
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡀⠀⣽⠧⢴⡀⢸⡛⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡿⠻⠛⠋⠉⠁⠀⠀⠀⠀

     

       41
       41
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠾⡇⢸⠉⠀⠀⠹⣼⣽⡚⠉⠹⡄⠀⠀⠀⠀⠀⠀⠀⠀⡴⠛⠙⢳⡀⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       42
       42
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡘⢿⣆⠀⠀⠀⣿⠉⠀⠀⢀⣧⠀⢀⣤⠤⢤⣄⠀⢸⠉⠀⠀⠈⣧⢸⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       43
       43
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⠾⠉⠙⠻⢗⠀⣦⣏⣤⠀⣠⠞⠀⠀⣞⠋⠀⠀⠈⠻⡼⡀⣄⡀⢀⡯⠟⠧⢤⡀⠀⠀⠀⠀⠀⠀⠀⠀

     

       44
       44
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⢯⣀⠀⠀⠲⣷⡿⣿⠋⠉⠁⠀⠀⠀⠹⣄⠀⠀⣠⣤⠘⠧⣽⣨⣞⡁⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀

     

       45
       45
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠁⠀⢸⣷⠀⠀⠀⠀⠀⠀⠈⣓⣦⣜⠉⣿⣶⠧⣟⣙⣀⣀⣠⠞⠁⠀⠀⠀⠀⠀⠀⠀⠀

     

       46
       46
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⡞⠉⠀⠾⠞⡵⢜⣇⡀⠙⢦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       47
       47
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡤⠤⠤⣄⠀⣼⣿⡠⠴⠶⠦⣄⠀⣷⣀⠀⢀⣠⡷⡀⠉⠁⠀⢸⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       48
       48
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⡋⠀⠀⠀⠈⢷⣿⠋⠀⠀⠀⠀⢸⡆⠀⠈⠉⣩⣿⠣⠙⠲⠤⠶⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       49
       49
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⢻⠀⠀⠀⠀⠀⠀⡇⣠⣴⣾⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       50
       50
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣄⠀⠀⠀⢠⣦⣌⡄⢠⣦⠀⠀⣾⠹⠋⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       51
       51
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡠⠤⠙⠢⢄⡀⠀⢳⡄⢃⡼⠉⣀⠜⠋⠉⠒⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       52
       52
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⢠⡯⠀⠀⠀⠀⠀⣠⡉⠙⣹⣿⠶⣮⣁⡀⠀⠀⠀⠀⢻⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       53
       53
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠳⣄⠀⠀⠀⠘⠛⠓⣛⠇⢸⡷⡀⠻⠟⠀⠀⠀⠀⢸⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       54
       54
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣹⠒⠶⢶⠒⠉⠀⠀⠈⠉⢫⠳⢄⣀⣀⣀⡤⠟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       55
       55
       +
               ⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⡾⠋⠀⠀⢰⠀⠀⠀⠀⠀⠀⢸⣇⠀⠈⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       56
       56
       +
               ⠀⠀⠀⠀⣠⣴⣾⠿⠛⠁⠀⠀⠀⠀⠈⠳⣄⣀⣀⣀⡤⠞⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       57
       57
       +
               ⠀⠀⣴⣿⡿⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       58
       58
       +
               ⠀⣾⡟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       59
       59
       +
               ⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       60
       60
       +
               ⠈⢧⡃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       61
       61
       +
               ⠀⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       62
       62
       +
       

     

       63
       63
       +
             Welcome to Sapphic Angels' AT Protocol Personal Data Server (PDS).

     

       64
       64
       +
       

     

       65
       65
       +
             Website: https://sapphic.moe

     

       66
       66
       +
                 PDS: https://github.com/bluesky-social/pds

     

       67
       67
       +
             ATProto: https://atproto.com

     

       68
       68
       +
       

     

       69
       69
       +
             🌸 🐇

     

       70
       70
       +
             EOF 200

     

       71
       71
       +
             }

     

       72
       72
       +
       

     

       73
       73
       +
             handle {

     

       74
       74
       +
               reverse_proxy http://127.0.0.1:3333

     

       75
       75
       +
             }

     

       36
       76
        
           '';

     

       37
       77
        
         };

     

       38
       78
        
       }

+12 -5

services/caddy/default.nix

···

       9
       9
        
         services.caddy = {

     

       10
       10
        
           enable = true;

     

       11
       11
        
           package = pkgs.caddy.withPlugins {

     

       12
       12
       -
             plugins = [ "github.com/caddy-dns/cloudflare@v0.2.1" ];

     

       13
       13
       -
             hash = "sha256-iRzpN9awuEFsc7hqKzOMNiCFFEv833xhd4LM+VFQedI=";

     

       12
       12
       +
             plugins = [

     

       13
       13
       +
               "github.com/caddy-dns/bunny@v1.2.0"

     

       14
       14
       +
             ];

     

       15
       15
       +
             hash = "sha256-bwffi5sWq07DVoPQGgEIN1jnvQKL6c4tFfR9AT9ThD4=";

     

       14
       16
        
           };

     

       15
       17
        
           environmentFile = config.age.secrets.caddy.path;

     

       16
       18
        
           globalConfig = ''

     

       19
       19
       +
             debug

     

       17
       20
        
             email chloe@sapphic.moe

     

       18
       21
        
           '';

     

       19
       22
        
           extraConfig = ''

     

       20
       20
       -
             (tls_cloudflare) {

     

       23
       23
       +
             (tls_bunny) {

     

       21
       24
        
               tls {

     

       22
       22
       -
                 dns cloudflare {env.CF_API_TOKEN}

     

       23
       23
       -
                 resolvers 8.8.8.8 1.1.1.1

     

       25
       25
       +
                 dns bunny {env.BUNNY_API_KEY}

     

       26
       26
       +
                 resolvers 9.9.9.9 149.112.112.112

     

       24
       27
        
               }

     

       25
       28
        
             }

     

       26
       29
        
             (common) {

     

       27
       30
        
               encode zstd gzip

     

       28
       31
        
             }

     

       32
       32
       +
           '';

     

       33
       33
       +
           logFormat = ''

     

       34
       34
       +
             level debug

     

       35
       35
       +
             format json

     

       29
       36
        
           '';

     

       30
       37
        
         };

     

       31
       38

+6 -2

services/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         imports = [

     

       3
       3
       +
           ./adguardhome

     

       4
       4
       +
           ./bluesky-pds

     

       3
       5
        
           ./caddy

     

       6
       6
       +
           ./destiny-labeler

     

       7
       7
       +
           ./fail2ban

     

       4
       8
        
           ./glance

     

       5
       5
       -
           ./bluesky-pds

     

       6
       6
       -
           ./outline

     

       9
       9
       +
           ./knot

     

       7
       10
        
           ./lanyard

     

       8
       11
        
           ./ntfy

     

       12
       12
       +
           ./outline

     

       9
       13
        
         ];

     

       10
       14
        
       }

+48

services/destiny-labeler/default.nix

···

       1
       1
       +
       { config, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         systemd.tmpfiles.rules = [

     

       5
       5
       +
           "d /var/lib/destiny-labeler/data 0755 root root -"

     

       6
       6
       +
           "f /var/lib/destiny-labeler/data/cursor.txt 0644 root root -"

     

       7
       7
       +
           "f /var/lib/destiny-labeler/data/labels.db 0644 root root -"

     

       8
       8
       +
           "f /var/lib/destiny-labeler/data/labels.db-shm 0644 root root -"

     

       9
       9
       +
           "f /var/lib/destiny-labeler/data/labels.db-wal 0644 root root -"

     

       10
       10
       +
         ];

     

       11
       11
       +
       

     

       12
       12
       +
         age.secrets.destiny-labeler = {

     

       13
       13
       +
           file = ../../secrets/destiny-labeler.age;

     

       14
       14
       +
           mode = "600";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         virtualisation.oci-containers.containers."destiny-labeler" = {

     

       18
       18
       +
           image = "ghcr.io/sapphosys/destiny-labeler:main";

     

       19
       19
       +
           pull = "always";

     

       20
       20
       +
           autoRemoveOnStop = false;

     

       21
       21
       +
           ports = [ "4002:4002" ];

     

       22
       22
       +
           environment = {

     

       23
       23
       +
             DID = "did:plc:zt2oycjggn5gwdtcgphdh4tn";

     

       24
       24
       +
             URL = "wss://jetstream1.us-east.bsky.network/subscribe";

     

       25
       25
       +
             PORT = "4002";

     

       26
       26
       +
             NODE_ENV = "production";

     

       27
       27
       +
           };

     

       28
       28
       +
           environmentFiles = [ config.age.secrets.destiny-labeler.path ];

     

       29
       29
       +
           volumes = [

     

       30
       30
       +
             "/var/lib/destiny-labeler/data/cursor.txt:/app/cursor.txt"

     

       31
       31
       +
             "/var/lib/destiny-labeler/data/labels.db:/app/labels.db"

     

       32
       32
       +
             "/var/lib/destiny-labeler/data/labels.db-shm:/app/labels.db-shm"

     

       33
       33
       +
             "/var/lib/destiny-labeler/data/labels.db-wal:/app/labels.db-wal"

     

       34
       34
       +
           ];

     

       35
       35
       +
           extraOptions = [

     

       36
       36
       +
             "--restart=always"

     

       37
       37
       +
             "--network=host"

     

       38
       38
       +
           ];

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         services.caddy.virtualHosts."labeler.sappho.systems" = {

     

       42
       42
       +
           extraConfig = ''

     

       43
       43
       +
             import common

     

       44
       44
       +
             import tls_bunny

     

       45
       45
       +
             reverse_proxy http://127.0.0.1:4002

     

       46
       46
       +
           '';

     

       47
       47
       +
         };

     

       48
       48
       +
       }

+123

services/fail2ban/default.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       {

     

       4
       4
       +
         age.secrets.abuseipdb = {

     

       5
       5
       +
           file = ../../secrets/abuseipdb.age;

     

       6
       6
       +
           mode = "600";

     

       7
       7
       +
         };

     

       8
       8
       +
       

     

       9
       9
       +
         services.fail2ban = {

     

       10
       10
       +
           enable = true;

     

       11
       11
       +
       

     

       12
       12
       +
           # Include curl for making HTTP requests to AbuseIPDB

     

       13
       13
       +
           extraPackages = [ pkgs.curl ];

     

       14
       14
       +
       

     

       15
       15
       +
           # Globally applicable settings for all jails

     

       16
       16
       +
           daemonSettings = {

     

       17
       17
       +
             Definition = {

     

       18
       18
       +
               # How long to keep an IP in the ban list (in seconds)

     

       19
       19
       +
               # 1 day = 86400 seconds

     

       20
       20
       +
               bantime = "86400";

     

       21
       21
       +
       

     

       22
       22
       +
               # How far back to look for failures (in seconds)

     

       23
       23
       +
               # 1 hour = 3600 seconds

     

       24
       24
       +
               findtime = "3600";

     

       25
       25
       +
       

     

       26
       26
       +
               # Number of failures before banning

     

       27
       27
       +
               maxretry = 3;

     

       28
       28
       +
       

     

       29
       29
       +
               # Allow fail2ban to write to syslog

     

       30
       30
       +
               logtarget = "SYSLOG";

     

       31
       31
       +
             };

     

       32
       32
       +
           };

     

       33
       33
       +
       

     

       34
       34
       +
           # Ignore local networks and trusted services

     

       35
       35
       +
           ignoreIP = [

     

       36
       36
       +
             "127.0.0.1/8"

     

       37
       37
       +
             "::1"

     

       38
       38
       +
             "100.64.0.0/10" # Tailscale IP range

     

       39
       39
       +
           ];

     

       40
       40
       +
       

     

       41
       41
       +
           # Jails for protecting various services

     

       42
       42
       +
           jails = {

     

       43
       43
       +
             # SSH protection - monitor failed login attempts using systemd journal

     

       44
       44
       +
             sshd.settings = {

     

       45
       45
       +
               enabled = true;

     

       46
       46
       +
               port = "ssh";

     

       47
       47
       +
               filter = "sshd";

     

       48
       48
       +
               backend = "systemd";

     

       49
       49
       +
               maxretry = 5;

     

       50
       50
       +
               findtime = "3600";

     

       51
       51
       +
               bantime = "86400";

     

       52
       52
       +
               action = "iptables-multiport[name=SSH, port='ssh'] abuseipdb-agenix[abuseipdb_category='18,22']";

     

       53
       53
       +
             };

     

       54
       54
       +
       

     

       55
       55
       +
             # Caddy HTTP/HTTPS protection - monitor for repeated 4xx/5xx errors

     

       56
       56
       +
             caddy-http.settings = {

     

       57
       57
       +
               enabled = true;

     

       58
       58
       +
               port = "http,https";

     

       59
       59
       +
               filter = "caddy-http";

     

       60
       60
       +
               logpath = "/var/log/caddy/access-*.log";

     

       61
       61
       +
               backend = "auto";

     

       62
       62
       +
               maxretry = 10;

     

       63
       63
       +
               findtime = "600";

     

       64
       64
       +
               bantime = "3600";

     

       65
       65
       +
               action = "iptables-multiport[name=Caddy, port='http,https'] abuseipdb-agenix[abuseipdb_category='21']";

     

       66
       66
       +
             };

     

       67
       67
       +
       

     

       68
       68
       +
             # Rate-based protection - ban on excessive requests

     

       69
       69
       +
             caddy-ratelimit.settings = {

     

       70
       70
       +
               enabled = true;

     

       71
       71
       +
               port = "http,https";

     

       72
       72
       +
               filter = "caddy-ratelimit";

     

       73
       73
       +
               logpath = "/var/log/caddy/access-*.log";

     

       74
       74
       +
               backend = "auto";

     

       75
       75
       +
               maxretry = 50;

     

       76
       76
       +
               findtime = "60";

     

       77
       77
       +
               bantime = "1800";

     

       78
       78
       +
               action = "iptables-multiport[name=Caddy-RateLimit, port='http,https'] abuseipdb-agenix[abuseipdb_category='21']";

     

       79
       79
       +
             };

     

       80
       80
       +
           };

     

       81
       81
       +
         };

     

       82
       82
       +
       

     

       83
       83
       +
         # Custom filters for Fail2Ban

     

       84
       84
       +
         environment.etc = {

     

       85
       85
       +
           # Caddy HTTP error monitoring filter

     

       86
       86
       +
           "fail2ban/filter.d/caddy-http.conf".text = ''

     

       87
       87
       +
             [Definition]

     

       88
       88
       +
             failregex = ^<HOST> -.*" (?:400|401|403|404|405|429|500|502|503|504) .*$

     

       89
       89
       +
             ignoreregex =

     

       90
       90
       +
           '';

     

       91
       91
       +
       

     

       92
       92
       +
           # Caddy rate limiting filter - detects repeated requests within short timeframe

     

       93
       93
       +
           "fail2ban/filter.d/caddy-ratelimit.conf".text = ''

     

       94
       94
       +
             [Definition]

     

       95
       95
       +
             failregex = ^<HOST> -.*" \d{3} .*$

     

       96
       96
       +
             ignoreregex =

     

       97
       97
       +
           '';

     

       98
       98
       +
       

     

       99
       99
       +
           # Custom abuseipdb action that reads API key from file

     

       100
       100
       +
           "fail2ban/action.d/abuseipdb-agenix.conf".text = ''

     

       101
       101
       +
             [Definition]

     

       102
       102
       +
             # Report IP to AbuseIPDB, reading API key from Agenix secret file

     

       103
       103
       +
             # Uses double quotes to allow shell expansion of $(cat /run/agenix/abuseipdb)

     

       104
       104
       +
             # Sleep 12 seconds to respect AbuseIPDB rate limit (~5 requests per minute)

     

       105
       105
       +
             # Note: Don't use <matches> - fail2ban's wrapper causes issues with multiline content

     

       106
       106
       +
             # Don't use --fail so 429 rate limit errors don't mark action as failed

     

       107
       107
       +
             actionban = sleep 12; curl 'https://api.abuseipdb.com/api/v2/report' -H 'Accept: application/json' -H "Key: $(cat /run/agenix/abuseipdb)" --data-urlencode 'ip=<ip>' --data 'categories=<abuseipdb_category>' > /dev/null 2>&1

     

       108
       108
       +
       

     

       109
       109
       +
             actionstart =

     

       110
       110
       +
             actionstop =

     

       111
       111
       +
             actioncheck =

     

       112
       112
       +
             actionunban =

     

       113
       113
       +
       

     

       114
       114
       +
             [Init]

     

       115
       115
       +
             abuseipdb_category = 18

     

       116
       116
       +
           '';

     

       117
       117
       +
         };

     

       118
       118
       +
       

     

       119
       119
       +
         # Ensure the log directory exists

     

       120
       120
       +
         systemd.tmpfiles.rules = [

     

       121
       121
       +
           "d /var/log/fail2ban 0755 root root -"

     

       122
       122
       +
         ];

     

       123
       123
       +
       }

+1 -3

services/glance/default.nix

···

       8
       8
        
       

     

       9
       9
        
         services.glance = {

     

       10
       10
        
           enable = true;

     

       11
       11
       -
           openFirewall = true;

     

       11
       11
       +
           openFirewall = false;

     

       12
       12
        
           environmentFile = config.age.secrets.glance.path;

     

       13
       13
        
           settings = import ./settings.nix;

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         services.caddy.virtualHosts."home.sappho.systems" = {

     

       17
       17
       -
           listenAddresses = [ "::" ];

     

       18
       17
        
           extraConfig = ''

     

       19
       18
        
             import common

     

       20
       20
       -
             import tls_cloudflare

     

       21
       19
        
             reverse_proxy http://localhost:4040

     

       22
       20
        
           '';

     

       23
       21
        
         };

+50

services/knot/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         services.tangled-knot = {

     

       3
       3
       +
           enable = true;

     

       4
       4
       +
           motd = ''

     

       5
       5
       +
                ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⡀⢀⠀⢀⠀⠀⠀⠀

     

       6
       6
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⢧⢳⣾⣂⣾⡁⣴⠀⠀

     

       7
       7
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⠓⣬⠾⠋⠉⢸⣷⣋⣤⡦

     

       8
       8
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢯⡞⠃⠀⠀⠀⡼⠊⣠⡏⠀

     

       9
       9
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡀⠀⠀⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣶⣄⣀⣀⡴⣡⡴⠃⠀⠀

     

       10
       10
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡀⠀⣽⠧⢴⡀⢸⡛⠀⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡿⠻⠛⠋⠉⠁⠀⠀⠀⠀

     

       11
       11
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠾⡇⢸⠉⠀⠀⠹⣼⣽⡚⠉⠹⡄⠀⠀⠀⠀⠀⠀⠀⠀⡴⠛⠙⢳⡀⠀⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       12
       12
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡘⢿⣆⠀⠀⠀⣿⠉⠀⠀⢀⣧⠀⢀⣤⠤⢤⣄⠀⢸⠉⠀⠀⠈⣧⢸⣿⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       13
       13
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢰⠾⠉⠙⠻⢗⠀⣦⣏⣤⠀⣠⠞⠀⠀⣞⠋⠀⠀⠈⠻⡼⡀⣄⡀⢀⡯⠟⠧⢤⡀⠀⠀⠀⠀⠀⠀⠀⠀

     

       14
       14
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠘⢯⣀⠀⠀⠲⣷⡿⣿⠋⠉⠁⠀⠀⠀⠹⣄⠀⠀⣠⣤⠘⠧⣽⣨⣞⡁⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⠀⠀

     

       15
       15
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⠉⠉⠉⠁⠀⢸⣷⠀⠀⠀⠀⠀⠀⠈⣓⣦⣜⠉⣿⣶⠧⣟⣙⣀⣀⣠⠞⠁⠀⠀⠀⠀⠀⠀⠀⠀

     

       16
       16
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢸⣿⠀⠀⠀⠀⠀⠀⡞⠉⠀⠾⠞⡵⢜⣇⡀⠙⢦⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       17
       17
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡤⠤⠤⣄⠀⣼⣿⡠⠴⠶⠦⣄⠀⣷⣀⠀⢀⣠⡷⡀⠉⠁⠀⢸⠇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       18
       18
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣰⡋⠀⠀⠀⠈⢷⣿⠋⠀⠀⠀⠀⢸⡆⠀⠈⠉⣩⣿⠣⠙⠲⠤⠶⠋⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       19
       19
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⡇⠀⠀⠀⠀⠀⠀⢻⠀⠀⠀⠀⠀⠀⡇⣠⣴⣾⠟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       20
       20
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⢻⣄⠀⠀⠀⢠⣦⣌⡄⢠⣦⠀⠀⣾⠹⠋⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       21
       21
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⢀⡠⠤⠙⠢⢄⡀⠀⢳⡄⢃⡼⠉⣀⠜⠋⠉⠒⢦⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       22
       22
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⢠⡯⠀⠀⠀⠀⠀⣠⡉⠙⣹⣿⠶⣮⣁⡀⠀⠀⠀⠀⢻⡀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       23
       23
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠳⣄⠀⠀⠀⠘⠛⠓⣛⠇⢸⡷⡀⠻⠟⠀⠀⠀⠀⢸⣧⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       24
       24
       +
               ⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠈⣹⠒⠶⢶⠒⠉⠀⠀⠈⠉⢫⠳⢄⣀⣀⣀⡤⠟⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       25
       25
       +
               ⠀⠀⠀⠀⠀⠀⠀⢀⣀⣤⡾⠋⠀⠀⢰⠀⠀⠀⠀⠀⠀⢸⣇⠀⠈⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       26
       26
       +
               ⠀⠀⠀⠀⣠⣴⣾⠿⠛⠁⠀⠀⠀⠀⠈⠳⣄⣀⣀⣀⡤⠞⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       27
       27
       +
               ⠀⠀⣴⣿⡿⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       28
       28
       +
               ⠀⣾⡟⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       29
       29
       +
               ⢸⡿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       30
       30
       +
               ⠈⢧⡃⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       31
       31
       +
               ⠀⠈⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀

     

       32
       32
       +
       

     

       33
       33
       +
             Welcome to Sapphic Angels' Knot server for tangled.org.

     

       34
       34
       +
           '';

     

       35
       35
       +
           server = {

     

       36
       36
       +
             hostname = "knot.sappho.systems";

     

       37
       37
       +
             owner = "did:plc:ucaezectmpny7l42baeyooxi";

     

       38
       38
       +
           };

     

       39
       39
       +
         };

     

       40
       40
       +
       

     

       41
       41
       +
         services.caddy.virtualHosts."knot.sappho.systems" = {

     

       42
       42
       +
           extraConfig = ''

     

       43
       43
       +
             import common

     

       44
       44
       +
             import tls_bunny

     

       45
       45
       +
             reverse_proxy http://127.0.0.1:5555

     

       46
       46
       +
           '';

     

       47
       47
       +
         };

     

       48
       48
       +
       

     

       49
       49
       +
         settings.firewall.allowedTCPPorts = [ 22 ];

     

       50
       50
       +
       }

+1 -2

services/lanyard/default.nix

···

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         services.caddy.virtualHosts."lanyard.sappho.systems" = {

     

       30
       30
       -
           listenAddresses = [ "::" ];

     

       31
       30
        
           extraConfig = ''

     

       32
       31
        
             import common

     

       33
       33
       -
             import tls_cloudflare

     

       32
       32
       +
             import tls_bunny

     

       34
       33
        
             reverse_proxy http://127.0.0.1:4001

     

       35
       34
        
           '';

     

       36
       35
        
         };

+2 -5

services/ntfy/default.nix

···

       31
       31
        
         };

     

       32
       32
        
       

     

       33
       33
        
         services.caddy.virtualHosts."notify.sappho.systems" = {

     

       34
       34
       -
           listenAddresses = [ "::" ];

     

       35
       34
        
           extraConfig = ''

     

       36
       35
        
             import common

     

       37
       37
       -
             import tls_cloudflare

     

       36
       36
       +
             import tls_bunny

     

       37
       37
       +
       

     

       38
       38
        
             reverse_proxy http://127.0.0.1:7070

     

       39
       39
        
           '';

     

       40
       40
        
         };

     

       41
       41
       -
       

     

       42
       42
       -
         # Firewall

     

       43
       43
       -
         settings.firewall.allowedTCPPorts = [ 7070 ];

     

       44
       41
        
       }

+3 -21

services/outline/default.nix

···

       108
       108
        
         services.caddy.virtualHosts."wiki.sappho.systems" = {

     

       109
       109
        
           extraConfig = ''

     

       110
       110
        
             import common

     

       111
       111
       -
             import tls_cloudflare

     

       111
       111
       +
             import tls_bunny

     

       112
       112
        
             reverse_proxy http://localhost:3300

     

       113
       113
        
           '';

     

       114
       114
        
         };

     
···

       116
       116
        
         services.caddy.virtualHosts."minio.sappho.systems" = {

     

       117
       117
        
           extraConfig = ''

     

       118
       118
        
             import common

     

       119
       119
       -
             import tls_cloudflare

     

       120
       120
       -
             reverse_proxy http://localhost:9000 {

     

       121
       121
       -
               transport http {

     

       122
       122
       -
                 versions 1.1

     

       123
       123
       -
               }

     

       124
       124
       -
             }

     

       125
       125
       -
           '';

     

       126
       126
       -
         };

     

       127
       127
       -
       

     

       128
       128
       -
         services.caddy.virtualHosts."minio-admin.sappho.systems" = {

     

       129
       129
       -
           extraConfig = ''

     

       130
       130
       -
             import common

     

       131
       131
       -
             import tls_cloudflare

     

       132
       132
       -
             reverse_proxy http://localhost:9001 {

     

       133
       133
       -
               transport http {

     

       134
       134
       -
                 versions 1.1

     

       135
       135
       -
               }

     

       136
       136
       -
             }

     

       119
       119
       +
             import tls_bunny

     

       120
       120
       +
             reverse_proxy http://localhost:9000

     

       137
       121
        
           '';

     

       138
       122
        
         };

     

       139
       139
       -
       

     

       140
       140
       -
         settings.firewall.allowedTCPPorts = [ 3300 ];

     

       141
       123
        
       }

Compare changes