comparing adddcbdb46192d2ebc5b380091233032015d9be0 and main on pyrox.dev/nix

-2

TODO.md

···

       18
       18
        
       - [ ] Move all Docker containers to using native versions of databases, redis, etc.

     

       19
       19
        
         - Ensures higher performance and reduces the number of running containers.

     

       20
       20
        
         - https://github.com/felschr/nixos-config/blob/main/services/immich.nix for an example of how to do it

     

       21
       21
       -
       - [ ] Add Archivebox service(needs custom module)

     

       22
       22
       -
       - [ ] Add Immich service

     

       23
       21
        
       

     

       24
       22
        
       ## Zaphod

     

       25
       23

+7 -3

devShells/default/default.nix

···

       4
       4
        
       }:

     

       5
       5
        
       pkgs.mkShellNoCC {

     

       6
       6
        
         packages = [

     

       7
       7
       +
           # keep-sorted start

     

       7
       8
        
           pkgs.deadnix

     

       8
       9
        
           pkgs.just

     

       9
       10
        
           pkgs.nil

     

       11
       11
       +
           pkgs.nix-output-monitor

     

       10
       12
        
           pkgs.nix-tree

     

       13
       13
       +
           pkgs.nix-update

     

       11
       14
        
           pkgs.nixd

     

       12
       12
       -
           pkgs.nix-output-monitor

     

       13
       15
        
           pkgs.nixfmt-rfc-style

     

       14
       14
       -
           pkgs.statix

     

       16
       16
       +
           pkgs.nixos-rebuild-ng

     

       15
       17
        
           pkgs.nvd

     

       16
       16
       -
           pkgs.nixos-rebuild-ng

     

       18
       18
       +
           pkgs.statix

     

       19
       19
       +
           pkgs.tokei

     

       20
       20
       +
           # keep-sorted endd

     

       17
       21
        
         ];

     

       18
       22
        
       }

+41 -41

flake.lock

