comparing c63b85f01ffacad0c7d423e44d0aff45506607fa and main on wiro.world/dotfiles

+1

.ignore

···

       0

···

       1
       +
       *.age

+60 -1

flake.lock

···

       199
        
             }

     

       200
        
           },

     

       201
        
           "flake-compat_2": {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       202
        
             "flake": false,

     

       203
        
             "locked": {

     

       204
        
               "lastModified": 1751685974,

     
···

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

     

       561
        
             }

     

       562
        
           },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       563
        
           "nix-darwin": {

     

       564
        
             "inputs": {

     

       565
        
               "nixpkgs": [

     
···

       578
        
               "owner": "nix-darwin",

     

       579
        
               "ref": "nix-darwin-25.11",

     

       580
        
               "repo": "nix-darwin",

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       581
        
               "type": "github"

     

       582
        
             }

     

       583
        
           },

     
···

       668
        
               "home-manager": "home-manager",

     

       669
        
               "hypixel-bank-tracker": "hypixel-bank-tracker",

     

       670
        
               "lanzaboote": "lanzaboote",

     

       0
        
       
     

       671
        
               "nix-darwin": "nix-darwin",

     

       672
        
               "nixos-hardware": "nixos-hardware",

     

       673
        
               "nixpkgs": "nixpkgs",

     
···

       879
        
           "tangled": {

     

       880
        
             "inputs": {

     

       881
        
               "actor-typeahead-src": "actor-typeahead-src",

     

       882
       -
               "flake-compat": "flake-compat_2",

     

       883
        
               "gomod2nix": "gomod2nix",

     

       884
        
               "htmx-src": "htmx-src",

     

       885
        
               "htmx-ws-src": "htmx-ws-src",

···

       199
        
             }

     

       200
        
           },

     

       201
        
           "flake-compat_2": {

     

       202
       +
             "locked": {

     

       203
       +
               "lastModified": 1761588595,

     

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

     

       205
       +
               "owner": "edolstra",

     

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

     

       207
       +
               "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5",

     

       208
       +
               "type": "github"

     

       209
       +
             },

     

       210
       +
             "original": {

     

       211
       +
               "owner": "edolstra",

     

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

     

       213
       +
               "type": "github"

     

       214
       +
             }

     

       215
       +
           },

     

       216
       +
           "flake-compat_3": {

     

       217
        
             "flake": false,

     

       218
        
             "locked": {

     

       219
        
               "lastModified": 1751685974,

     
···

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

     

       576
        
             }

     

       577
        
           },

     

       578
       +
           "nix-alien": {

     

       579
       +
             "inputs": {

     

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

     

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

     

       582
       +
               "nixpkgs": [

     

       583
       +
                 "nixpkgs"

     

       584
       +
               ]

     

       585
       +
             },

     

       586
       +
             "locked": {

     

       587
       +
               "lastModified": 1764061716,

     

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

     

       589
       +
               "owner": "thiagokokada",

     

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

     

       591
       +
               "rev": "9bc9c1ab671eb1b610f549e15bc0b750ab987409",

     

       592
       +
               "type": "github"

     

       593
       +
             },

     

       594
       +
             "original": {

     

       595
       +
               "owner": "thiagokokada",

     

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

     

       597
       +
               "type": "github"

     

       598
       +
             }

     

       599
       +
           },

     

       600
        
           "nix-darwin": {

     

       601
        
             "inputs": {

     

       602
        
               "nixpkgs": [

     
···

       615
        
               "owner": "nix-darwin",

     

       616
        
               "ref": "nix-darwin-25.11",

     

       617
        
               "repo": "nix-darwin",

     

       618
       +
               "type": "github"

     

       619
       +
             }

     

       620
       +
           },

     

       621
       +
           "nix-index-database": {

     

       622
       +
             "inputs": {

     

       623
       +
               "nixpkgs": [

     

       624
       +
                 "nix-alien",

     

       625
       +
                 "nixpkgs"

     

       626
       +
               ]

     

       627
       +
             },

     

       628
       +
             "locked": {

     

       629
       +
               "lastModified": 1762660502,

     

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

     

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

     

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

     

       633
       +
               "rev": "15c5451c63f4c612874a43846bfe3fa828b03eee",

     

       634
       +
               "type": "github"

     

       635
       +
             },

     

       636
       +
             "original": {

     

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

     

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

     

       639
        
               "type": "github"

     

       640
        
             }

     

       641
        
           },

     
···

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

     

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

     

       728
        
               "lanzaboote": "lanzaboote",

     

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

     

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

     

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

     

       732
        
               "nixpkgs": "nixpkgs",

     
···

       938
        
           "tangled": {

     

       939
        
             "inputs": {

     

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

     

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

     

       942
        
               "gomod2nix": "gomod2nix",

     

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

     

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

+3

flake.nix

···

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

     

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

     

       41
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       43
        
           tangled.inputs.nixpkgs.follows = "unixpkgs";

     

       44

···

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

     

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

     

       41
        
       

     

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

     

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

     

       44
       +
       

     

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

     

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

     

       47

+1

home-manager/fragments/jujutsu.nix

···

       62
        
       

     

       63
        
               templates = {

     

       64
        
                 log = "custom_log_compact";

     

       0
        
       
     

       65
        
               };

     

       66
        
       

     

       67
        
               ui = {

···

       62
        
       

     

       63
        
               templates = {

     

       64
        
                 log = "custom_log_compact";

     

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

     

       66
        
               };

     

       67
        
       

     

       68
        
               ui = {

+1 -1

hosts/weird-row-server/authelia.nix

···

       8
        
       

     

       9
        
         authelia-metrics-port = 9004;

     

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

     

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

     

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

     

       13
        
       in

     

       14
        
       {

···

       8
        
       

     

       9
        
         authelia-metrics-port = 9004;

     

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

     

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

     

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

     

       13
        
       in

     

       14
        
       {

+8 -2

hosts/weird-row-server/default.nix

···

       101
        
             jails = { };

     

       102
        
           };

     

       103
        
       

     

       0
        
       
     

       104
        
           services.caddy = {

     

       105
        
             enable = true;

     

       106
        
             package = pkgs.caddy.withPlugins {

     

       107
       -
               doInstallCheck = false;

     

       108
        
               plugins = [

     

       0
        
       
     

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

     

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

     

       111
        
               ];

     

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

     

       113
        
             };

     

       114
        
       

     

       0
        
       
     

       0
        
       
     

       115
        
             globalConfig = ''

     

       116
        
               tailscale {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       117
        
                 ephemeral

     

       118
        
               }

     

       119
        
             '';

···

       101
        
             jails = { };

     

       102
        
           };

     

       103
        
       

     

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

     

       105
        
           services.caddy = {

     

       106
        
             enable = true;

     

       107
        
             package = pkgs.caddy.withPlugins {

     

       0
        
       
     

       108
        
               plugins = [

     

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

     

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

     

       0
        
       
     

       111
        
               ];

     

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

     

       113
        
             };

     

       114
        
       

     

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

     

       116
       +
       

     

       117
        
             globalConfig = ''

     

       118
        
               tailscale {

     

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

     

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

     

       121
       +
                 control_url http://localhost:3006

     

       122
       +
       

     

       123
        
                 ephemeral

     

       124
        
               }

     

       125
        
             '';

+1 -1

hosts/weird-row-server/goatcounter.nix

···

       18
        
       

     

       19
        
           services.caddy = {

     

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

     

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

     

       22
        
             '';

     

       23
        
           };

     

       24
        
         };

···

       18
        
       

     

       19
        
           services.caddy = {

     

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

     

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

     

       22
        
             '';

     

       23
        
           };

     

       24
        
         };

+3 -2

hosts/weird-row-server/grafana.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
         grafana-port = 3002;

     

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

     

       8
        
       

     

       9
        
         prometheus-port = 9001;

     

       10
        
         prometheus-node-exporter-port = 9002;

     
···

       76
        
             globalConfig = ''

     

       77
        
               metrics { per_host }

     

       78
        
             '';

     

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

     

       0
        
       
     

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

     

       81
        
             '';

     

       82
        
           };

···

       4
        
       

     

       5
        
       let

     

       6
        
         grafana-port = 3002;

     

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

     

       8
        
       

     

       9
        
         prometheus-port = 9001;

     

       10
        
         prometheus-node-exporter-port = 9002;

     
···

       76
        
             globalConfig = ''

     

       77
        
               metrics { per_host }

     

       78
        
             '';

     

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

     

       80
       +
               bind tailscale/console

     

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

     

       82
        
             '';

     

       83
        
           };

+4 -3

hosts/weird-row-server/lldap.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
         lldap-port = 3007;

     

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

     

       8
        
       in

     

       9
        
       {

     

       10
        
         config = {

     
···

       30
        
           };

     

       31
        
       

     

       32
        
           services.caddy = {

     

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

     

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

     

       0
        
       
     

       35
        
             '';

     

       36
        
           };

     

       37
        
         };

···

       4
        
       

     

       5
        
       let

     

       6
        
         lldap-port = 3007;

     

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

     

       8
        
       in

     

       9
        
       {

     

       10
        
         config = {

     
···

       30
        
           };

     

       31
        
       

     

       32
        
           services.caddy = {

     

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

     

       34
       +
               bind tailscale/ldap

     

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

     

       36
        
             '';

     

       37
        
           };

     

       38
        
         };

+2 -2

hosts/weird-row-server/pds.nix

···

       34
        
             virtualHosts.${pds-hostname} = {

     

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

     

       36
        
               extraConfig = ''

     

       37
       -
                 	tls { on_demand }

     

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

     

       39
        
               '';

     

       40
        
             };

     

       41
        
           };

···

       34
        
             virtualHosts.${pds-hostname} = {

     

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

     

       36
        
               extraConfig = ''

     

       37
       +
               	tls { on_demand }

     

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

     

       39
        
               '';

     

       40
        
             };

     

       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
        
         # Defines `HYPIXEL_API_KEY`, `PROFILE_UUID`

     

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

     

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

     

       0
        
       
     

       26
        
       }

···

       23
        
         # Defines `HYPIXEL_API_KEY`, `PROFILE_UUID`

     

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

     

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

     

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

     

       27
        
       }

+4 -3

hosts/weird-row-server/thelounge.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
         thelounge-port = 3005;

     

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

     

       8
        
       in

     

       9
        
       {

     

       10
        
         config = {

     
···

       22
        
           };

     

       23
        
       

     

       24
        
           services.caddy = {

     

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

     

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

     

       0
        
       
     

       27
        
             '';

     

       28
        
           };

     

       29
        
         };

···

       4
        
       

     

       5
        
       let

     

       6
        
         thelounge-port = 3005;

     

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

     

       8
        
       in

     

       9
        
       {

     

       10
        
         config = {

     
···

       22
        
           };

     

       23
        
       

     

       24
        
           services.caddy = {

     

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

     

       26
       +
               bind tailscale/irc-lounge

     

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

     

       28
        
             '';

     

       29
        
           };

     

       30
        
         };

+1 -1

hosts/weird-row-server/vaultwarden.nix

···

       31
        
       

     

       32
        
           services.caddy = {

     

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

     

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

     

       35
        
             '';

     

       36
        
           };

     

       37
        
         };

