comparing 7186978fc3d55d3fbdc4fce94012e251a42c4ab5 and main on wiro.world/dotfiles

+1

.ignore

···

       1
       1
       +
       *.age

+89 -58

flake.lock

···

       153
       153
        
               ]

     

       154
       154
        
             },

     

       155
       155
        
             "locked": {

     

       156
       156
       -
               "lastModified": 1736864502,

     

       157
       157
       -
               "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=",

     

       156
       156
       +
               "lastModified": 1764627417,

     

       157
       157
       +
               "narHash": "sha256-D6xc3Rl8Ab6wucJWdvjNsGYGSxNjQHzRc2EZ6eeQ6l4=",

     

       158
       158
        
               "owner": "nix-community",

     

       159
       159
        
               "repo": "disko",

     

       160
       160
       -
               "rev": "0141aabed359f063de7413f80d906e1d98c0c123",

     

       160
       160
       +
               "rev": "5a88a6eceb8fd732b983e72b732f6f4b8269bef3",

     

       161
       161
        
               "type": "github"

     

       162
       162
        
             },

     

       163
       163
        
             "original": {

     

       164
       164
        
               "owner": "nix-community",

     

       165
       165
       -
               "ref": "v1.11.0",

     

       166
       165
        
               "repo": "disko",

     

       167
       166
        
               "type": "github"

     

       168
       167
        
             }

     
