commit 6d319f695e341cc96f9eeacc27444195b9e8c5b1 · yemou.pink/nix-configs

+38 -21

flake.lock

···

       1
       1
        
       {

     

       2
       2
        
         "nodes": {

     

       3
       3
       +
           "actor-typeahead-src": {

     

       4
       4
       +
             "flake": false,

     

       5
       5
       +
             "locked": {

     

       6
       6
       +
               "lastModified": 1762835797,

     

       7
       7
       +
               "narHash": "sha256-heizoWUKDdar6ymfZTnj3ytcEv/L4d4fzSmtr0HlXsQ=",

     

       8
       8
       +
               "ref": "refs/heads/main",

     

       9
       9
       +
               "rev": "677fe7f743050a4e7f09d4a6f87bbf1325a06f6b",

     

       10
       10
       +
               "revCount": 6,

     

       11
       11
       +
               "type": "git",

     

       12
       12
       +
               "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"

     

       13
       13
       +
             },

     

       14
       14
       +
             "original": {

     

       15
       15
       +
               "type": "git",

     

       16
       16
       +
               "url": "https://tangled.org/@jakelazaroff.com/actor-typeahead"

     

       17
       17
       +
             }

     

       18
       18
       +
           },

     

       3
       19
        
           "flake-compat": {

     

       4
       20
        
             "flake": false,

     

       5
       21
        
             "locked": {

     
···

       204
       220
        
           },

     

       205
       221
        
           "nixpkgs": {

     

       206
       222
        
             "locked": {

     

       207
       207
       -
               "lastModified": 1763377333,

     

       208
       208
       -
               "narHash": "sha256-GtikA/H/igDjeLBq1J34N0ZtmsEO4g67B7UbBhLHXKo=",

     

       223
       223
       +
               "lastModified": 1763553727,

     

       224
       224
       +
               "narHash": "sha256-4aRqRkYHplWk0mrtoF5i3Uo73E3niOWiUZU8kmPm9hQ=",

     

       209
       225
        
               "owner": "NixOS",

     

       210
       226
        
               "repo": "nixpkgs",

     

       211
       211
       -
               "rev": "c0fad0156f3ee09c49be8afcf66d4ef61c46f9c6",

     

       227
       227
       +
               "rev": "094318ea16502a7a81ce90dd3638697020f030a2",

     

       212
       228
        
               "type": "github"

     

       213
       229
        
             },

     

       214
       230
        
             "original": {

     
···

       236
       252
        
           },

     

       237
       253
        
           "nixpkgs-stable": {

     

       238
       254
        
             "locked": {

     

       239
       239
       -
               "lastModified": 1763411310,

     

       240
       240
       -
               "narHash": "sha256-yRA5u7CxGbBcr9D/biN0dX5LbQvKPvE+BfYo4qNdWCY=",

     

       255
       255
       +
               "lastModified": 1763608124,

     

       256
       256
       +
               "narHash": "sha256-zlZnIcby+AdBREjjqOG7xLamvs2RljQ48dyUwYFD6oM=",

     

       241
       257
        
               "owner": "NixOS",

     

       242
       258
        
               "repo": "nixpkgs",

     

       243
       243
       -
               "rev": "125da908972a1f0c803cffce8de607e20a77d7ed",

     

       259
       259
       +
               "rev": "f6af808f2d4b1d2feb64ec2d9901b322e980938a",

     

       244
       260
        
               "type": "github"

     

       245
       261
        
             },

     

       246
       262
        
             "original": {

     
···

       252
       268
        
           },

     

       253
       269
        
           "nixpkgs-unstable": {

     

       254
       270
        
             "locked": {

     

       255
       255
       -
               "lastModified": 1763283776,

     

       256
       256
       -
               "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",

     

       271
       271
       +
               "lastModified": 1763421233,

     

       272
       272
       +
               "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",

     

       257
       273
        
               "owner": "NixOS",

     

       258
       274
        
               "repo": "nixpkgs",

     

       259
       259
       -
               "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",

     

       275
       275
       +
               "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",

     

       260
       276
        
               "type": "github"

     

       261
       277
        
             },

     

       262
       278
        
             "original": {

     
···

       322
       338
        
               "rust-overlay": "rust-overlay"

     

       323
       339
        
             },

     

       324
       340
        
             "locked": {

     

       325
       325
       -
               "lastModified": 1763403324,

     

       326
       326
       -
               "narHash": "sha256-piGqnOdb5CJC8kVAjdFFvN9C/ImCNoi0Wkrt+0ulDig=",

     

       341
       341
       +
               "lastModified": 1763583727,

     

       342
       342
       +
               "narHash": "sha256-nhEg5l2h9fjqjFyBd+85laV6A3coUIN2UFhGoHJJxSI=",

     

       327
       343
        
               "owner": "roc-lang",

     

       328
       344
        
               "repo": "roc",

     

       329
       329
       -
               "rev": "6e50ca09fa8c0485cabe85b39a886228c80008ee",

     

       345
       345
       +
               "rev": "2fc3b7afb622fcc66d899975ba6a208e1c1d199e",

     

       330
       346
        
               "type": "github"

     

       331
       347
        
             },

     

       332
       348
        
             "original": {

     
···

       376
       392
        
               "nixpkgs": "nixpkgs_3"

     

       377
       393
        
             },

     

       378
       394
        
             "locked": {

     

       379
       379
       -
               "lastModified": 1763417348,

     

       380
       380
       -
               "narHash": "sha256-n5xDOeNN+smocQp3EMIc11IzBlR9wvvTIJZeL0g33Fs=",

     

       395
       395
       +
               "lastModified": 1763607916,

     

       396
       396
       +
               "narHash": "sha256-VefBA1JWRXM929mBAFohFUtQJLUnEwZ2vmYUNkFnSjE=",

     

       381
       397
        
               "owner": "Mic92",

     

       382
       398
        
               "repo": "sops-nix",

     

       383
       383
       -
               "rev": "3f66a7fb9626a9a9c077612ef10a0ce396286c7d",

     

       399
       399
       +
               "rev": "877bb495a6f8faf0d89fc10bd142c4b7ed2bcc0b",

     

       384
       400
        
               "type": "github"

     

       385
       401
        
             },

     

       386
       402
        
             "original": {

     
···

       434
       450
        
           },

     

       435
       451
        
           "tangled": {

     

       436
       452
        
             "inputs": {

     

       453
       453
       +
               "actor-typeahead-src": "actor-typeahead-src",

     

       437
       454
        
               "flake-compat": "flake-compat_2",

     

       438
       455
        
               "gomod2nix": "gomod2nix",

     

       439
       456
        
               "htmx-src": "htmx-src",

     
···

       446
       463
        
               "sqlite-lib-src": "sqlite-lib-src"

     

       447
       464
        
             },

     

       448
       465
        
             "locked": {

     

       449
       449
       -
               "lastModified": 1760875893,

     

       450
       450
       -
               "narHash": "sha256-t6OWN+7N4oeYhnfclOPyw0ZVsFrsWPXbXTGseyCKVMg=",

     

       451
       451
       -
               "ref": "refs/tags/v1.10.0-alpha",

     

       452
       452
       -
               "rev": "71d46921a8891ddf80417980d954b145be6cd213",

     

       453
       453
       -
               "revCount": 1546,

     

       466
       466
       +
               "lastModified": 1763627666,

     

       467
       467
       +
               "narHash": "sha256-t8UQ85/bPXrbFs3V/paFtQvv4lSrr2lszrdcgspuAaA=",

     

       468
       468
       +
               "ref": "refs/tags/v1.11.0-alpha",

     

       469
       469
       +
               "rev": "12ef7f8f63ee4a14a552ebed603802c79e4d72f8",

     

       470
       470
       +
               "revCount": 1678,

     

       454
       471
        
               "type": "git",

     

       455
       472
        
               "url": "https://tangled.org/tangled.org/core"

     

       456
       473
        
             },

     

       457
       474
        
             "original": {

     

       458
       458
       -
               "ref": "refs/tags/v1.10.0-alpha",

     

       475
       475
       +
               "ref": "refs/tags/v1.11.0-alpha",

     

       459
       476
        
               "type": "git",

     

       460
       477
        
               "url": "https://tangled.org/tangled.org/core"

     

       461
       478
        
             }

+1 -1

flake.nix

···

       21
       21
        
           };

     

       22
       22
        
       

     

       23
       23
        
           roc-lang.url = "github:roc-lang/roc";

     

       24
       24
       -
           tangled.url = "git+https://tangled.org/tangled.org/core?ref=refs/tags/v1.10.0-alpha";

     

       24
       24
       +
           tangled.url = "git+https://tangled.org/tangled.org/core?ref=refs/tags/v1.11.0-alpha";

     

       25
       25
        
       

     

       26
       26
        
           nixpkgs-pr432663-modrinth.url = "github:getchoo-contrib/nixpkgs?ref=pkgs/modrinth-app/0.10.3";

     

       27
       27
        
         };

+4 -4

modules/services/tangled.nix

···

       6
       6
        
           {

     

       7
       7
        
             directory = "/var/lib/tangled";

     

       8
       8
        
             mode = "0700";

     

       9
       9
       -
             user = config.services.tangled-knot.gitUser;

     

       10
       10
       -
             group = config.services.tangled-knot.gitUser;

     

       9
       9
       +
             user = config.services.tangled.knot.gitUser;

     

       10
       10
       +
             group = config.services.tangled.knot.gitUser;

     

       11
       11
        
           }

     

       12
       12
        
         ];

     

       13
       13
        
       

     

       14
       14
        
         services.openssh = {

     

       15
       15
        
           ports = [ 22 ];

     

       16
       16
       -
           settings.AllowUsers = [ "${config.services.tangled-knot.gitUser}" ];

     

       16
       16
       +
           settings.AllowUsers = [ "${config.services.tangled.knot.gitUser}" ];

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         networking.firewall.allowedTCPPorts = [ 22 ];

     

       20
       20
        
       

     

       21
       21
       -
         services.tangled-knot = {

     

       21
       21
       +
         services.tangled.knot = {

     

       22
       22
        
           enable = true;

     

       23
       23
        
           openFirewall = false;

     

       24
       24
        
           stateDir = "/var/lib/tangled";