···

       99
       99
        
               ]

     

       100
       100
        
             },

     

       101
       101
        
             "locked": {

     

       102
       102
       -
               "lastModified": 1763974329,

     

       103
       103
       -
               "narHash": "sha256-8bljTh08KrIzTwzJEM8rGCg56hGtIH6/oT0LctCPTOQ=",

     

       102
       102
       +
               "lastModified": 1764466211,

     

       103
       103
       +
               "narHash": "sha256-rBK+usqfAP9ZuEthw9wMCwTKQgKUMmziuzrrkpDZdzY=",

     

       104
       104
        
               "owner": "caelestia-dots",

     

       105
       105
        
               "repo": "shell",

     

       106
       106
       -
               "rev": "11282f6abe32f9671dc0a7ce49d64bc4f2d79e6b",

     

       106
       106
       +
               "rev": "40813e520582c5df11f6d4c870a31900fe171cce",

     

       107
       107
        
               "type": "github"

     

       108
       108
        
             },

     

       109
       109
        
             "original": {

     
···

       123
       123
        
               ]

     

       124
       124
        
             },

     

       125
       125
        
             "locked": {

     

       126
       126
       -
               "lastModified": 1763517499,

     

       127
       127
       -
               "narHash": "sha256-N5y55DwDNT+0kLFck2sy1+DcnLOZ/N05UEvZ2R5pmWo=",

     

       126
       126
       +
               "lastModified": 1764381410,

     

       127
       127
       +
               "narHash": "sha256-WR/oQQjveFqQxo8oHngZuOVgBQINDgPe+lCXLeNhAAg=",

     

       128
       128
        
               "owner": "caelestia-dots",

     

       129
       129
        
               "repo": "cli",

     

       130
       130
       -
               "rev": "1cfd405eaa74e66f33e7790c5c6586676f03a395",

     

       130
       130
       +
               "rev": "ed12d4cb82600872a82feb577711be1148c7af35",

     

       131
       131
        
               "type": "github"

     

       132
       132
        
             },

     

       133
       133
        
             "original": {

     
···

       141
       141
        
               "nixpkgs": "nixpkgs"

     

       142
       142
        
             },

     

       143
       143
        
             "locked": {

     

       144
       144
       -
               "lastModified": 1763974424,

     

       145
       145
       -
               "narHash": "sha256-jPpxBhrBOAKrXPxdrdXnq4w7x3UIkUZjarNLNYkb7Zo=",

     

       144
       144
       +
               "lastModified": 1764325801,

     

       145
       145
       +
               "narHash": "sha256-LQ7tsrXs1wuB6KBwUctL3JlUsG/FWI2pCI6NkoO52dk=",

     

       146
       146
        
               "owner": "catppuccin",

     

       147
       147
        
               "repo": "nix",

     

       148
       148
       -
               "rev": "931c6465c3eac4709684dbc320bca243252927df",

     

       148
       148
       +
               "rev": "a696fed6b9b6aa89ef495842cdca3fc2a7cef0de",

     

       149
       149
        
               "type": "github"

     

       150
       150
        
             },

     

       151
       151
        
             "original": {

     
···

       205
       205
        
               ]

     

       206
       206
        
             },

     

       207
       207
        
             "locked": {

     

       208
       208
       -
               "lastModified": 1764100979,

     

       209
       209
       -
               "narHash": "sha256-Z/XgP+Lt4NnMELhQkLIfYsjwSXQQH5xLYuL/5fRZ/Sw=",

     

       208
       208
       +
               "lastModified": 1764553800,

     

       209
       209
       +
               "narHash": "sha256-kHlx3E3K2UNWI1Hpbyl5zieoOVevZfwz8P/OcyViDHY=",

     

       210
       210
        
               "owner": "AvengeMedia",

     

       211
       211
        
               "repo": "DankMaterialShell",

     

       212
       212
       -
               "rev": "08641790856d293a11c7647dcb940b05c184abbb",

     

       212
       212
       +
               "rev": "7959a795753d9f646cfb9e21cfb778adf7e5c933",

     

       213
       213
        
               "type": "github"

     

       214
       214
        
             },

     

       215
       215
        
             "original": {

     
···

       274
       274
        
               ]

     

       275
       275
        
             },

     

       276
       276
        
             "locked": {

     

       277
       277
       -
               "lastModified": 1764119541,

     

       278
       278
       -
               "narHash": "sha256-WmrejR45x4oFf3g3kJFi3jPhoQ9h8oaAGiIAb8ulZcw=",

     

       277
       277
       +
               "lastModified": 1764646680,

     

       278
       278
       +
               "narHash": "sha256-HEVzGL23bev8CuZXbLgDZRWy+mD/qPZhRBpjag7G/dU=",

     

       279
       279
        
               "owner": "pyrox0",

     

       280
       280
        
               "repo": "dn43.nix",

     

       281
       281
       -
               "rev": "afdab3ea9e7ef9c4472143e63941cd7bdd5d1c77",

     

       281
       281
       +
               "rev": "c8b68602cf1ef696e6a9f9c25e8c177d4101331b",

     

       282
       282
        
               "type": "github"

     

       283
       283
        
             },

     

       284
       284
        
             "original": {

     
···

       411
       411
        
               "systems": "systems_4"

     

       412
       412
        
             },

     

       413
       413
        
             "locked": {

     

       414
       414
       -
               "lastModified": 1760925941,

     

       415
       415
       -
               "narHash": "sha256-M+EJsr6z05heKk6iuh3RWZS+9gAMBwG9IyryACVpOy0=",

     

       414
       414
       +
               "lastModified": 1764170522,

     

       415
       415
       +
               "narHash": "sha256-4c9jCOfkKNRHJLXgOIcVcNSaw/XaiVaqesaLJn86wGA=",

     

       416
       416
        
               "owner": "tailscale",

     

       417
       417
        
               "repo": "golink",

     

       418
       418
       -
               "rev": "42765dea97afa9f9f5ea167fb0df6f5372d78481",

     

       418
       418
       +
               "rev": "6821994de926c565d3ef9fbf3cb0e0fcb780f4be",

     

       419
       419
        
               "type": "github"

     

       420
       420
        
             },

     

       421
       421
        
             "original": {

     
···

       448
       448
        
           },

     

       449
       449
        
           "hardware": {

     

       450
       450
        
             "locked": {

     

       451
       451
       -
               "lastModified": 1764080039,

     

       452
       452
       -
               "narHash": "sha256-b1MtLQsQc4Ji1u08f+C6g5XrmLPkJQ1fhNkCt+0AERQ=",

     

       451
       451
       +
               "lastModified": 1764440730,

     

       452
       452
       +
               "narHash": "sha256-ZlJTNLUKQRANlLDomuRWLBCH5792x+6XUJ4YdFRjtO4=",

     

       453
       453
        
               "owner": "nixos",

     

       454
       454
        
               "repo": "nixos-hardware",

     

       455
       455
       -
               "rev": "da17006633ca9cda369be82893ae36824a2ddf1a",

     

       455
       455
       +
               "rev": "9154f4569b6cdfd3c595851a6ba51bfaa472d9f3",

     

       456
       456
        
               "type": "github"

     

       457
       457
        
             },

     

       458
       458
        
             "original": {

     
···

       493
       493
        
               ]

     

       494
       494
        
             },

     

       495
       495
        
             "locked": {

     

       496
       496
       -
               "lastModified": 1764075860,

     

       497
       497
       -
               "narHash": "sha256-KYEIHCBBw+/lwKsJNRNoUxBB4ZY2LK0G0T8f+0i65q0=",

     

       496
       496
       +
               "lastModified": 1764544324,

     

       497
       497
       +
               "narHash": "sha256-GVBGjO7UsmzLrlOJV8NlKSxukHaHencrJqWkCA6FkqI=",

     

       498
       498
        
               "owner": "nix-community",

     

       499
       499
        
               "repo": "home-manager",

     

       500
       500
       -
               "rev": "295d90e22d557ccc3049dc92460b82f372cd3892",

     

       500
       500
       +
               "rev": "e4e25a8c310fa45f2a8339c7972dc43d2845a612",

     

       501
       501
        
               "type": "github"

     

       502
       502
        
             },

     

       503
       503
        
             "original": {

     
···

       612
       612
        
               ]

     

       613
       613
        
             },

     

       614
       614
        
             "locked": {

     

       615
       615
       -
               "lastModified": 1763870992,

     

       616
       616
       -
               "narHash": "sha256-NPyc76Wxmv/vAsXJ8F+/8fXECHYcv2YGSqdiSHp/F/A=",

     

       615
       615
       +
               "lastModified": 1764475780,

     

       616
       616
       +
               "narHash": "sha256-77jL5H5x51ksLiOUDjY0ZK8e2T4ZXLhj3ap8ETvknWI=",

     

       617
       617
        
               "owner": "Mic92",

     

       618
       618
        
               "repo": "nix-index-database",

     

       619
       619
       -
               "rev": "d7423982c7a26586aa237d130b14c8b302c7a367",

     

       619
       619
       +
               "rev": "5a3ff8c1a09003f399f43d5742d893c0b1ab8af0",

     

       620
       620
        
               "type": "github"

     

       621
       621
        
             },

     

       622
       622
        
             "original": {

     
···

       627
       627
        
           },

     

       628
       628
        
           "nixpkgs": {

     

       629
       629
        
             "locked": {

     

       630
       630
       -
               "lastModified": 1763421233,

     

       631
       631
       -
               "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=",

     

       630
       630
       +
               "lastModified": 1763966396,

     

       631
       631
       +
               "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=",

     

       632
       632
        
               "owner": "NixOS",

     

       633
       633
        
               "repo": "nixpkgs",

     

       634
       634
       -
               "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648",

     

       634
       634
       +
               "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a",

     

       635
       635
        
               "type": "github"

     

       636
       636
        
             },

     

       637
       637
        
             "original": {

     
···

       674
       674
        
           },

     

       675
       675
        
           "nixpkgs_2": {

     

       676
       676
        
             "locked": {

     

       677
       677
       -
               "lastModified": 1763934636,

     

       678
       678
       -
               "narHash": "sha256-C1ZBijVfDnXQxVjITn2omp5rSP4TyENKyFsxozcYFzo=",

     

       679
       679
       -
               "rev": "ee09932cedcef15aaf476f9343d1dea2cb77e261",

     

       677
       677
       +
               "lastModified": 1764527385,

     

       678
       678
       +
               "narHash": "sha256-gpwyCnyi2or0InBXe+4I9YeED3Uly3EGH58qvVnchBY=",

     

       679
       679
       +
               "rev": "23258e03aaa49b3a68597e3e50eb0cbce7e42e9d",

     

       680
       680
        
               "type": "tarball",

     

       681
       681
       -
               "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre901289.ee09932cedce/nixexprs.tar.xz"

     

       681
       681
       +
               "url": "https://releases.nixos.org/nixpkgs/nixpkgs-26.05pre904683.23258e03aaa4/nixexprs.tar.xz"

     

       682
       682
        
             },

     

       683
       683
        
             "original": {

     

       684
       684
        
               "type": "tarball",

     
···

       708
       708
        
               ]

     

       709
       709
        
             },

     

       710
       710
        
             "locked": {

     

       711
       711
       -
               "lastModified": 1764045583,

     

       712
       712
       -
               "narHash": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=",

     

       711
       711
       +
               "lastModified": 1764482797,

     

       712
       712
       +
               "narHash": "sha256-ynV90KoBrPe38YFlKAHtPFk4Ee3IANUsIFGxRaq7H/s=",

     

       713
       713
        
               "owner": "quickshell-mirror",

     

       714
       714
        
               "repo": "quickshell",

     

       715
       715
       -
               "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3",

     

       715
       715
       +
               "rev": "d24e8e9736287d01ee73ef9d573d2bc316a62d5c",

     

       716
       716
        
               "type": "github"

     

       717
       717
        
             },

     

       718
       718
        
             "original": {

     
···

       851
       851
        
               "sqlite-lib-src": "sqlite-lib-src"

     

       852
       852
        
             },

     

       853
       853
        
             "locked": {

     

       854
       854
       -
               "lastModified": 1764005195,

     

       855
       855
       -
               "narHash": "sha256-PzuWiW/nMxwQTX0i1bHwGazQF4ptLNI9OGwpmhDb9i0=",

     

       854
       854
       +
               "lastModified": 1764494836,

     

       855
       855
       +
               "narHash": "sha256-u1i7aMo0fTQ6WVdOZhG2fo/gEx2Fq8+3URmuqEBZGWI=",

     

       856
       856
        
               "ref": "refs/heads/master",

     

       857
       857
       -
               "rev": "7358ec6edfa4d17b8b8f543d99e83a4705901148",

     

       858
       858
       -
               "revCount": 1687,

     

       857
       857
       +
               "rev": "d37f774fb8c60aa2bd0cb965c9884457d0afb660",

     

       858
       858
       +
               "revCount": 1689,

     

       859
       859
        
               "type": "git",

     

       860
       860
        
               "url": "https://tangled.org/@tangled.org/core"

     

       861
       861
        
             },

+1 -1

homeModules/profiles/base/default.nix

···

       10
       10
        
       {

     

       11
       11
        
         options.py.profiles.base.enable = lib.mkEnableOption "Base Home Profile";

     

       12
       12
        
         config = lib.mkIf cfg.enable {

     

       13
       13
       -
           home.stateVersion = "25.11";

     

       13
       13
       +
           home.stateVersion = "26.05";

     

       14
       14
        
           home.language = {

     

       15
       15
        
             base = "en_US.utf8";

     

       16
       16
        
           };

+1

hosts/marvin/default.nix

···

       17
       17
        
           ./services/git.nix

     

       18
       18
        
           ./services/golink.nix

     

       19
       19
        
           ./services/grafana.nix

     

       20
       20
       +
           ./services/immich.nix

     

       20
       21
        
           ./services/jellyfin.nix

     

       21
       22
        
           ./services/matrix.nix

     

       22
       23
        
           ./services/miniflux.nix

+5 -5

hosts/marvin/services/git.nix

···

       41
       41
        
           };

     

       42
       42
        
           settings = {

     

       43
       43
        
             DEFAULT = {

     

       44
       44
       -
               APP_NAME = "PyroNet Git";

     

       44
       44
       +
               APP_NAME = "dishNet Git";

     

       45
       45
        
               RUN_MODE = "prod";

     

       46
       46
        
             };

     

       47
       47
        
             attachment = {

     

       48
       48
        
               MAX_SIZE = 200;

     

       49
       49
        
             };

     

       50
       50
       -
             log."logger.router.MODE" = "";

     

       50
       50
       +
             log.LOGGER_ROUTER_MODE = "";

     

       51
       51
        
             mailer = {

     

       52
       52
        
               ENABLED = true;

     

       53
       53
       -
               FROM = "PyroNet Git <git@pyrox.dev>";

     

       53
       53
       +
               FROM = "dishNet Git <git@pyrox.dev>";

     

       54
       54
        
               PROTOCOL = "smtps";

     

       55
       55
        
               SMTP_ADDR = "mail.pyrox.dev";

     

       56
       56
        
               SMTP_PORT = 465;

     
···

       66
       66
        
             };

     

       67
       67
        
             "ui.meta" = {

     

       68
       68
        
               AUTHOR = "dish";

     

       69
       69
       -
               DESCRIPTION = "PyroNet Git Services";

     

       69
       69
       +
               DESCRIPTION = "dishNet Git Services";

     

       70
       70
        
             };

     

       71
       71
        
             metrics = {

     

       72
       72
        
               ENABLED = true;

     
···

       85
       85
        
               ISSUE_INDEXER_PATH = "indexers/issues.bleve";

     

       86
       86
        
               # Enable repo indexing

     

       87
       87
        
               REPO_INDEXER_ENABLED = true;

     

       88
       88
       -
               REPO_INDEXER_REPO_TYPES = "sources,forks,templates,mirrors";

     

       88
       88
       +
               REPO_INDEXER_REPO_TYPES = "sources,forks";

     

       89
       89
        
               REPO_INDEXER_TYPE = "bleve";

     

       90
       90
        
               REPO_INDEXER_PATH = "indexers/repos.bleve";

     

       91
       91
        
             };

+4 -4

hosts/marvin/services/grafana.nix

···

       40
       40
        
             };

     

       41
       41
        
             smtp = {

     

       42
       42
        
               enabled = true;

     

       43
       43
       -
               user = "grafana@thehedgehog.me";

     

       44
       44
       -
               from_address = "grafana@thehedgehog.me";

     

       45
       45
       -
               host = "smtp.migadu.com:465";

     

       43
       43
       +
               user = "grafana@pyrox.dev";

     

       44
       44
       +
               from_address = "grafana@pyrox.dev";

     

       45
       45
       +
               host = "mail.pyrox.dev:465";

     

       46
       46
        
               password = "$__file{${config.age.secrets.grafana-smtp-password.path}}";

     

       47
       47
        
             };

     

       48
       48
        
           };

     
···

       62
       62
        
         services.anubis.instances.grafana = {

     

       63
       63
        
           settings = {

     

       64
       64
        
             BIND = ":${toString d.anubis}";

     

       65
       65
       -
             POLICY_FNAME = "${self'.packages.anubis-files}/policies/grafana.yaml";

     

       65
       65
       +
             POLICY_FNAME = "${self'.packages.anubis-files}/policies/default.yaml";

     

       66
       66
        
             TARGET = "http://localhost:${toString d.port}";

     

       67
       67
        
           };

     

       68
       68
        
         };

+223

hosts/marvin/services/immich-config.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "backup": {

     

       3
       3
       +
           "database": {

     

       4
       4
       +
             "cronExpression": "0 02 * * *",

     

       5
       5
       +
             "enabled": true,

     

       6
       6
       +
             "keepLastAmount": 14

     

       7
       7
       +
           }

     

       8
       8
       +
         },

     

       9
       9
       +
         "ffmpeg": {

     

       10
       10
       +
           "accel": "vaapi",

     

       11
       11
       +
           "accelDecode": true,

     

       12
       12
       +
           "acceptedAudioCodecs": ["aac", "mp3", "libopus"],

     

       13
       13
       +
           "acceptedContainers": ["mov", "ogg", "webm"],

     

       14
       14
       +
           "acceptedVideoCodecs": ["h264"],

     

       15
       15
       +
           "bframes": -1,

     

       16
       16
       +
           "cqMode": "auto",

     

       17
       17
       +
           "crf": 23,

     

       18
       18
       +
           "gopSize": 0,

     

       19
       19
       +
           "maxBitrate": "0",

     

       20
       20
       +
           "preferredHwDevice": "auto",

     

       21
       21
       +
           "preset": "veryfast",

     

       22
       22
       +
           "refs": 0,

     

       23
       23
       +
           "targetAudioCodec": "aac",

     

       24
       24
       +
           "targetResolution": "720",

     

       25
       25
       +
           "targetVideoCodec": "h264",

     

       26
       26
       +
           "temporalAQ": false,

     

       27
       27
       +
           "threads": 0,

     

       28
       28
       +
           "tonemap": "hable",

     

       29
       29
       +
           "transcode": "required",

     

       30
       30
       +
           "twoPass": false

     

       31
       31
       +
         },

     

       32
       32
       +
         "image": {

     

       33
       33
       +
           "colorspace": "p3",

     

       34
       34
       +
           "extractEmbedded": false,

     

       35
       35
       +
           "fullsize": {

     

       36
       36
       +
             "enabled": false,

     

       37
       37
       +
             "format": "jpeg",

     

       38
       38
       +
             "quality": 80

     

       39
       39
       +
           },

     

       40
       40
       +
           "preview": {

     

       41
       41
       +
             "format": "jpeg",

     

       42
       42
       +
             "quality": 80,

     

       43
       43
       +
             "size": 1440

     

       44
       44
       +
           },

     

       45
       45
       +
           "thumbnail": {

     

       46
       46
       +
             "format": "webp",

     

       47
       47
       +
             "quality": 80,

     

       48
       48
       +
             "size": 250

     

       49
       49
       +
           }

     

       50
       50
       +
         },

     

       51
       51
       +
         "job": {

     

       52
       52
       +
           "backgroundTask": {

     

       53
       53
       +
             "concurrency": 5

     

       54
       54
       +
           },

     

       55
       55
       +
           "faceDetection": {

     

       56
       56
       +
             "concurrency": 2

     

       57
       57
       +
           },

     

       58
       58
       +
           "library": {

     

       59
       59
       +
             "concurrency": 5

     

       60
       60
       +
           },

     

       61
       61
       +
           "metadataExtraction": {

     

       62
       62
       +
             "concurrency": 5

     

       63
       63
       +
           },

     

       64
       64
       +
           "migration": {

     

       65
       65
       +
             "concurrency": 5

     

       66
       66
       +
           },

     

       67
       67
       +
           "notifications": {

     

       68
       68
       +
             "concurrency": 5

     

       69
       69
       +
           },

     

       70
       70
       +
           "ocr": {

     

       71
       71
       +
             "concurrency": 1

     

       72
       72
       +
           },

     

       73
       73
       +
           "search": {

     

       74
       74
       +
             "concurrency": 5

     

       75
       75
       +
           },

     

       76
       76
       +
           "sidecar": {

     

       77
       77
       +
             "concurrency": 5

     

       78
       78
       +
           },

     

       79
       79
       +
           "smartSearch": {

     

       80
       80
       +
             "concurrency": 2

     

       81
       81
       +
           },

     

       82
       82
       +
           "thumbnailGeneration": {

     

       83
       83
       +
             "concurrency": 3

     

       84
       84
       +
           },

     

       85
       85
       +
           "videoConversion": {

     

       86
       86
       +
             "concurrency": 1

     

       87
       87
       +
           },

     

       88
       88
       +
           "workflow": {

     

       89
       89
       +
             "concurrency": 5

     

       90
       90
       +
           }

     

       91
       91
       +
         },

     

       92
       92
       +
         "library": {

     

       93
       93
       +
           "scan": {

     

       94
       94
       +
             "cronExpression": "0 0 * * *",

     

       95
       95
       +
             "enabled": true

     

       96
       96
       +
           },

     

       97
       97
       +
           "watch": {

     

       98
       98
       +
             "enabled": false

     

       99
       99
       +
           }

     

       100
       100
       +
         },

     

       101
       101
       +
         "logging": {

     

       102
       102
       +
           "enabled": true,

     

       103
       103
       +
           "level": "log"

     

       104
       104
       +
         },

     

       105
       105
       +
         "machineLearning": {

     

       106
       106
       +
           "availabilityChecks": {

     

       107
       107
       +
             "enabled": true,

     

       108
       108
       +
             "interval": 30000,

     

       109
       109
       +
             "timeout": 2000

     

       110
       110
       +
           },

     

       111
       111
       +
           "clip": {

     

       112
       112
       +
             "enabled": true,

     

       113
       113
       +
             "modelName": "ViT-B-16-SigLIP2__webli"

     

       114
       114
       +
           },

     

       115
       115
       +
           "duplicateDetection": {

     

       116
       116
       +
             "enabled": true,

     

       117
       117
       +
             "maxDistance": 0.01

     

       118
       118
       +
           },

     

       119
       119
       +
           "enabled": true,

     

       120
       120
       +
           "facialRecognition": {

     

       121
       121
       +
             "enabled": true,

     

       122
       122
       +
             "maxDistance": 0.5,

     

       123
       123
       +
             "minFaces": 7,

     

       124
       124
       +
             "minScore": 0.7,

     

       125
       125
       +
             "modelName": "buffalo_l"

     

       126
       126
       +
           },

     

       127
       127
       +
           "ocr": {

     

       128
       128
       +
             "enabled": true,

     

       129
       129
       +
             "maxResolution": 736,

     

       130
       130
       +
             "minDetectionScore": 0.5,

     

       131
       131
       +
             "minRecognitionScore": 0.8,

     

       132
       132
       +
             "modelName": "EN__PP-OCRv5_mobile"

     

       133
       133
       +
           },

     

       134
       134
       +
           "urls": ["http://localhost:3003"]

     

       135
       135
       +
         },

     

       136
       136
       +
         "map": {

     

       137
       137
       +
           "darkStyle": "https://tiles.immich.cloud/v1/style/dark.json",

     

       138
       138
       +
           "enabled": true,

     

       139
       139
       +
           "lightStyle": "https://tiles.immich.cloud/v1/style/light.json"

     

       140
       140
       +
         },

     

       141
       141
       +
         "metadata": {

     

       142
       142
       +
           "faces": {

     

       143
       143
       +
             "import": false

     

       144
       144
       +
           }

     

       145
       145
       +
         },

     

       146
       146
       +
         "newVersionCheck": {

     

       147
       147
       +
           "enabled": false

     

       148
       148
       +
         },

     

       149
       149
       +
         "nightlyTasks": {

     

       150
       150
       +
           "clusterNewFaces": true,

     

       151
       151
       +
           "databaseCleanup": true,

     

       152
       152
       +
           "generateMemories": true,

     

       153
       153
       +
           "missingThumbnails": true,

     

       154
       154
       +
           "startTime": "00:00",

     

       155
       155
       +
           "syncQuotaUsage": true

     

       156
       156
       +
         },

     

       157
       157
       +
         "notifications": {

     

       158
       158
       +
           "smtp": {

     

       159
       159
       +
             "enabled": true,

     

       160
       160
       +
             "from": "dishNet Photos <immich@pyrox.dev>",

     

       161
       161
       +
             "replyTo": "",

     

       162
       162
       +
             "transport": {

     

       163
       163
       +
               "host": "mail.pyrox.dev",

     

       164
       164
       +
               "ignoreCert": false,

     

       165
       165
       +
               "port": 25,

     

       166
       166
       +
               "secure": true,

     

       167
       167
       +
               "username": "immich@pyrox.dev"

     

       168
       168
       +
             }

     

       169
       169
       +
           }

     

       170
       170
       +
         },

     

       171
       171
       +
         "oauth": {

     

       172
       172
       +
           "autoLaunch": false,

     

       173
       173
       +
           "autoRegister": true,

     

       174
       174
       +
           "buttonText": "Login with Pocket-ID",

     

       175
       175
       +
           "clientId": "f1312240-d9fc-4336-aca6-b98316867848",

     

       176
       176
       +
           "defaultStorageQuota": null,

     

       177
       177
       +
           "enabled": true,

     

       178
       178
       +
           "issuerUrl": "https://auth.pyrox.dev",

     

       179
       179
       +
           "mobileOverrideEnabled": false,

     

       180
       180
       +
           "mobileRedirectUri": "",

     

       181
       181
       +
           "profileSigningAlgorithm": "none",

     

       182
       182
       +
           "roleClaim": "immich_role",

     

       183
       183
       +
           "scope": "openid email profile immich_role",

     

       184
       184
       +
           "signingAlgorithm": "RS256",

     

       185
       185
       +
           "storageLabelClaim": "preferred_username",

     

       186
       186
       +
           "storageQuotaClaim": "immich_quota",

     

       187
       187
       +
           "timeout": 30000,

     

       188
       188
       +
           "tokenEndpointAuthMethod": "client_secret_post"

     

       189
       189
       +
         },

     

       190
       190
       +
         "passwordLogin": {

     

       191
       191
       +
           "enabled": true

     

       192
       192
       +
         },

     

       193
       193
       +
         "reverseGeocoding": {

     

       194
       194
       +
           "enabled": true

     

       195
       195
       +
         },

     

       196
       196
       +
         "server": {

     

       197
       197
       +
           "externalDomain": "https://img.pyrox.dev",

     

       198
       198
       +
           "loginPageMessage": "",

     

       199
       199
       +
           "publicUsers": true

     

       200
       200
       +
         },

     

       201
       201
       +
         "storageTemplate": {

     

       202
       202
       +
           "enabled": false,

     

       203
       203
       +
           "hashVerificationEnabled": true,

     

       204
       204
       +
           "template": "{{y}}/{{y}}-{{MM}}-{{dd}}/{{filename}}"

     

       205
       205
       +
         },

     

       206
       206
       +
         "templates": {

     

       207
       207
       +
           "email": {

     

       208
       208
       +
             "albumInviteTemplate": "",

     

       209
       209
       +
             "albumUpdateTemplate": "",

     

       210
       210
       +
             "welcomeTemplate": ""

     

       211
       211
       +
           }

     

       212
       212
       +
         },

     

       213
       213
       +
         "theme": {

     

       214
       214
       +
           "customCss": ""

     

       215
       215
       +
         },

     

       216
       216
       +
         "trash": {

     

       217
       217
       +
           "days": 30,

     

       218
       218
       +
           "enabled": true

     

       219
       219
       +
         },

     

       220
       220
       +
         "user": {

     

       221
       221
       +
           "deleteDelay": 7

     

       222
       222
       +
         }

     

       223
       223
       +
       }

