commit c1180e833a85f2790c60651e8520451970d7120b · kitten.sh/system

+5 -1

machines/irnbru/configuration.nix

···

       4
       4
        
         imports = [ ];

     

       5
       5
        
       

     

       6
       6
        
         modules = {

     

       7
       7
       -
           server.enable = true;

     

       7
       7
       +
           server = {

     

       8
       8
       +
             enable = true;

     

       9
       9
       +
             sshd.enable = true;

     

       10
       10
       +
             tailscale.enable = true;

     

       11
       11
       +
           };

     

       8
       12
        
         };

     

       9
       13
        
       }

+10 -3

modules/server/tailscale.nix

···

       5
       5
        
         cfgRoot = config.modules.server;

     

       6
       6
        
         cfgRouter = config.modules.router;

     

       7
       7
        
         cfg = config.modules.server.tailscale;

     

       8
       8
       -
       in helpers.linuxAttrs {

     

       8
       8
       +
       in {

     

       9
       9
        
         options.modules.server.tailscale = {

     

       10
       10
        
           enable = mkOption {

     

       11
       11
        
             default = false;

     
···

       15
       15
        
           };

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         config = mkIf (cfg.enable && cfgRoot.enable) {

     

       18
       18
       +
         config = mkIf (cfg.enable && cfgRoot.enable) (helpers.linuxAttrs {

     

       19
       19
        
           networking = {

     

       20
       20
        
             domain = mkIf cfgRouter.enable "fable-pancake.ts.net";

     

       21
       21
        
             search = [ "fable-pancake.ts.net" ];

     
···

       42
       42
        
           systemd.services.tailscaled.serviceConfig.Environment = [ "TS_DEBUG_DISABLE_PORTLIST=true" ];

     

       43
       43
        
       

     

       44
       44
        
           environment.systemPackages = mkIf config.modules.desktop.enable [ pkgs.tail-tray ];

     

       45
       45
       -
         };

     

       45
       45
       +
         } // helpers.darwinAttrs {

     

       46
       46
       +
           networking.search = [ "fable-pancake.ts.net" ];

     

       47
       47
       +
       

     

       48
       48
       +
           services.tailscale = {

     

       49
       49
       +
             enable = true;

     

       50
       50
       +
             overrideLocalDns = true;

     

       51
       51
       +
           };

     

       52
       52
       +
         });

     

       46
       53
        
       }