···

       186
       185
        
           "flake-compat": {

     

       187
       186
        
             "flake": false,

     

       188
       187
        
             "locked": {

     

       189
       189
       -
               "lastModified": 1747046372,

     

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

     

       188
       188
       +
               "lastModified": 1761588595,

     

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

     

       191
       190
        
               "owner": "edolstra",

     

       192
       191
        
               "repo": "flake-compat",

     

       193
       193
       -
               "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",

     

       192
       192
       +
               "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",

     

       194
       193
        
               "type": "github"

     

       195
       194
        
             },

     

       196
       195
        
             "original": {

     
···

       200
       199
        
             }

     

       201
       200
        
           },

     

       202
       201
        
           "flake-compat_2": {

     

       202
       202
       +
             "locked": {

     

       203
       203
       +
               "lastModified": 1761588595,

     

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

     

       205
       205
       +
               "owner": "edolstra",

     

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

     

       207
       207
       +
               "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",

     

       208
       208
       +
               "type": "github"

     

       209
       209
       +
             },

     

       210
       210
       +
             "original": {

     

       211
       211
       +
               "owner": "edolstra",

     

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

     

       213
       213
       +
               "type": "github"

     

       214
       214
       +
             }

     

       215
       215
       +
           },

     

       216
       216
       +
           "flake-compat_3": {

     

       203
       217
        
             "flake": false,

     

       204
       218
        
             "locked": {

     

       205
       219
        
               "lastModified": 1751685974,

     
···

       216
       230
        
           "flake-parts": {

     

       217
       231
        
             "inputs": {

     

       218
       232
        
               "nixpkgs-lib": [

     

       219
       219
       -
                 "lanzaboote",

     

       220
       220
       -
                 "nixpkgs"

     

       221
       221
       -
               ]

     

       222
       222
       -
             },

     

       223
       223
       -
             "locked": {

     

       224
       224
       -
               "lastModified": 1754091436,

     

       225
       225
       -
               "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",

     

       226
       226
       -
               "owner": "hercules-ci",

     

       227
       227
       -
               "repo": "flake-parts",

     

       228
       228
       -
               "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",

     

       229
       229
       -
               "type": "github"

     

       230
       230
       -
             },

     

       231
       231
       -
             "original": {

     

       232
       232
       -
               "owner": "hercules-ci",

     

       233
       233
       -
               "repo": "flake-parts",

     

       234
       234
       -
               "type": "github"

     

       235
       235
       -
             }

     

       236
       236
       -
           },

     

       237
       237
       -
           "flake-parts_2": {

     

       238
       238
       -
             "inputs": {

     

       239
       239
       -
               "nixpkgs-lib": [

     

       240
       233
        
                 "stylix",

     

       241
       234
        
                 "nixpkgs"

     

       242
       235
        
               ]

     
···

       298
       291
        
               "rust-overlay": "rust-overlay"

     

       299
       292
        
             },

     

       300
       293
        
             "locked": {

     

       301
       301
       -
               "lastModified": 1747139554,

     

       302
       302
       -
               "narHash": "sha256-CpjdfdzyN0tAcBvtg9AQk+mDlNSb+NAZPUBpx/4VzvA=",

     

       294
       294
       +
               "lastModified": 1764804992,

     

       295
       295
       +
               "narHash": "sha256-6XIwDQwquGUfiwoTsukMyE6DcXW4Cx0fjE4cLTgQ7RM=",

     

       303
       296
        
               "owner": "mrnossiom",

     

       304
       297
        
               "repo": "git-leave",

     

       305
       305
       -
               "rev": "bf125663fa992097620ca034ec57ebd20ed50532",

     

       298
       298
       +
               "rev": "3c09ab6afafae76be08956cc7bf563f80e0f8394",

     

       306
       299
        
               "type": "github"

     

       307
       300
        
             },

     

       308
       301
        
             "original": {

     
···

       319
       312
        
               ]

     

       320
       313
        
             },

     

       321
       314
        
             "locked": {

     

       322
       322
       -
               "lastModified": 1709087332,

     

       323
       323
       -
               "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",

     

       315
       315
       +
               "lastModified": 1762808025,

     

       316
       316
       +
               "narHash": "sha256-XmjITeZNMTQXGhhww6ed/Wacy2KzD6svioyCX7pkUu4=",

     

       324
       317
        
               "owner": "hercules-ci",

     

       325
       318
        
               "repo": "gitignore.nix",

     

       326
       326
       -
               "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",

     

       319
       319
       +
               "rev": "cb5e3fdca1de58ccbc3ef53de65bd372b48f567c",

     

       327
       320
        
               "type": "github"

     

       328
       321
        
             },

     

       329
       322
        
             "original": {

     
···

       357
       350
        
             "inputs": {

     

       358
       351
        
               "nixpkgs": [

     

       359
       352
        
                 "lanzaboote",

     

       360
       360
       -
                 "pre-commit-hooks-nix",

     

       353
       353
       +
                 "pre-commit",

     

       361
       354
        
                 "nixpkgs"

     

       362
       355
        
               ]

     

       363
       356
        
             },

     
···

       549
       542
        
           "lanzaboote": {

     

       550
       543
        
             "inputs": {

     

       551
       544
        
               "crane": "crane",

     

       552
       552
       -
               "flake-compat": "flake-compat",

     

       553
       553
       -
               "flake-parts": "flake-parts",

     

       554
       545
        
               "nixpkgs": [

     

       555
       546
        
                 "unixpkgs"

     

       556
       547
        
               ],

     

       557
       557
       -
               "pre-commit-hooks-nix": "pre-commit-hooks-nix",

     

       548
       548
       +
               "pre-commit": "pre-commit",

     

       558
       549
        
               "rust-overlay": "rust-overlay_3"

     

       559
       550
        
             },

     

       560
       551
        
             "locked": {

     

       561
       561
       -
               "lastModified": 1762205063,

     

       562
       562
       -
               "narHash": "sha256-If6vQ+KvtKs3ARBO9G3l+4wFSCYtRBrwX1z+I+B61wQ=",

     

       552
       552
       +
               "lastModified": 1764622702,

     

       553
       553
       +
               "narHash": "sha256-HggOVvg2U3EwT44wPHEwFKromf9qR9rTqfV1i3q7rYs=",

     

       563
       554
        
               "owner": "nix-community",

     

       564
       555
        
               "repo": "lanzaboote",

     

       565
       565
       -
               "rev": "88b8a563ff5704f4e8d8e5118fb911fa2110ca05",

     

       556
       556
       +
               "rev": "6242b3b2b5e5afcf329027ed4eb5fa6e2eab10f1",

     

       566
       557
        
               "type": "github"

     

       567
       558
        
             },

     

       568
       559
        
             "original": {

     

       569
       560
        
               "owner": "nix-community",

     

       570
       570
       -
               "ref": "v0.4.3",

     

       571
       561
        
               "repo": "lanzaboote",

     

       572
       562
        
               "type": "github"

     

       573
       563
        
             }

     
···

       585
       575
        
               "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip"

     

       586
       576
        
             }

     

       587
       577
        
           },

     

       578
       578
       +
           "nix-alien": {

     

       579
       579
       +
             "inputs": {

     

       580
       580
       +
               "flake-compat": "flake-compat_2",

     

       581
       581
       +
               "nix-index-database": "nix-index-database",

     

       582
       582
       +
               "nixpkgs": [

     

       583
       583
       +
                 "nixpkgs"

     

       584
       584
       +
               ]

     

       585
       585
       +
             },

     

       586
       586
       +
             "locked": {

     

       587
       587
       +
               "lastModified": 1764061716,

     

       588
       588
       +
               "narHash": "sha256-xKnIoMPv2kIsWhjRhJayqMWU2xkjeq2pyPmR1dLFPHs=",

     

       589
       589
       +
               "owner": "thiagokokada",

     

       590
       590
       +
               "repo": "nix-alien",

     

       591
       591
       +
               "rev": "9bc9c1ab671eb1b610f549e15bc0b750ab987409",

     

       592
       592
       +
               "type": "github"

     

       593
       593
       +
             },

     

       594
       594
       +
             "original": {

     

       595
       595
       +
               "owner": "thiagokokada",

     

       596
       596
       +
               "repo": "nix-alien",

     

       597
       597
       +
               "type": "github"

     

       598
       598
       +
             }

     

       599
       599
       +
           },

     

       588
       600
        
           "nix-darwin": {

     

       589
       601
        
             "inputs": {

     

       590
       602
        
               "nixpkgs": [

     
···

       606
       618
        
               "type": "github"

     

       607
       619
        
             }

     

       608
       620
        
           },

     

       621
       621
       +
           "nix-index-database": {

     

       622
       622
       +
             "inputs": {

     

       623
       623
       +
               "nixpkgs": [

     

       624
       624
       +
                 "nix-alien",

     

       625
       625
       +
                 "nixpkgs"

     

       626
       626
       +
               ]

     

       627
       627
       +
             },

     

       628
       628
       +
             "locked": {

     

       629
       629
       +
               "lastModified": 1762660502,

     

       630
       630
       +
               "narHash": "sha256-C9F1C31ys0V7mnp4EcDy7L1cLZw/sCTEXqqTtGnvu08=",

     

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

     

       632
       632
       +
               "repo": "nix-index-database",

     

       633
       633
       +
               "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee",

     

       634
       634
       +
               "type": "github"

     

       635
       635
       +
             },

     

       636
       636
       +
             "original": {

     

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

     

       638
       638
       +
               "repo": "nix-index-database",

     

       639
       639
       +
               "type": "github"

     

       640
       640
       +
             }

     

       641
       641
       +
           },

     

       609
       642
        
           "nixos-hardware": {

     

       610
       643
        
             "locked": {

     

       611
       644
        
               "lastModified": 1764440730,

     
···

       662
       695
        
               "type": "github"

     

       663
       696
        
             }

     

       664
       697
        
           },

     

       665
       665
       -
           "pre-commit-hooks-nix": {

     

       698
       698
       +
           "pre-commit": {

     

       666
       699
        
             "inputs": {

     

       667
       667
       -
               "flake-compat": [

     

       668
       668
       -
                 "lanzaboote",

     

       669
       669
       -
                 "flake-compat"

     

       670
       670
       -
               ],

     

       700
       700
       +
               "flake-compat": "flake-compat",

     

       671
       701
        
               "gitignore": "gitignore_3",

     

       672
       702
        
               "nixpkgs": [

     

       673
       703
        
                 "lanzaboote",

     
···

       675
       705
        
               ]

     

       676
       706
        
             },

     

       677
       707
        
             "locked": {

     

       678
       678
       -
               "lastModified": 1750779888,

     

       679
       679
       -
               "narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=",

     

       708
       708
       +
               "lastModified": 1763988335,

     

       709
       709
       +
               "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=",

     

       680
       710
        
               "owner": "cachix",

     

       681
       711
        
               "repo": "pre-commit-hooks.nix",

     

       682
       682
       -
               "rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d",

     

       712
       712
       +
               "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce",

     

       683
       713
        
               "type": "github"

     

       684
       714
        
             },

     

       685
       715
        
             "original": {

     
···

       696
       726
        
               "home-manager": "home-manager",

     

       697
       727
        
               "hypixel-bank-tracker": "hypixel-bank-tracker",

     

       698
       728
        
               "lanzaboote": "lanzaboote",

     

       729
       729
       +
               "nix-alien": "nix-alien",

     

       699
       730
        
               "nix-darwin": "nix-darwin",

     

       700
       731
        
               "nixos-hardware": "nixos-hardware",

     

       701
       732
        
               "nixpkgs": "nixpkgs",

     
···

       715
       746
        
               ]

     

       716
       747
        
             },

     

       717
       748
        
             "locked": {

     

       718
       718
       -
               "lastModified": 1744599145,

     

       719
       719
       -
               "narHash": "sha256-yzaDPkJwZdUtRj/dzdOeB74yryWzpngYaD7BedqFKk8=",

     

       749
       749
       +
               "lastModified": 1764557621,

     

       750
       750
       +
               "narHash": "sha256-kX5PoY8hQZ80+amMQgOO9t8Tc1JZ70gYRnzaVD4AA+o=",

     

       720
       751
        
               "owner": "oxalica",

     

       721
       752
        
               "repo": "rust-overlay",

     

       722
       722
       -
               "rev": "fd6795d3d28f956de01a0458b6fa7baae5c793b4",

     

       753
       753
       +
               "rev": "93316876c2229460a5d6f5f052766cc4cef538ce",

     

       723
       754
        
               "type": "github"

     

       724
       755
        
             },

     

       725
       756
        
             "original": {

     
···

       831
       862
        
               "base16-helix": "base16-helix",

     

       832
       863
        
               "base16-vim": "base16-vim",

     

       833
       864
        
               "firefox-gnome-theme": "firefox-gnome-theme",

     

       834
       834
       -
               "flake-parts": "flake-parts_2",

     

       865
       865
       +
               "flake-parts": "flake-parts",

     

       835
       866
        
               "gnome-shell": "gnome-shell",

     

       836
       867
        
               "nixpkgs": [

     

       837
       868
        
                 "nixpkgs"

     
···

       907
       938
        
           "tangled": {

     

       908
       939
        
             "inputs": {

     

       909
       940
        
               "actor-typeahead-src": "actor-typeahead-src",

     

       910
       910
       -
               "flake-compat": "flake-compat_2",

     

       941
       941
       +
               "flake-compat": "flake-compat_3",

     

       911
       942
        
               "gomod2nix": "gomod2nix",

     

       912
       943
        
               "htmx-src": "htmx-src",

     

       913
       944
        
               "htmx-ws-src": "htmx-ws-src",

     
···

       1017
       1048
        
           },

     

       1018
       1049
        
           "unixpkgs": {

     

       1019
       1050
        
             "locked": {

     

       1020
       1020
       -
               "lastModified": 1764242076,

     

       1021
       1021
       -
               "narHash": "sha256-sKoIWfnijJ0+9e4wRvIgm/HgE27bzwQxcEmo2J/gNpI=",

     

       1051
       1051
       +
               "lastModified": 1764950072,

     

       1052
       1052
       +
               "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=",

     

       1022
       1053
        
               "owner": "nixos",

     

       1023
       1054
        
               "repo": "nixpkgs",

     

       1024
       1024
       -
               "rev": "2fad6eac6077f03fe109c4d4eb171cf96791faa4",

     

       1055
       1055
       +
               "rev": "f61125a668a320878494449750330ca58b78c557",

     

       1025
       1056
        
               "type": "github"

     

       1026
       1057
        
             },

     

       1027
       1058
        
             "original": {

+5 -3

flake.nix

···

       16
       16
        
       

     

       17
       17
        
           ## Miscellaneous

     

       18
       18
        
       

     

       19
       19
       -
           # agenix.url = "github:ryantm/agenix/0.15.0";

     

       20
       19
        
           agenix.url = "github:ryantm/agenix";

     

       21
       20
        
           agenix.inputs.nixpkgs.follows = "nixpkgs";

     

       22
       21
        
           agenix.inputs.home-manager.follows = "home-manager";

     

       23
       22
        
       

     

       24
       24
       -
           disko.url = "github:nix-community/disko/v1.11.0";

     

       23
       23
       +
           disko.url = "github:nix-community/disko";

     

       25
       24
        
           disko.inputs.nixpkgs.follows = "nixpkgs";

     

       26
       25
        
       

     

       27
       26
        
           nixos-hardware.url = "github:nixos/nixos-hardware";

     

       28
       27
        
       

     

       29
       29
       -
           lanzaboote.url = "github:nix-community/lanzaboote/v0.4.3";

     

       28
       28
       +
           lanzaboote.url = "github:nix-community/lanzaboote";

     

       30
       29
        
           lanzaboote.inputs.nixpkgs.follows = "unixpkgs";

     

       31
       30
        
       

     

       32
       31
        
           srvos.url = "github:nix-community/srvos";

     
···

       39
       38
        
       

     

       40
       39
        
           hypixel-bank-tracker.url = "github:pixilie/hypixel-bank-tracker";

     

       41
       40
        
           hypixel-bank-tracker.inputs.nixpkgs.follows = "nixpkgs";

     

       41
       41
       +
       

     

       42
       42
       +
           nix-alien.url = "github:thiagokokada/nix-alien";

     

       43
       43
       +
           nix-alien.inputs.nixpkgs.follows = "nixpkgs";

     

       42
       44
        
       

     

       43
       45
        
           tangled.url = "git+https://tangled.org/tangled.org/core";

     

       44
       46
        
           tangled.inputs.nixpkgs.follows = "unixpkgs";

+4 -5

home-manager/fragments/git.nix

···

       15
       15
        
         '';

     

       16
       16
        
       

     

       17
       17
        
         config = lib.mkIf cfg.enable {

     

       18
       18
       -
           assertions = [

     

       19
       19
       -
             { assertion = config.local.fragment.agenix.enable; message = "`git` fragment depends on `agenix` fragment"; }

     

       20
       20
       -
           ];

     

       21
       21
       -
       

     

       22
       18
        
           home.sessionVariables = {

     

       23
       19
        
             # Disable annoying warning message

     

       24
       20
        
             GIT_DISCOVERY_ACROSS_FILESYSTEM = 0;

     
···

       133
       129
        
               "credentials \"https://github.com\"".helper = "!${lib.getExe pkgs.gh} auth git-credential";

     

       134
       130
        
       

     

       135
       131
        
               # TODO: change to $PROJECTS env var?

     

       136
       136
       -
               leaveTool.defaultFolder = "~/Development";

     

       132
       132
       +
               leaveTool = {

     

       133
       133
       +
                 defaultFolder = "${config.home.homeDirectory}/Development";

     

       134
       134
       +
                 checks = [ "dirty" "ahead-branches" ];

     

       135
       135
       +
               };

     

       137
       136
        
             };

     

       138
       137
        
           };

     

       139
       138

+1

home-manager/fragments/jujutsu.nix

···

       62
       62
        
       

     

       63
       63
        
               templates = {

     

       64
       64
        
                 log = "custom_log_compact";

     

       65
       65
       +
                 git_push_bookmark = ''"push-" ++ change_id.short()'';

     

       65
       66
        
               };

     

       66
       67
        
       

     

       67
       68
        
               ui = {

+6

home-manager/fragments/sway.nix

···

       164
       164
        
                   repeat_rate = toString 30;

     

       165
       165
        
                 };

     

       166
       166
        
       

     

       167
       167
       +
                 "type:touchpad" = {

     

       168
       168
       +
                   dwt = "enabled";

     

       169
       169
       +
                   tap = "enabled";

     

       170
       170
       +
                   tap_button_map = "lrm";

     

       171
       171
       +
                 };

     

       172
       172
       +
       

     

       167
       173
        
                 # Split keyboard also acts as a mouse

     

       168
       174
        
                 # "type:touchpad" = { events = "disabled_on_external_mouse"; };

     

       169
       175

+1 -1

hosts/weird-row-server/authelia.nix

···

       8
       8
        
       

     

       9
       9
        
         authelia-metrics-port = 9004;

     

       10
       10
        
         headscale-hostname = "headscale.wiro.world";

     

       11
       11
       -
         grafana-hostname = "console.wiro.world";

     

       11
       11
       +
         grafana-hostname = "console.net.wiro.world";

     

       12
       12
        
         miniflux-hostname = "news.wiro.world";

     

       13
       13
        
       in

     

       14
       14
        
       {

+8 -2

hosts/weird-row-server/default.nix

···

       101
       101
        
             jails = { };

     

       102
       102
        
           };

     

       103
       103
        
       

     

       104
       104
       +
           age.secrets.caddy-env.file = secrets/caddy-env.age;

     

       104
       105
        
           services.caddy = {

     

       105
       106
        
             enable = true;

     

       106
       107
        
             package = pkgs.caddy.withPlugins {

     

       107
       107
       -
               doInstallCheck = false;

     

       108
       108
        
               plugins = [

     

       109
       109
       +
                 "github.com/caddy-dns/hetzner/v2@v2.0.0-preview-1"

     

       109
       110
        
                 "github.com/tailscale/caddy-tailscale@v0.0.0-20251016213337-01d084e119cb"

     

       110
       110
       -
                 "github.com/caddy-dns/hetzner@v2.0.0-preview-1"

     

       111
       111
        
               ];

     

       112
       112
        
               hash = "sha256-muKwDYs5Jp4ib/psZxpp1Kyfsqz6wPz/lpHFGtx67uY=";

     

       113
       113
        
             };

     

       114
       114
        
       

     

       115
       115
       +
             environmentFile = config.age.secrets.caddy-env.path;

     

       116
       116
       +
       

     

       115
       117
        
             globalConfig = ''

     

       116
       118
        
               tailscale {

     

       119
       119
       +
                 # this caddy instance already proxies headscale but needs to access headscale to start

     

       120
       120
       +
                 # control_url https://headscale.wiro.world

     

       121
       121
       +
                 control_url http://localhost:3006

     

       122
       122
       +
       

     

       117
       123
        
                 ephemeral

     

       118
       124
        
               }

     

       119
       125
        
             '';

+1 -1

hosts/weird-row-server/goatcounter.nix

···

       18
       18
        
       

     

       19
       19
        
           services.caddy = {

     

       20
       20
        
             virtualHosts.${goatcounter-hostname}.extraConfig = ''

     

       21
       21
       -
               reverse_proxy http://localhost:${toString goatcounter-port}

     

       21
       21
       +
               reverse_proxy http://localhost:${toString config.services.goatcounter.port}

     

       22
       22
        
             '';

     

       23
       23
        
           };

     

       24
       24
        
         };

+3 -2

hosts/weird-row-server/grafana.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         grafana-port = 3002;

     

       7
       7
       -
         grafana-hostname = "console.wiro.world";

     

       7
       7
       +
         grafana-hostname = "console.net.wiro.world";

     

       8
       8
        
       

     

       9
       9
        
         prometheus-port = 9001;

     

       10
       10
        
         prometheus-node-exporter-port = 9002;

     
···

       76
       76
        
             globalConfig = ''

     

       77
       77
        
               metrics { per_host }

     

       78
       78
        
             '';

     

       79
       79
       -
             virtualHosts.${grafana-hostname}.extraConfig = ''

     

       79
       79
       +
             virtualHosts."http://${grafana-hostname}".extraConfig = ''

     

       80
       80
       +
               bind tailscale/console

     

       80
       81
        
               reverse_proxy http://localhost:${toString grafana-port}

     

       81
       82
        
             '';

     

       82
       83
        
           };

+4 -3

hosts/weird-row-server/lldap.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         lldap-port = 3007;

     

       7
       7
       -
         lldap-hostname = "ldap.wiro.world";

     

       7
       7
       +
         lldap-hostname = "ldap.net.wiro.world";

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
        
         config = {

     
···

       30
       30
        
           };

     

       31
       31
        
       

     

       32
       32
        
           services.caddy = {

     

       33
       33
       -
             virtualHosts.${lldap-hostname}.extraConfig = ''

     

       34
       34
       -
               reverse_proxy http://localhost:${toString lldap-port}

     

       33
       33
       +
             virtualHosts."http://${lldap-hostname}".extraConfig = ''

     

       34
       34
       +
               bind tailscale/ldap

     

       35
       35
       +
               reverse_proxy http://localhost:${toString config.services.lldap.settings.http_port}

     

       35
       36
        
             '';

     

       36
       37
        
           };

     

       37
       38
        
         };

+2 -2

hosts/weird-row-server/pds.nix

···

       34
       34
        
             virtualHosts.${pds-hostname} = {

     

       35
       35
        
               serverAliases = [ "*.${pds-hostname}" ];

     

       36
       36
        
               extraConfig = ''

     

       37
       37
       -
                 	tls { on_demand }

     

       38
       38
       -
                   reverse_proxy http://localhost:${toString pds-port}

     

       37
       37
       +
               	tls { on_demand }

     

       38
       38
       +
                 reverse_proxy http://localhost:${toString config.services.bluesky-pds.settings.PDS_HOSTNAME}

     

       39
       39
        
               '';

     

       40
       40
        
             };

     

       41
       41
        
           };

hosts/weird-row-server/secrets/caddy-env.age

This is a binary file and will not be displayed.

+1

hosts/weird-row-server/secrets/default.nix

···

       23
       23
        
         # Defines `HYPIXEL_API_KEY`, `PROFILE_UUID`

     

       24
       24
        
         "hypixel-bank-tracker-main.age".publicKeys = deploy;

     

       25
       25
        
         "hypixel-bank-tracker-banana.age".publicKeys = deploy;

     

       26
       26
       +
         "caddy-env.age".publicKeys = deploy;

     

       26
       27
        
       }

+4 -3

hosts/weird-row-server/thelounge.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         thelounge-port = 3005;

     

       7
       7
       -
         thelounge-hostname = "lounge.wiro.world";

     

       7
       7
       +
         thelounge-hostname = "irc-lounge.net.wiro.world";

     

       8
       8
        
       in

     

       9
       9
        
       {

     

       10
       10
        
         config = {

     
···

       22
       22
        
           };

     

       23
       23
        
       

     

       24
       24
        
           services.caddy = {

     

       25
       25
       -
             virtualHosts.${thelounge-hostname}.extraConfig = ''

     

       26
       26
       -
               reverse_proxy http://localhost:${toString thelounge-port}

     

       25
       25
       +
             virtualHosts."http://${thelounge-hostname}".extraConfig = ''

     

       26
       26
       +
               bind tailscale/irc-lounge

     

       27
       27
       +
               reverse_proxy http://localhost:${toString config.services.thelounge.port}

     

       27
       28
        
             '';

     

       28
       29
        
           };

     

       29
       30
        
         };

+1 -1

hosts/weird-row-server/vaultwarden.nix

···

       31
       31
        
       

     

       32
       32
        
           services.caddy = {

     

       33
       33
        
             virtualHosts.${vaultwarden-hostname}.extraConfig = ''

     

       34
       34
       -
               reverse_proxy http://localhost:${toString vaultwarden-port}

     

       34
       34
       +
               reverse_proxy http://localhost:${toString config.services.vaultwarden.config.ROCKET_PORT}

     

       35
       35
        
             '';

     

       36
       36
        
           };

     

       37
       37
        
         };

+3 -7

hosts/weird-row-server/warrior.nix

···

       4
       4
        
       

     

       5
       5
        
       let

     

       6
       6
        
         warrior-port = 3015;

     

       7
       7
       -
         warrior-hostname = "warrior.wiro.world";

     

       8
       8
       -
       

     

       9
       9
       -
         authelia-port = 3008;

     

       7
       7
       +
         warrior-hostname = "warrior.net.wiro.world";

     

       10
       8
        
       in

     

       11
       9
        
       {

     

       12
       10
        
         config = {

     
···

       17
       15
        
           };

     

       18
       16
        
       

     

       19
       17
        
           services.caddy = {

     

       20
       20
       -
             virtualHosts.${warrior-hostname}.extraConfig = ''

     

       21
       21
       -
               forward_auth localhost:${toString authelia-port} {

     

       22
       22
       -
                   uri /api/authz/forward-auth

     

       23
       23
       -
               }

     

       18
       18
       +
             virtualHosts."http://${warrior-hostname}".extraConfig = ''

     

       19
       19
       +
               bind tailscale/warrior

     

       24
       20
        
               reverse_proxy http://localhost:${toString warrior-port}

     

       25
       21
        
             '';

     

       26
       22
        
           };

+2

pkgs/default.nix

···

       11
       11
        
         inherit (self.inputs)

     

       12
       12
        
           agenix

     

       13
       13
        
           git-leave

     

       14
       14
       +
           nix-alien

     

       14
       15
        
           wakatime-ls

     

       15
       16
        
           ;

     

       16
       17
        
       in

     
···

       24
       25
        
         # Import packages defined in foreign repositories

     

       25
       26
        
         inherit (agenix.packages.${system}) agenix;

     

       26
       27
        
         inherit (git-leave.packages.${system}) git-leave;

     

       28
       28
       +
         inherit (nix-alien.packages.${system}) nix-alien;

     

       27
       29
        
         inherit (wakatime-ls.packages.${system}) wakatime-ls;

     

       28
       30
        
       }

Compare changes