+51

hosts/marvin/services/immich.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         self,

     

       3
       3
       +
         config,

     

       4
       4
       +
         lib,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         d = self.lib.data.services.immich;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         services = {

     

       12
       12
       +
           immich = {

     

       13
       13
       +
             inherit (d) port;

     

       14
       14
       +
             enable = true;

     

       15
       15
       +
             host = "0.0.0.0";

     

       16
       16
       +
             redis.enable = true;

     

       17
       17
       +
             mediaLocation = "/var/media/photos/";

     

       18
       18
       +
             accelerationDevices = [ "/dev/dri/renderD128" ];

     

       19
       19
       +
             settings = lib.recursiveUpdate (builtins.fromJSON (builtins.readFile ./immich-config.json)) {

     

       20
       20
       +
               oauth.clientSecret._secret = config.age.secrets.immich-oauth-secret.path;

     

       21
       21
       +
               notifications.smtp.transport.password._secret = config.age.secrets.immich-mail-pw.path;

     

       22
       22
       +
               server.externalDomain = "https://${d.extUrl}";

     

       23
       23
       +
             };

     

       24
       24
       +
           };

     

       25
       25
       +
           immich-public-proxy = {

     

       26
       26
       +
             enable = true;

     

       27
       27
       +
             port = d.pubProxy;

     

       28
       28
       +
             immichUrl = "http://localhost:${toString d.port}";

     

       29
       29
       +
             settings.ipp = {

     

       30
       30
       +
               downloadedFilename = 1;

     

       31
       31
       +
             };

     

       32
       32
       +
           };

     

       33
       33
       +
         };

     

       34
       34
       +
         systemd.services.immich-public-proxy.environment.PUBLIC_BASE_URL = "https://${d.extUrl}";

     

       35
       35
       +
         users.users.immich.extraGroups = [

     

       36
       36
       +
           "video"

     

       37
       37
       +
           "render"

     

       38
       38
       +
         ];

     

       39
       39
       +
         age.secrets = {

     

       40
       40
       +
           immich-oauth-secret = {

     

       41
       41
       +
             file = ./secrets/immich/oauth-secret.age;

     

       42
       42
       +
             owner = "immich";

     

       43
       43
       +
             group = "immich";

     

       44
       44
       +
           };

     

       45
       45
       +
           immich-mail-pw = {

     

       46
       46
       +
             file = ./secrets/immich/mail-pw.age;

     

       47
       47
       +
             owner = "immich";

     

       48
       48
       +
             group = "immich";

     

       49
       49
       +
           };

     

       50
       50
       +
         };

     

       51
       51
       +
       }