···

       31
        
       

     

       32
        
           services.caddy = {

     

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

     

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

     

       35
        
             '';

     

       36
        
           };

     

       37
        
         };

+3 -7

hosts/weird-row-server/warrior.nix

···

       4
        
       

     

       5
        
       let

     

       6
        
         warrior-port = 3015;

     

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

     

       8
       -
       

     

       9
       -
         authelia-port = 3008;

     

       10
        
       in

     

       11
        
       {

     

       12
        
         config = {

     
···

       17
        
           };

     

       18
        
       

     

       19
        
           services.caddy = {

     

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

     

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

     

       22
       -
                   uri /api/authz/forward-auth

     

       23
       -
               }

     

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

     

       25
        
             '';

     

       26
        
           };

···

       4
        
       

     

       5
        
       let

     

       6
        
         warrior-port = 3015;

     

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

     

       0
        
       
     

       0
        
       
     

       8
        
       in

     

       9
        
       {

     

       10
        
         config = {

     
···

       15
        
           };

     

       16
        
       

     

       17
        
           services.caddy = {

     

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

     

       19
       +
               bind tailscale/warrior

     

       0
        
       
     

       0
        
       
     

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

     

       21
        
             '';

     

       22
        
           };

+2

pkgs/default.nix

···

       11
        
         inherit (self.inputs)

     

       12
        
           agenix

     

       13
        
           git-leave

     

       0
        
       
     

       14
        
           wakatime-ls

     

       15
        
           ;

     

       16
        
       in

     
···

       24
        
         # Import packages defined in foreign repositories

     

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

     

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

     

       0
        
       
     

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

     

       28
        
       }

···

       11
        
         inherit (self.inputs)

     

       12
        
           agenix

     

       13
        
           git-leave

     

       14
       +
           nix-alien

     

       15
        
           wakatime-ls

     

       16
        
           ;

     

       17
        
       in

     
···

       25
        
         # Import packages defined in foreign repositories

     

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

     

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

     

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

     

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

     

       30
        
       }

Compare changes