+97 -32

hosts/marvin/services/planka.nix

···

       1
       1
        
       {

     

       2
       2
       +
         lib,

     

       2
       3
        
         config,

     

       3
       4
        
         self,

     

       5
       5
       +
         self',

     

       6
       6
       +
         pkgs,

     

       4
       7
        
         ...

     

       5
       8
        
       }:

     

       6
       9
        
       let

     

       7
       7
       -
         dataDir = "/var/lib/planka";

     

       8
       10
        
         d = self.lib.data.services.planka;

     

       11
       11
       +
       

     

       12
       12
       +
         commonServiceConfig = {

     

       13
       13
       +
           EnvironmentFile = config.age.secrets.planka-env.path;

     

       14
       14
       +
           StateDirectory = "planka";

     

       15
       15
       +
           WorkingDirectory = "/var/lib/planka";

     

       16
       16
       +
           User = "planka";

     

       17
       17
       +
           Group = "planka";

     

       18
       18
       +
       

     

       19
       19
       +
           # Hardening

     

       20
       20
       +
           LockPersonality = true;

     

       21
       21
       +
           NoNewPrivileges = true;

     

       22
       22
       +
           PrivateDevices = true;

     

       23
       23
       +
           PrivateMounts = true;

     

       24
       24
       +
           PrivateTmp = true;

     

       25
       25
       +
           PrivateUsers = true;

     

       26
       26
       +
           ProtectClock = true;

     

       27
       27
       +
           ProtectControlGroups = true;

     

       28
       28
       +
           ProtectHome = true;

     

       29
       29
       +
           ProtectHostname = true;

     

       30
       30
       +
           ProtectKernelLogs = true;

     

       31
       31
       +
           ProtectKernelModules = true;

     

       32
       32
       +
           ProtectKernelTunables = true;

     

       33
       33
       +
           ProtectProc = "invisible";

     

       34
       34
       +
           RemoveIPC = true;

     

       35
       35
       +
           RestrictRealtime = true;

     

       36
       36
       +
           RestrictSUIDSGID = true;

     

       37
       37
       +
           UMask = "0660";

     

       38
       38
       +
           RestrictAddressFamilies = [

     

       39
       39
       +
             "AF_UNIX"

     

       40
       40
       +
             "AF_INET"

     

       41
       41
       +
             "AF_INET6"

     

       42
       42
       +
           ];

     

       43
       43
       +
         };

     

       9
       44
        
       in

     

       10
       45
        
       {

     

       11
       11
       -
         virtualisation.oci-containers.containers = {

     

       12
       12
       -
           planka-server = {

     

       13
       13
       -
             image = "ghcr.io/plankanban/planka:2.0.0-rc.4";

     

       14
       14
       -
             ports = [ "${toString d.port}:1337" ];

     

       15
       15
       -
             environment = {

     

       16
       16
       -
               BASE_URL = "https://${d.extUrl}";

     

       17
       17
       -
               DATABASE_URL = "postgresql://planka@planka-db/planka";

     

       18
       18
       -
               # Default Admin

     

       19
       19
       -
               DEFAULT_ADMIN_EMAIL = "pyrox@pyrox.dev";

     

       20
       20
       -
               DEFAULT_ADMIN_USERNAME = "pyrox";

     

       21
       21
       -
               TRUST_PROXY = "true";

     

       22
       22
       -
               DEFAULT_LANGUAGE = "en-US";

     

       46
       46
       +
         systemd = {

     

       47
       47
       +
           tmpfiles.settings = {

     

       48
       48
       +
             "10-planka"."/var/lib/planka".d = {

     

       49
       49
       +
               group = "planka";

     

       50
       50
       +
               user = "planka";

     

       51
       51
       +
               mode = "0755";

     

       23
       52
        
             };

     

       24
       24
       -
             environmentFiles = [ config.age.secrets.planka-env.path ];

     

       25
       25
       -
             volumes = [

     

       26
       26
       -
               "${dataDir}/user-avatars:/app/public/user-avatars"

     

       27
       27
       -
               "${dataDir}/project-background-images:/app/public/project-background-images"

     

       28
       28
       -
               "${dataDir}/attachments:/app/private/attachments"

     

       29
       29
       -
               "${dataDir}/favicons:/app/public/favicons"

     

       30
       30
       -
               "${dataDir}/background-images:/app/public/background-images"

     

       31
       31
       -
             ];

     

       32
       32
       -
             extraOptions = [ "--network=planka" ];

     

       33
       53
        
           };

     

       34
       34
       -
           planka-db = {

     

       35
       35
       -
             image = "postgres:16-alpine";

     

       36
       36
       -
             volumes = [ "${dataDir}/db:/var/lib/postgresql/data" ];

     

       37
       37
       -
             environment = {

     

       38
       38
       -
               POSTGRES_USER = "planka";

     

       39
       39
       -
               POSTGRES_DB = "planka";

     

       40
       40
       -
               POSTGRES_HOST_AUTH_METHOD = "trust";

     

       54
       54
       +
           services = {

     

       55
       55
       +
             planka-init-db = {

     

       56
       56
       +
               wantedBy = [ "multi-user.target" ];

     

       57
       57
       +
               after = [ "postgres.target" ];

     

       58
       58
       +
               description = "Planka Kanban Database Init Script";

     

       59
       59
       +
               path = [

     

       60
       60
       +
                 pkgs.nodejs

     

       61
       61
       +
               ];

     

       62
       62
       +
               script = ''

     

       63
       63
       +
                 if [ ! -f /var/lib/planka/db-init-ran ]; then

     

       64
       64
       +
                   node run ${self'.packages.planka}/lib/node_modules/planka/db/init.js && \

     

       65
       65
       +
                   touch /var/lib/planka/db-init-ran

     

       66
       66
       +
                 fi

     

       67
       67
       +
               '';

     

       68
       68
       +
               serviceConfig = commonServiceConfig // {

     

       69
       69
       +
                 Type = "oneshot";

     

       70
       70
       +
                 SyslogIdentifier = "planka-init-db";

     

       71
       71
       +
               };

     

       41
       72
        
             };

     

       42
       42
       -
             extraOptions = [ "--network=planka" ];

     

       73
       73
       +
             planka-server = {

     

       74
       74
       +
               after = [ "planka-init-db.service" ];

     

       75
       75
       +
               wantedBy = [ "multi-user.target" ];

     

       76
       76
       +
               description = "Planka Kanban Server";

     

       77
       77
       +
               documentation = [ "https://docs.planka.cloud" ];

     

       78
       78
       +
               environment = {

     

       79
       79
       +
                 DATABASE_URL = "postgresql://%2Frun%2Fpostgresql/planka";

     

       80
       80
       +
                 DEFAULT_ADMIN_EMAIL = "pyrox@pyrox.dev";

     

       81
       81
       +
                 DEFAULT_ADMIN_USERNAME = "pyrox";

     

       82
       82
       +
                 TRUST_PROXY = "true";

     

       83
       83
       +
                 DEFAULT_LANGUAGE = "en-US";

     

       84
       84
       +
                 BASE_URL = "https://${d.extUrl}";

     

       85
       85
       +
                 NODE_ENV = "production";

     

       86
       86
       +
               };

     

       87
       87
       +
               serviceConfig = commonServiceConfig // {

     

       88
       88
       +
                 Type = "simple";

     

       89
       89
       +
                 ExecStart = "${lib.getExe self'.packages.planka} --port ${toString d.port}";

     

       90
       90
       +
                 SyslogIdentifier = "planka";

     

       91
       91
       +
               };

     

       92
       92
       +
             };

     

       43
       93
        
           };

     

       44
       94
        
         };

     

       95
       95
       +
         users.users.planka = {

     

       96
       96
       +
           isSystemUser = true;

     

       97
       97
       +
           group = "planka";

     

       98
       98
       +
         };

     

       99
       99
       +
         users.groups.planka = { };

     

       100
       100
       +
         services.postgresql = {

     

       101
       101
       +
           ensureUsers = [

     

       102
       102
       +
             {

     

       103
       103
       +
               name = "planka";

     

       104
       104
       +
               ensureDBOwnership = true;

     

       105
       105
       +
               ensureClauses.login = true;

     

       106
       106
       +
             }

     

       107
       107
       +
           ];

     

       108
       108
       +
           ensureDatabases = [ "planka" ];

     

       109
       109
       +
         };

     

       45
       110
        
         age.secrets.planka-env = {

     

       46
       111
        
           file = ./secrets/planka-env.age;

     

       47
       47
       -
           owner = "thehedgehog";

     

       48
       48
       -
           group = "misc";

     

       112
       112
       +
           owner = "planka";

     

       113
       113
       +
           group = "planka";

     

       49
       114
        
         };

     

       50
       115
        
         services.anubis.instances.planka = {

     

       51
       116
        
           settings = {

-1

hosts/marvin/services/pocket-id.nix

+23 -23

hosts/marvin/services/postgres.nix

···

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

     

       2
       2
       -
       let

     

       3
       3
       -
         cfg = config.services.postgresql;

     

       4
       4
       -
       in

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       # let

     

       3
       3
       +
       #   cfg = config.services.postgresql;

     

       4
       4
       +
       # in

     

       5
       5
        
       {

     

       6
       6
        
         services.postgresql = {

     

       7
       7
        
           enable = true;

     
···

       28
       28
        
             max_parallel_maintenance_workers = 4;

     

       29
       29
        
           };

     

       30
       30
        
         };

     

       31
       31
       -
         systemd.timers.pg-autovacuum = {

     

       32
       32
       -
           description = "Timer for Postgres Autovacuum";

     

       33
       33
       -
           timerConfig = {

     

       34
       34
       -
             OnCalendar = "*-*-* 01:00:00";

     

       35
       35
       -
             Unit = "pg-autovacuum.service";

     

       36
       36
       -
           };

     

       37
       37
       -
         };

     

       38
       38
       -
         systemd.services.pg-autovacuum = {

     

       39
       39
       -
           description = "Vacuum all Postgres databases.";

     

       40
       40
       -
           requisite = [ "postgresql.service" ];

     

       41
       41
       -
           wantedBy = [ "multi-user.target" ];

     

       42
       42
       -
           serviceConfig = {

     

       43
       43
       -
             Type = "oneshot";

     

       44
       44
       -
             User = "postgres";

     

       45
       45
       -
             Group = "postgres";

     

       46
       46
       -
             SyslogIdentifier = "pg-autovacuum";

     

       47
       47
       -
             ExecStart = "${cfg.package}/bin/vacuumdb --all --echo --jobs=6 --parallel=5 --analyze --verbose";

     

       48
       48
       -
           };

     

       49
       49
       -
         };

     

       31
       31
       +
         # systemd.timers.pg-autovacuum = {

     

       32
       32
       +
         #   description = "Timer for Postgres Autovacuum";

     

       33
       33
       +
         #   timerConfig = {

     

       34
       34
       +
         #     OnCalendar = "*-*-* 01:00:00";

     

       35
       35
       +
         #     Unit = "pg-autovacuum.service";

     

       36
       36
       +
         #   };

     

       37
       37
       +
         # };

     

       38
       38
       +
         # systemd.services.pg-autovacuum = {

     

       39
       39
       +
         #   description = "Vacuum all Postgres databases.";

     

       40
       40
       +
         #   requisite = [ "postgresql.service" ];

     

       41
       41
       +
         #   wantedBy = [ "multi-user.target" ];

     

       42
       42
       +
         #   serviceConfig = {

     

       43
       43
       +
         #     Type = "oneshot";

     

       44
       44
       +
         #     User = "postgres";

     

       45
       45
       +
         #     Group = "postgres";

     

       46
       46
       +
         #     SyslogIdentifier = "pg-autovacuum";

     

       47
       47
       +
         #     ExecStart = "${cfg.package}/bin/vacuumdb --all --echo --jobs=6 --parallel=5 --analyze --verbose";

     

       48
       48
       +
         #   };

     

       49
       49
       +
         # };

     

       50
       50
        
       }

-23

hosts/marvin/services/secrets/iceshrimp-db-password.age

···

       1
       1
       -
       age-encryption.org/v1

     

       2
       2
       -
       -> ssh-ed25519 iqBxIA g+DkjSGDd+i/sdqRCuU2I2Qzmq4Q+FI7wSyfkdM9q0Q

     

       3
       3
       -
       cG52xAS/VPjCNgHdky0/jbMvF5tF+cB8BxFNCHYlf2s

     

       4
       4
       -
       -> ssh-rsa fFaiTA

     

       5
       5
       -
       r5mQer6QBi+HdSS16OLHfv/oh0hbug5drdX/BuQHMORogiDfHEM03K6pmg9064Ep

     

       6
       6
       -
       CJgl6z3IS9hlLX7cSq2kVSvP9gk+l5AmI+pMZkJyT9ED43g6wtRI7yiy1ALO0rqB

     

       7
       7
       -
       z/CPaoLkFNFlt7sDg5rijAB+t6DNAxULfFj8KR3b+NvGrrW6Vbaio+T5mg1A2PTd

     

       8
       8
       -
       60eEfuqdn9dHVI82FQFmai1LwoyButrUNn3UiP8aIdvFUueixcqsAXSK1zjPJZ5B

     

       9
       9
       -
       VeAkshwhB9+HKMH1cyRa6LUbzJYxAQBhkgTFqS/r64h3ZAYHTc0lY44VtVhbnEQI

     

       10
       10
       -
       76PBEOcQXXjvPR6yvbcVZfpqCkqfo9hb7wogPfJiRMjKM/qlpR19KOf21T0hsV6q

     

       11
       11
       -
       b7nYf01yBscx6GKXREkZoxgpo6iLLzVQqU5SzQgs7nxW089JdJ62WoZvJwTxv2G8

     

       12
       12
       -
       AdzImnsw73q55MgOYtv/A3hGM8O1Jw4Q4UfMSS43xB+cuvtlEmSqi5mFh0gPbqQR

     

       13
       13
       -
       LN8+OcDLz0SR8U6xHj9ufXfhHc4nwO8iZpzav5nZXMEb3Gmva3k8U+nnmuPKqsrL

     

       14
       14
       -
       VxFmGNxqmWPfxO0FJC/cxLKME/Lj2MU9r6KT8RQ00BjHUfoDgbFzHVLqIEbIE+Vr

     

       15
       15
       -
       /Glcmz/Ecrt3kTwfAhEDpj6g0XVNHt7HA+r4SDWjI00

     

       16
       16
       -
       -> ssh-ed25519 wpmdHA LUF/UncaQTEMQepVAhEqFm345dICeW3d3QGhiflTSH8

     

       17
       17
       -
       ImxpR4innOw1jMSF4gvmOGRDl0BzqAhOyz+GFstsJG4

     

       18
       18
       -
       -> Cg-grease k7q9

     

       19
       19
       -
       MLRf60C4nbEc9XHo26cg7UYySbZtOMP2kZtZmvLiS1XFeIqQaR0RgRcUOoTblYzo

     

       20
       20
       -
       KQ

     

       21
       21
       -
       --- PV6HHY8kDdpFcgNu83K/cwz4qQCW38jcHkTOkCunxrk

     

       22
       22
       -
       �*ǜ�lq��^��fʀ���l�� R��C}Մ�ɧ���F�ĩ�&�~h�

     

       23
       23
       -
       ̟�r��6ʞac,����lc�
>

hosts/marvin/services/secrets/iceshrimp-secret-config.age

This is a binary file and will not be displayed.

+19

hosts/marvin/services/secrets/immich/mail-pw.age

···

       1
       1
       +
       age-encryption.org/v1

     

       2
       2
       +
       -> ssh-ed25519 iqBxIA 3PVJMF6BgxuDxN9NAEYqcZaYEUhK9TB5XprRyW13Kx0

     

       3
       3
       +
       AIQQG+4/9SVPcfq9ZtL/JsWDmLvW03UiAJaJ1nHSckQ

     

       4
       4
       +
       -> ssh-rsa fFaiTA

     

       5
       5
       +
       ZPBI1w2a48Md+Rt92ssVcfxN26zTLCEalT+jG8SJBv07ouOzd4ibPq65m6uOQU/+

     

       6
       6
       +
       EEgHe23fGsPP4oISWDUgVFxesLA3wjsTWmbVrkrBzGQNeNnevIRMcJu7vWDtby/+

     

       7
       7
       +
       dVxPQIoXH0jPlcDQCm2lwOGD+du+Nb4PnVseRPDaXRypKKmx+J057FQemYBk4OWx

     

       8
       8
       +
       yUfbKV2gHHcuRTVUQG6XAQwWvhh4e25fyc+MzKZNPUK4c/SVibjAsUH+Edd+NaV5

     

       9
       9
       +
       yxku5k4TFZkU69sl2zCdgWfYVTowTGYGyf4Kf+I/kl9m13zIk9vRpocgt4APaJnv

     

       10
       10
       +
       p+KxJvbYRiprWl+IzZg6TwXY5mA1IbvlppR4aak1pwaIE76CgF5mGNDGkviGndtP

     

       11
       11
       +
       +eCMIocp6lk2U0dJEYkBtmjNbxFh3dxOcirgdNDypYPlZTSGvSRGhpL4nUJRsR+l

     

       12
       12
       +
       A7rJ5aHH2B4Vi93zgSV0PWiWSA7899bzgN1kQKKIgYln6Tl8UxQSNt5L3L4VajuW

     

       13
       13
       +
       3UqCltyGWt/926BMS+GrDZSWCEtVsDs5XQqDKEx6D+iviHZJXniI+RhH/eM7FLjp

     

       14
       14
       +
       iXgCRkBIALo2lOiScpr2rtfGDViq3Nh64cIslEPiewjVFTCxkxH+LuQ1stukrNki

     

       15
       15
       +
       IF0+pZ65rgatMAdnZRFXfRxmywKD99z4WRHAxvYloXc

     

       16
       16
       +
       -> ssh-ed25519 wpmdHA SQlzD3yqbnoF0JHqPFFDUugbm8jlBsdntLzF/WlJbjo

     

       17
       17
       +
       FggpB1k5xbq62QNlwkocwjiWhEqNjHAxR/GwoPhXbC8

     

       18
       18
       +
       --- 1g4f2OQbS5iXm/cqBamEWuapvZHorxfX7wHizfPcYsc

     

       19
       19
       +
       �z�92�LN=9���$O���fP���E���~�.��}7�eڰq��y�N�I�L����"%�V�lz'�أ�

+19

hosts/marvin/services/secrets/immich/oauth-secret.age

···

       1
       1
       +
       age-encryption.org/v1

     

       2
       2
       +
       -> ssh-ed25519 iqBxIA 4osfKV5/wFT7mCdc4TjP7pJHdD8wzV7VKKiBSGRqImk

     

       3
       3
       +
       wU6RSxJh8SBbXbiwCl4lXD/m1THoAg5n1Y7pyKFPiec

     

       4
       4
       +
       -> ssh-rsa fFaiTA

     

       5
       5
       +
       RTHaBLsBWbDEmY80LktVL/C6CeFinLm3/4t/hoWmbzLLoElBL86EGVdrE5ovjUYl

     

       6
       6
       +
       j5+ZacmqahwjCtF/ZGBt8MFkWOK9u90YDfLp+kb2ILVy/E+CcQ3xPpH9bf83pPl/

     

       7
       7
       +
       aZmttaRlhnhSDYVXB0lHx3u/cCrYhTf6TjEoVGZ/XrLW0BRmO6GSwcmTrachZzdJ

     

       8
       8
       +
       je+pf2ug//mnAJR0y4MxjGlNPD/Vaj/UiaFQjPT+7ZvUUSkbv/QpPqyhhosFA11e

     

       9
       9
       +
       1EGp21ppwUnJSNdYh2vulpQGurB5bPlv6Y8FpcFKivq/qKmA4ydyER3NcCca5Ly+

     

       10
       10
       +
       01jQ1HRqWylYJj7K4hnxSjnNlOXCrJATuPJYoNdt2U1DnolUAqL6JIP/qNmYx8Fb

     

       11
       11
       +
       ZrfFINBmPsNc9XJn14T4J+VB6e68ODBOvZdbzoBQOWAObnP5OH+zLYCB3II+aLPp

     

       12
       12
       +
       Zo5WsNBBdZih4EbO0Y9PNWBjyCzxqs7zXPg1PjjDVHN/tIpSGnqoCqCPGuePhgRV

     

       13
       13
       +
       h1gnP/lqOW2U1oL004hi3etsUsk3kXHjr35GXMVBeay+3uGXkZqhNYYSluQnJSrs

     

       14
       14
       +
       rzahZZ8/q0FDdlUixWHb2uQjL1XMTqUcw8wPsUak8shkx8s7GPKNxtEKFcK46jk4

     

       15
       15
       +
       ac9TCyee4HzPC/SWkLGFl0bt9s9lGTBSNQrVzogY/sg

     

       16
       16
       +
       -> ssh-ed25519 wpmdHA C6npqn5aqimGJlo+UlvYOoqXSu/hW1JVNAmBPP1Vvjk

     

       17
       17
       +
       gWzXqL92jI83iqSr3dydJo+UAz5OGBo6kw6QC4KRWgM

     

       18
       18
       +
       --- ltHFDmeAbJsQtyY4CKFEz8OGAkPkue/8upHNOOQgn5I

     

       19
       19
       +
       ��O�ӌ#&`���P�IZ�#�[��+�tdeG�ui�����?n"��(��b� ]s�	y줔���

-20

hosts/marvin/services/secrets/pingvin-secrets.age

···

       1
       1
       -
       age-encryption.org/v1

     

       2
       2
       -
       -> ssh-ed25519 iqBxIA HdZwcvp9cLpqrUp0M7sK7ipTslMxK0EYqFfS8xtYeDk

     

       3
       3
       -
       Ud7ismLtRG4RlugV3P5wRNjRe8HcJW0rAz/adadWCNc

     

       4
       4
       -
       -> ssh-rsa fFaiTA

     

       5
       5
       -
       KwjETLhUBpq8Hfp41rg3++syweOB+yNIIdd0KeS2YjxjbDfgwzRVoM+wlB/C3b4X

     

       6
       6
       -
       W0561y9+wsnB5A6k/peXLASfVodw30vI9LdW+nHejQr9v/UooXPztoJNrfgaKUow

     

       7
       7
       -
       PsLbLUj+M8Y4i22GRKrY6rrCfJk8F4a+2b0PzDc1EqUcZOjMV7aE+fQ4U7+FD1jv

     

       8
       8
       -
       xGmrKNRXNUL1j5GpPAi7E7YXuGj2SxjZOiisKqyep5KTEFyIJ04lrN/rtbi2vkEJ

     

       9
       9
       -
       ejAFg2jIvxAWiEzEUbjOLFzeIdpb8pPqQJ3OUF4U0crT/r5dxmJKxB0J7ktS6eEY

     

       10
       10
       -
       NZ4/CtY/kLXjo9sWc6G2UtWAm+myXKsxETxFtp/RQ6LXMjS+3xbzGvkAoY/fzVMt

     

       11
       11
       -
       zLGdOV0X/paLb1jGl9CHkflq7qrpkdgqc6I5nmsOCRLHrsiVWLaCVCvu2T1fpjCh

     

       12
       12
       -
       tP+Mwdjv5ONXduoGUOxjCT8IVv7ceTt93S/9cZakpDIFJ38I1XymrjuFLfbhLMVK

     

       13
       13
       -
       VMfo9cLhWyz2/DAKA4gKnmagUhnYO2vdNBzzM9dg0/ysrLoX71ujEcxB0tx21pkE

     

       14
       14
       -
       eB3LEfFH94Izzn9crNJ1YMUFCpFayedN2uQjv89LN2oHx+mUKemXCdl+AV2sLP7P

     

       15
       15
       -
       pi4/UDjKOcIeK8cSvqJtsemjUn7QJdOamH4/IpgFh5o

     

       16
       16
       -
       -> ssh-ed25519 wpmdHA X+4vtGSjMeIuSearcEfYA8Mv5kmghhItcE1n5BPWLSo

     

       17
       17
       -
       uYkj1VkPXs8mJu99J4GFth6LyqhWymEH5fsN0+5TDsw

     

       18
       18
       -
       --- Ql8rRuZH0kS1eDQ9EYB7mW+GvcHtjXcW/Wu1ZGhjpKI

     

       19
       19
       -
       虌d0dj̭�ھ�f����� g�D�+�q��W��d������%5��1�?�U��)�tܫ��[

     

       20
       20
       -
       S�DV�+��U�".� q�i�,g{}#y�@���3O/M~��CЎBV�š� }�=����*#�7�?Q��

+2 -3

hosts/marvin/services/secrets/secrets.nix

···

       27
       27
        
         "golink-authkey.age".publicKeys = marvinDefault;

     

       28
       28
        
         "grafana-admin-password.age".publicKeys = marvinDefault;

     

       29
       29
        
         "grafana-smtp-password.age".publicKeys = marvinDefault;

     

       30
       30
       -
         "iceshrimp-secret-config.age".publicKeys = marvinDefault;

     

       31
       31
       -
         "iceshrimp-db-password.age".publicKeys = marvinDefault;

     

       30
       30
       +
         "immich/oauth-secret.age".publicKeys = marvinDefault;

     

       31
       31
       +
         "immich/mail-pw.age".publicKeys = marvinDefault;

     

       32
       32
        
         "jellyfin-exporter-config.age".publicKeys = marvinDefault;

     

       33
       33
        
         "minio-root.age".publicKeys = marvinDefault;

     

       34
       34
        
         "miniflux-admin.age".publicKeys = marvinDefault;

     

       35
       35
        
         "../nextcloud/nextcloud-admin-pw.age".publicKeys = marvinDefault;

     

       36
       36
        
         "nix-serve-priv.age".publicKeys = marvinDefault;

     

       37
       37
        
         "pinchflat-secrets.age".publicKeys = marvinDefault;

     

       38
       38
       -
         "pingvin-secrets.age".publicKeys = marvinDefault;

     

       39
       38
        
         "planka-env.age".publicKeys = marvinDefault;

     

       40
       39
        
         "pocket-id-secrets.age".publicKeys = marvinDefault;

     

       41
       40
        
         "vaultwarden-vars.age".publicKeys = marvinDefault;

+2 -23

hosts/marvin/services/vaultwarden.nix

···

       23
       23
        
             rocketAddress = "0.0.0.0";

     

       24
       24
        
             rocketCliColors = false;

     

       25
       25
        
             rocketPort = d.port;

     

       26
       26
       -
             websocketEnabled = true;

     

       27
       27
       -
             ipHeader = "X-Real-IP";

     

       28
       26
        
             reloadTemplates = false;

     

       29
       27
        
             logTimestampFormat = "%Y-%m-%d %H:%M:%S.%3f";

     

       30
       28
        
             # # Ratelimiting

     
···

       36
       34
        
       

     

       37
       35
        
             # Logging

     

       38
       36
        
             useSyslog = true;

     

       39
       39
       -
             logLevel = "info";

     

       40
       37
        
             extendedLogging = true;

     

       41
       38
        
       

     

       42
       39
        
             # Features

     
···

       46
       43
        
       

     

       47
       44
        
             # Invitations

     

       48
       45
        
             invitationsAllowed = true;

     

       49
       49
       -
             invitationOrgName = "PyroNet Vault";

     

       46
       46
       +
             invitationOrgName = "dishNet Vault";

     

       50
       47
        
             invitationExpirationHours = 168;

     

       51
       48
        
       

     

       52
       49
        
             # Database

     
···

       55
       52
        
             # Signups

     

       56
       53
        
             signupsAllowed = false;

     

       57
       54
        
             signupsVerify = true;

     

       58
       58
       -
             signupsVerifyResendTime = 3600;

     

       59
       59
       -
             signupsVerifyResendLimit = 5;

     

       60
       55
        
             signupsDomainWhitelist = "pyrox.dev";

     

       61
       56
        
       

     

       62
       57
        
             # Passwords

     
···

       67
       62
        
       

     

       68
       63
        
             # Mail

     

       69
       64
        
             smtpFrom = "vault@pyrox.dev";

     

       70
       70
       -
             smtpFromName = "PyroNet Vault <vault@pyrox.dev>";

     

       65
       65
       +
             smtpFromName = "dishNet Vault <vault@pyrox.dev>";

     

       71
       66
        
             smtpUsername = "vault@pyrox.dev";

     

       72
       67
        
             smtpSecurity = "force_tls";

     

       73
       68
        
             smtpPort = 465;

     
···

       76
       71
        
             smtpTimeout = 20;

     

       77
       72
        
             smtpEmbedImages = true;

     

       78
       73
        
             useSendmail = false;

     

       79
       79
       -
             smtpDebug = false;

     

       80
       80
       -
             smtpAcceptInvalidCerts = false;

     

       81
       81
       -
             smtpAcceptInvalidHostnames = false;

     

       82
       74
        
       

     

       83
       75
        
             # Authentication

     

       84
       84
       -
             authenticatorDisableTimeDrift = false;

     

       85
       85
       -
             disable2faRemember = false;

     

       86
       76
        
             incomplete2faTimeLimit = 5;

     

       87
       77
        
             # # Email 2FA

     

       88
       88
       -
             emailAttemptsLimit = 3;

     

       89
       78
        
             emailExpirationTime = 180;

     

       90
       79
        
             emailTokenSize = 7;

     

       91
       80
        
             requireDeviceEmail = true;

     

       92
       92
       -
       

     

       93
       93
       -
             # Icons

     

       94
       94
       -
             disableIconDownload = false;

     

       95
       95
       -
             iconService = "internal";

     

       96
       96
       -
             iconRedirectCode = 302;

     

       97
       97
       -
             iconDownloadTimeout = 10;

     

       98
       98
       -
             iconBlacklistNonGlobalIps = true;

     

       99
       99
       -
             # # 30 Day TTL

     

       100
       100
       -
             iconCacheTtl = 30 * 24 * 60 * 60;

     

       101
       101
       -
             iconCacheNegttl = 30 * 24 * 60 * 60;

     

       102
       81
        
       

     

       103
       82
        
             # Misc Settings

     

       104
       83
        
             trashAutoDeleteDays = 14;

+4 -1

hosts/prefect/dn42/default.nix

···

       52
       52
        
             v4 = [ "172.20.43.96/27" ];

     

       53
       53
        
             v6 = [ "fd21:1500:66b0::/48" ];

     

       54
       54
        
           };

     

       55
       55
       -
       

     

       56
       55
        
           # Enable StayRTR

     

       57
       56
        
           # https://github.com/bgp/stayrtr

     

       58
       57
        
           stayrtr.enable = true;

     

       58
       58
       +
           # Peer with GRC

     

       59
       59
       +
           # https://dn42.dev/services/Route-Collector

     

       60
       60
       +
           collector.enable = true;

     

       61
       61
       +
       

     

       59
       62
        
           wg.tunnelDefaults = {

     

       60
       63
        
             privateKeyFile = "/run/agenix/dn42-privkey";

     

       61
       64
        
             localAddrs.v4 = cfg42.addr.v4;

+1

hosts/prefect/dn42/peers/default.nix

···

       14
       14
        
           (import ./kioubit.nix { inherit dn42Types; })

     

       15
       15
        
           (import ./lare.nix { inherit dn42Types; })

     

       16
       16
        
           (import ./potato.nix { inherit dn42Types; })

     

       17
       17
       +
           (import ./prefixlabs.nix { inherit dn42Types; })

     

       17
       18
        
           (import ./routedbits.nix { inherit dn42Types; })

     

       18
       19
        
           (import ./sunnet.nix { inherit dn42Types; })

     

       19
       20
        
           (import ./uffsalot.nix { inherit dn42Types; })

+26

hosts/prefect/dn42/peers/prefixlabs.nix

···

       1
       1
       +
       { dn42Types, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         config.dn42 = {

     

       4
       4
       +
           peers.prefixlabs = {

     

       5
       5
       +
             as = 4242421240;

     

       6
       6
       +
             addr.v6 = "fe80::1240:2";

     

       7
       7
       +
             interface = "wg42_prefixlabs";

     

       8
       8
       +
             extendedNextHop = true;

     

       9
       9
       +
             # My side

     

       10
       10
       +
             srcAddr.v6 = "fe80::240";

     

       11
       11
       +
             # Communities

     

       12
       12
       +
             crypto = dn42Types.crypto.safePFS;

     

       13
       13
       +
             latency = dn42Types.latency."7.3ms";

     

       14
       14
       +
             bandwidth = dn42Types.bandwidth."1000mb";

     

       15
       15
       +
             transit = true;

     

       16
       16
       +
           };

     

       17
       17
       +
           wg.tunnels.prefixlabs = {

     

       18
       18
       +
             listenPort = 43240;

     

       19
       19
       +
             peerPubKey = "uRYzFGi+/B6pD0FR2SW3G/OzC5LPJXePNIt0s+nJfW0=";

     

       20
       20
       +
             peerEndpoint = "us-01.prefixlabs.net:22459";

     

       21
       21
       +
             peerAddrs.v4 = "172.20.209.11";

     

       22
       22
       +
             peerAddrs.v6 = "fe80::1240:2";

     

       23
       23
       +
             localAddrs.v6 = "fe80::240";

     

       24
       24
       +
           };

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+8 -13

hosts/prefect/services/caddy.nix

···

       67
       67
        
             # Authentication

     

       68
       68
        
             ${pns.pocket-id.extUrl} = {

     

       69
       69
        
               extraConfig = ''

     

       70
       70
       -
                 reverse_proxy / ${marvin}:${toString pns.pocket-id.port} {

     

       71
       71
       -
                   header_up X-Real-IP {remote_host}

     

       72
       72
       -
                   header_up X-Http-Version {http.request.proto}

     

       73
       73
       -
                 }

     

       70
       70
       +
                 reverse_proxy ${marvin}:${toString pns.pocket-id.port}

     

       74
       71
        
               '';

     

       75
       72
        
             };

     

       76
       73
        
       

     
···

       214
       211
        
               '';

     

       215
       212
        
             };

     

       216
       213
        
       

     

       217
       217
       -
             # Pingvin Share

     

       218
       218
       -
             ${pns.pingvin-share.extUrl} = {

     

       214
       214
       +
             # Immich

     

       215
       215
       +
             ${pns.immich.extUrl} = {

     

       219
       216
        
               extraConfig = ''

     

       220
       220
       -
                 reverse_proxy /api/* ${marvin}:${toString pns.pingvin-share.be-anubis} {

     

       221
       221
       -
                   header_up X-Real-IP {remote_host}

     

       222
       222
       -
                   header_up X-Http-Version {http.request.proto}

     

       223
       223
       -
                 }

     

       224
       224
       -
                 reverse_proxy /* ${marvin}:${toString pns.pingvin-share.anubis} {

     

       225
       225
       -
                   header_up X-Real-IP {remote_host}

     

       226
       226
       -
                   header_up X-Http-Version {http.request.proto}

     

       217
       217
       +
                 @public path /share /share/*

     

       218
       218
       +
                 handle @public {

     

       219
       219
       +
                   reverse_proxy ${marvin}:${toString pns.immich.pubProxy}

     

       227
       220
        
                 }

     

       221
       221
       +
                 reverse_proxy ${marvin}:${toString pns.immich.port}

     

       228
       222
        
               '';

     

       229
       223
        
             };

     

       224
       224
       +
       

     

       230
       225
        
             # Tangled Services

     

       231
       226
        
             ${pns.tangled-knot.extUrl} = {

     

       232
       227
        
               extraConfig = ''

+7

lib/data/services.toml

···

       5
       5
        
       # anubis: What port the anubis service for this domain will use, int

     

       6
       6
        
       # tsHost: (optional) What Tailscale host this service will run on, for services only available via Tailscale.

     

       7
       7
        
       # # Should only be set if this is available externally, if at all, since TS-only services aren't able to be scraped.

     

       8
       8
       +
       # Current lowest unassigned port: 6938

     

       8
       9
        
       [authentik]

     

       9
       10
        
       port = 6908

     

       10
       11
        
       host = "marvin"

     
···

       43
       44
        
       port = 6923

     

       44
       45
        
       host = "marvin"

     

       45
       46
        
       extUrl = "soc.pyrox.dev"

     

       47
       47
       +
       

     

       48
       48
       +
       [immich]

     

       49
       49
       +
       port = 6936

     

       50
       50
       +
       host = "marvin"

     

       51
       51
       +
       extUrl = "img.pyrox.dev"

     

       52
       52
       +
       pubProxy = 6937

     

       46
       53
        
       

     

       47
       54
        
       [jellyfin]

     

       48
       55
        
       port = 8096

+1 -1

nixosModules/default-config/default.nix

···

       14
       14
        
           ./users.nix

     

       15
       15
        
         ];

     

       16
       16
        
         system = {

     

       17
       17
       -
           stateVersion = "25.05";

     

       17
       17
       +
           stateVersion = "26.05";

     

       18
       18
        
           disableInstallerTools = true;

     

       19
       19
        
           tools.nixos-rebuild.enable = true;

     

       20
       20
        
         };

+2 -4

nixosModules/default-config/nixConfig.nix

···

       15
       15
        
       {

     

       16
       16
        
         nix = {

     

       17
       17
        
           enable = true;

     

       18
       18
       -
           # We use `nh.clean` instead, so this is disabled

     

       19
       19
       -
           gc.automatic = false;

     

       18
       18
       +
           gc.automatic = true;

     

       20
       19
        
           registry = lib.mapAttrs (_: v: { flake = v; }) flakeInputs;

     

       21
       20
        
           settings = {

     

       22
       21
        
             # Don't auto-accept flake-defined nix settings, they're a CVE waiting to happen.

     
···

       58
       57
        
             keep-going = true;

     

       59
       58
        
             # More direnv gc root stuff

     

       60
       59
        
             keep-outputs = true;

     

       61
       61
       -
             # Show fewer log lines from failed builds since I get them from nh

     

       62
       62
       -
             log-lines = 10;

     

       60
       60
       +
             log-lines = 20;

     

       63
       61
        
             # Limit the max amount of builds

     

       64
       62
        
             max-jobs = lib.mkDefault 4;

     

       65
       63
        
             # Extra system features

-1

nixosModules/default-config/programs/default.nix

···

       1
       1
        
       {

     

       2
       2
        
         imports = [

     

       3
       3
        
           ./ssh.nix

     

       4
       4
       -
           ./nh.nix

     

       5
       4
        
         ];

     

       6
       5
        
         programs.fish.enable = true;

     

       7
       6
        
       }

-7

nixosModules/default-config/programs/nh.nix

···

       1
       1
       -
       _: {

     

       2
       2
       -
         programs.nh = {

     

       3
       3
       -
           enable = true;

     

       4
       4
       -
           clean.enable = true;

     

       5
       5
       -
           clean.extraArgs = "-k 5";

     

       6
       6
       -
         };

     

       7
       7
       -
       }

+1 -1

nixosModules/homes/pyrox/default.nix

···

       9
       9
        
             inputs.self.homeModules.allModules

     

       10
       10
        
             {

     

       11
       11
        
               home.username = "pyrox";

     

       12
       12
       -
               home.stateVersion = "25.11";

     

       12
       12
       +
               home.stateVersion = "26.05";

     

       13
       13
        
               py.profiles.server.enable = lib.mkDefault true;

     

       14
       14
        
               py.profiles.desktop.enable = lib.mkDefault false;

     

       15
       15
        
             }

+1 -1

nixosModules/homes/thehedgehog/default.nix

···

       9
       9
        
             inputs.self.homeModules.allModules

     

       10
       10
        
             {

     

       11
       11
        
               home.username = "thehedgehog";

     

       12
       12
       -
               home.stateVersion = "25.11";

     

       12
       12
       +
               home.stateVersion = "26.05";

     

       13
       13
        
               py.profiles.server.enable = lib.mkDefault true;

     

       14
       14
        
               py.profiles.desktop.enable = lib.mkDefault false;

     

       15
       15
        
             }

-2

nixosModules/services/forgejo-runner/default.nix

···

       26
       26
        
             };

     

       27
       27
        
             cache = {

     

       28
       28
        
               enabled = true;

     

       29
       29
       -
               dir = "/var/lib/forgejo/runners/cache/";

     

       30
       30
       -
               host = "";

     

       31
       29
        
               port = 0;

     

       32
       30
        
             };

     

       33
       31
        
             container = {

+6

packages/anubis-files/src/policies/forgejo.yaml

···

       2
       2
        
         - import: CUSTOM/policies/meta/base.yaml

     

       3
       3
        
         - import: (data)/clients/git.yaml

     

       4
       4
        
         - import: (data)/apps/gitea-rss-feeds.yaml

     

       5
       5
       +
       

     

       6
       6
       +
         # Allow forgejo runner connections from localhost and tailscale

     

       7
       7
       +
         - name: forgejo-runner

     

       8
       8
       +
           user_agent_regex: connect-go

     

       9
       9
       +
           action: ALLOW

     

       10
       10
       +
       

     

       5
       11
        
       dnsbl: false

     

       6
       12
        
       openGraph:

     

       7
       13
        
         enabled: true

+1 -1

packages/anubis-files/src/policies/nextcloud.yaml

···

       1
       1
        
       bots:

     

       2
       2
       -
         - import: CUSTOM/profiles/meta/base.yaml

     

       2
       2
       +
         - import: CUSTOM/policies/meta/base.yaml

     

       3
       3
        
         # Allow android apps that I use

     

       4
       4
        
         - name: allow-android-apps

     

       5
       5
        
           user_agent_regex: Nextcloud-android|DAVx5|ICSx5

+26

packages/bgutil-pot-server/librusty_v8.nix

···

       1
       1
       +
       # COPIED FROM nixpkgs/pkgs/by-name/router

     

       2
       2
       +
       {

     

       3
       3
       +
         lib,

     

       4
       4
       +
         stdenv,

     

       5
       5
       +
         fetchurl,

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       let

     

       9
       9
       +
         fetch_librusty_v8 =

     

       10
       10
       +
           args:

     

       11
       11
       +
           fetchurl {

     

       12
       12
       +
             name = "librusty_v8-${args.version}";

     

       13
       13
       +
             url = "https://github.com/denoland/rusty_v8/releases/download/v${args.version}/librusty_v8_release_${stdenv.hostPlatform.rust.rustcTarget}.a";

     

       14
       14
       +
             sha256 = args.shas.${stdenv.hostPlatform.system};

     

       15
       15
       +
             meta = {

     

       16
       16
       +
               inherit (args) version;

     

       17
       17
       +
               sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];

     

       18
       18
       +
             };

     

       19
       19
       +
           };

     

       20
       20
       +
       in

     

       21
       21
       +
       fetch_librusty_v8 {

     

       22
       22
       +
         version = "130.0.7";

     

       23
       23
       +
         shas = {

     

       24
       24
       +
           x86_64-linux = "sha256-pkdsuU6bAkcIHEZUJOt5PXdzK424CEgTLXjLtQ80t10=";

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+49

packages/bgutil-pot-server/package.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         callPackage,

     

       4
       4
       +
         rustPlatform,

     

       5
       5
       +
         fetchFromGitHub,

     

       6
       6
       +
         pkg-config,

     

       7
       7
       +
         openssl,

     

       8
       8
       +
         _experimental-update-script-combinators,

     

       9
       9
       +
         nix-update-script,

     

       10
       10
       +
       }:

     

       11
       11
       +
       rustPlatform.buildRustPackage (finalAttrs: {

     

       12
       12
       +
         pname = "bgutil-pot-server";

     

       13
       13
       +
         version = "0.6.0";

     

       14
       14
       +
       

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "jim60105";

     

       17
       17
       +
           repo = "bgutil-ytdlp-pot-provider-rs";

     

       18
       18
       +
           tag = "v${finalAttrs.version}";

     

       19
       19
       +
           hash = "sha256-kEu5WqOymH8yAyMhGKtVPOq3qlTRpFU/FO71uWEX/e8=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         cargoHash = "sha256-fJZeyIsFUfpWeC1MWsU1hANb6cqC9xHQOnhcohEMTeM=";

     

       23
       23
       +
       

     

       24
       24
       +
         nativeBuildInputs = [

     

       25
       25
       +
           pkg-config

     

       26
       26
       +
         ];

     

       27
       27
       +
       

     

       28
       28
       +
         buildInputs = [

     

       29
       29
       +
           openssl

     

       30
       30
       +
         ];

     

       31
       31
       +
       

     

       32
       32
       +
         env.RUSTY_V8_ARCHIVE = callPackage ./librusty_v8.nix { };

     

       33
       33
       +
       

     

       34
       34
       +
         doCheck = false;

     

       35
       35
       +
       

     

       36
       36
       +
         passthru.updateScript = _experimental-update-script-combinators.sequence [

     

       37
       37
       +
           (nix-update-script { })

     

       38
       38
       +
           ./update-librusty.sh

     

       39
       39
       +
         ];

     

       40
       40
       +
       

     

       41
       41
       +
         meta = {

     

       42
       42
       +
           changelog = "https://github.com/jim60105/bgutil-ytdlp-pot-provider-rs/releases/tag/v${finalAttrs.version}";

     

       43
       43
       +
           description = "Proof-of-origin token provider plugin for yt-dlp in Rust";

     

       44
       44
       +
           homepage = "https://github.com/jim60105/bgutil-ytdlp-pot-provider-rs";

     

       45
       45
       +
           license = lib.licenses.gpl3Plus;

     

       46
       46
       +
           maintainers = with lib.maintainers; [ pyrox0 ];

     

       47
       47
       +
           mainProgram = "bgutil-pot";

     

       48
       48
       +
         };

     

       49
       49
       +
       })

+45

packages/bgutil-pot-server/update-librusty.sh

···

       1
       1
       +
       #!/usr/bin/env nix-shell

     

       2
       2
       +
       #!nix-shell -i bash -p gnugrep gnused nix jq

     

       3
       3
       +
       # shellcheck shell=bash

     

       4
       4
       +
       # COPIED FROM nixpkgs/pkgs/by-name/wi/windmill

     

       5
       5
       +
       

     

       6
       6
       +
       set -eu -o pipefail

     

       7
       7
       +
       

     

       8
       8
       +
       echo "librusty_v8: UPDATING"

     

       9
       9
       +
       

     

       10
       10
       +
       BGUTIL_LATEST_VERSION=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --fail --location "https://api.github.com/repos/jim60105/bgutil-ytdlp-pot-provider-rs/releases/latest" | jq --raw-output .tag_name)

     

       11
       11
       +
       CARGO_LOCK=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --silent --fail --location "https://github.com/jim60105/bgutil-ytdlp-pot-provider-rs/raw/$BGUTIL_LATEST_VERSION/Cargo.lock")

     

       12
       12
       +
       

     

       13
       13
       +
       PACKAGE_DIR=$(dirname "$(readlink --canonicalize-existing "${BASH_SOURCE[0]}")")

     

       14
       14
       +
       OUTPUT_FILE="$PACKAGE_DIR/librusty_v8.nix"

     

       15
       15
       +
       NEW_VERSION=$(echo "$CARGO_LOCK" | grep --after-context 5 'name = "v8"' | grep 'version =' | sed -E 's/version = "//;s/"//')

     

       16
       16
       +
       

     

       17
       17
       +
       CURRENT_VERSION=""

     

       18
       18
       +
       if [ -f "$OUTPUT_FILE" ]; then

     

       19
       19
       +
         CURRENT_VERSION="$(grep 'version =' "$OUTPUT_FILE" | sed -E 's/version = "//;s/"//')"

     

       20
       20
       +
       fi

     

       21
       21
       +
       

     

       22
       22
       +
       if [ "$CURRENT_VERSION" == "$NEW_VERSION" ]; then

     

       23
       23
       +
         echo "No update needed, $CURRENT_VERSION is already latest"

     

       24
       24
       +
         exit 0

     

       25
       25
       +
       fi

     

       26
       26
       +
       

     

       27
       27
       +
       x86Hash="$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_V")"

     

       28
       28
       +
       TEMP_FILE="$OUTPUT_FILE.tmp"

     

       29
       29
       +
       cat >"$TEMP_FILE" <<EOF

     

       30
       30
       +
       # COPIED FROM nixpkgs/pkgs/by-name/wi/windmill

     

       31
       31
       +
       # auto-generated file -- DO NOT EDIT!

     

       32
       32
       +
       { fetchLibrustyV8 }:

     

       33
       33
       +
       

     

       34
       34
       +
       fetchLibrustyV8 {

     

       35
       35
       +
         version = "$NEW_VERSION";

     

       36
       36
       +
         shas = {

     

       37
       37
       +
           # NOTE; Follows supported platforms of package (see meta.platforms attribute)!

     

       38
       38
       +
           x86_64-linux = "$(nix hash convert --hash-algo sha256 --from nix32 "$x86Hash")";

     

       39
       39
       +
         };

     

       40
       40
       +
       }

     

       41
       41
       +
       EOF

     

       42
       42
       +
       

     

       43
       43
       +
       mv "$TEMP_FILE" "$OUTPUT_FILE"

     

       44
       44
       +
       

     

       45
       45
       +
       echo "librusty_v8: UPDATE DONE"

+6 -6

packages/glide-browser-bin/package.nix

···

       25
       25
        
       }:

     

       26
       26
        
       stdenv.mkDerivation (finalAttrs: {

     

       27
       27
        
         pname = "glide-browser";

     

       28
       28
       -
         version = "0.1.54a";

     

       28
       28
       +
         version = "0.1.55a";

     

       29
       29
        
       

     

       30
       30
        
         src = fetchurl {

     

       31
       31
        
           url = "https://github.com/glide-browser/glide/releases/download/${finalAttrs.version}/glide.linux-x86_64.tar.xz";

     

       32
       32
       -
           hash = "sha256-Rw85b+9eaiM9szWpYZiF7FqJY7OpliOwt09/c8UWlGk=";

     

       32
       32
       +
           hash = "sha256-mjk8KmB/T5ZpB9AMQw1mtb9VbMXVX2VV4N+hWpWkSYI=";

     

       33
       33
        
         };

     

       34
       34
        
       

     

       35
       35
        
         nativeBuildInputs = [

     
···

       44
       44
        
       

     

       45
       45
        
         buildInputs = [

     

       46
       46
        
           # keep-sorted start

     

       47
       47
       -
           gtk3

     

       48
       47
        
           adwaita-icon-theme

     

       49
       49
       -
           hicolor-icon-theme

     

       50
       48
        
           alsa-lib

     

       51
       49
        
           dbus-glib

     

       50
       50
       +
           gtk3

     

       51
       51
       +
           hicolor-icon-theme

     

       52
       52
        
           libXtst

     

       53
       53
        
           # keep-sorted end

     

       54
       54
        
         ];

     
···

       56
       56
        
         runtimeDependencies = [

     

       57
       57
        
           # keep-sorted start

     

       58
       58
        
           curl

     

       59
       59
       -
           pciutils

     

       60
       59
        
           libva.out

     

       60
       60
       +
           pciutils

     

       61
       61
        
           # keep-sorted end

     

       62
       62
        
         ];

     

       63
       63
        
       

     
···

       78
       78
        
           for i in 16 32 48 64 128; do

     

       79
       79
        
             iconSizeDir="$iconDir/''${i}x$i/apps"

     

       80
       80
        
             mkdir -p $iconSizeDir

     

       81
       81
       -
             cp $browserIcons/default$i.png $iconSizeDir/glide-brower.png

     

       81
       81
       +
             cp $browserIcons/default$i.png $iconSizeDir/glide-browser.png

     

       82
       82
        
           done

     

       83
       83
        
       

     

       84
       84

+4 -1

packages/planka/package.nix

···

       78
       78
        
       in

     

       79
       79
        
       stdenv.mkDerivation (finalAttrs: {

     

       80
       80
        
         pname = "planka";

     

       81
       81
       -
         inherit version src meta;

     

       81
       81
       +
         inherit version src;

     

       82
       82
        
       

     

       83
       83
        
         sourceRoot = "${finalAttrs.src.name}/server";

     

       84
       84
        
       

     
···

       132
       132
        
         '';

     

       133
       133
        
       

     

       134
       134
        
         passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; };

     

       135
       135
       +
         meta = meta // {

     

       136
       136
       +
           mainProgram = "planka";

     

       137
       137
       +
         };

     

       135
       138
        
       })

Compare changes