commit 2fc31afe0f709286eda74ec7004b1a7ab645cd97 · kitten.sh/system

+6

flake.nix

···

       112
        
             hostname = "fanta";

     

       113
        
           };

     

       114
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       115
        
           nixosConfigurations."pepper" = mkSystem {

     

       116
        
             inherit overlays;

     

       117
        
             system = "x86_64-linux";

···

       112
        
             hostname = "fanta";

     

       113
        
           };

     

       114
        
       

     

       115
       +
           darwinConfigurations."irnbru" = mkSystem {

     

       116
       +
             inherit overlays;

     

       117
       +
             system = "aarch64-darwin";

     

       118
       +
             hostname = "irnbru";

     

       119
       +
           };

     

       120
       +
       

     

       121
        
           nixosConfigurations."pepper" = mkSystem {

     

       122
        
             inherit overlays;

     

       123
        
             system = "x86_64-linux";

+34 -4

home/apps/ollama.nix

···

       16
        
           OLLAMA_FLASH_ATTENTION = if cfg.ollama.flashAttention then "1" else "0";

     

       17
        
           OLLAMA_SCHED_SPREAD = if cfg.ollama.schedSpread then "1" else "0";

     

       18
        
           OLLAMA_INTEL_GPU = if cfg.ollama.intelGpu then "1" else "0";

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       19
        
         };

     

       20
        
       in {

     

       21
        
         options.modules.apps.ollama = {

     
···

       25
        
             type = types.bool;

     

       26
        
           };

     

       27
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
           package = mkOption {

     

       29
        
             default = pkgs.ollama;

     

       30
        
             type = types.package;

     
···

       34
        
             default = "http://0.0.0.0:11434";

     

       35
        
             description = "Determines the host and port to listen on";

     

       36
        
             type = types.str;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       37
        
           };

     

       38
        
       

     

       39
        
           flashAttention = mkOption {

     

       40
       -
             default = false;

     

       41
        
             description = ''

     

       42
       -
               Enables experimental flash att  ention feature.

     

       43
        
               Effect: Activates an experimental optimization for attention mechanisms.

     

       44
        
               Scenario: Can potentially improve performance on compatible hardware but may introduce instability.

     

       45
        
             '';

     

       46
        
             type = types.bool;

     

       47
        
           };

     

       48
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       49
        
           schedSpread = mkOption {

     

       50
        
             default = false;

     

       51
        
             description = ''

     
···

       73
        
           }

     

       74
        
       

     

       75
        
           (helpers.mkIfLinux {

     

       76
       -
             systemd.user.services.ollama = {

     

       77
        
               Unit = {

     

       78
        
                 Description = "Ollama";

     

       79
        
                 Documentation = "https://github.com/jmorganca/ollama";

     
···

       89
        
           })

     

       90
        
       

     

       91
        
           (helpers.mkIfDarwin {

     

       92
       -
             launchd.agents.ollama = {

     

       93
        
               enable = true;

     

       94
        
               config = {

     

       95
        
                 EnvironmentVariables = env;

···

       16
        
           OLLAMA_FLASH_ATTENTION = if cfg.ollama.flashAttention then "1" else "0";

     

       17
        
           OLLAMA_SCHED_SPREAD = if cfg.ollama.schedSpread then "1" else "0";

     

       18
        
           OLLAMA_INTEL_GPU = if cfg.ollama.intelGpu then "1" else "0";

     

       19
       +
           OLLAMA_KV_CACHE_TYPE = cfg.ollama.kvCacheType;

     

       20
       +
           OLLAMA_CONTEXT_LENGTH = toString cfg.ollama.defaultContextLength;

     

       21
       +
           OLLAMA_MAX_LOADED_MODELS = toString cfg.ollama.maxLoadedModels;

     

       22
        
         };

     

       23
        
       in {

     

       24
        
         options.modules.apps.ollama = {

     
···

       28
        
             type = types.bool;

     

       29
        
           };

     

       30
        
       

     

       31
       +
           enableServer = mkOption {

     

       32
       +
             default = true;

     

       33
       +
             description = "Whether to enable Ollama's server.";

     

       34
       +
             type = types.bool;

     

       35
       +
           };

     

       36
       +
       

     

       37
        
           package = mkOption {

     

       38
        
             default = pkgs.ollama;

     

       39
        
             type = types.package;

     
···

       43
        
             default = "http://0.0.0.0:11434";

     

       44
        
             description = "Determines the host and port to listen on";

     

       45
        
             type = types.str;

     

       46
       +
           };

     

       47
       +
       

     

       48
       +
           maxLoadedModels = mkOption {

     

       49
       +
             default = 3;

     

       50
       +
             type = types.int;

     

       51
       +
           };

     

       52
       +
       

     

       53
       +
           defaultContextLength = mkOption {

     

       54
       +
             default = 32768;

     

       55
       +
             type = types.int;

     

       56
        
           };

     

       57
        
       

     

       58
        
           flashAttention = mkOption {

     

       59
       +
             default = true;

     

       60
        
             description = ''

     

       61
       +
               Enables experimental flash attention feature.

     

       62
        
               Effect: Activates an experimental optimization for attention mechanisms.

     

       63
        
               Scenario: Can potentially improve performance on compatible hardware but may introduce instability.

     

       64
        
             '';

     

       65
        
             type = types.bool;

     

       66
        
           };

     

       67
        
       

     

       68
       +
           kvCacheType = mkOption {

     

       69
       +
             default = "q8_0";

     

       70
       +
             type = types.enum [ "f16" "q8_0" "q4_0" ];

     

       71
       +
             description = ''

     

       72
       +
               Determines the K/V cache quantization type

     

       73
       +
               Effect: Activates quantization of the K/V cache reducing memory usage with flash attention.

     

       74
       +
               Scenario: Can lead to reduced VRAM usage at the cost of accuracy.

     

       75
       +
               Models with a higher Grouped Query Attention (GQA) count (e.g. Qwen 2) will see a larger negative impact.

     

       76
       +
             '';

     

       77
       +
           };

     

       78
       +
       

     

       79
        
           schedSpread = mkOption {

     

       80
        
             default = false;

     

       81
        
             description = ''

     
···

       103
        
           }

     

       104
        
       

     

       105
        
           (helpers.mkIfLinux {

     

       106
       +
             systemd.user.services.ollama = mkIf cfg.ollama.enableServer {

     

       107
        
               Unit = {

     

       108
        
                 Description = "Ollama";

     

       109
        
                 Documentation = "https://github.com/jmorganca/ollama";

     
···

       119
        
           })

     

       120
        
       

     

       121
        
           (helpers.mkIfDarwin {

     

       122
       +
             launchd.agents.ollama = mkIf cfg.ollama.enableServer{

     

       123
        
               enable = true;

     

       124
        
               config = {

     

       125
        
                 EnvironmentVariables = env;

+13

machines/irnbru/configuration.nix

···

       1
       +
       { pkgs, ... }:

     

       2
       +
       

     

       3
       +
       {

     

       4
       +
         imports = [ ];

     

       5
       +
       

     

       6
       +
         modules = {

     

       7
       +
           server = {

     

       8
       +
             enable = true;

     

       9
       +
             sshd.enable = true;

     

       10
       +
             tailscale.enable = true;

     

       11
       +
           };

     

       12
       +
         };

     

       13
       +
       }

+11

machines/irnbru/home.nix

···

       1
       +
       { ... }:

     

       2
       +
       

     

       3
       +
       {

     

       4
       +
         modules = {

     

       5
       +
           apps = {

     

       6
       +
             enable = true;

     

       7
       +
             ollama.enable = true;

     

       8
       +
             ghostty.enable = true;

     

       9
       +
           };

     

       10
       +
         };

     

       11
       +
       }

+1

machines/ramune/configuration.nix

···

       32
        
               { macAddress = "98:ed:7e:c6:57:b2"; ipAddress = "10.0.0.102"; } # eero router

     

       33
        
               { macAddress = "c4:f1:74:51:4c:f2"; ipAddress = "10.0.0.124"; } # eero router

     

       34
        
               { macAddress = "5c:61:99:7a:16:40"; ipAddress = "10.0.0.103"; } # brother printer

     

       0
        
       
     

       35
        
             ];

     

       36
        
             nftables.blockForward = [

     

       37
        
               "ec:e5:12:1d:23:40" # tado

···

       32
        
               { macAddress = "98:ed:7e:c6:57:b2"; ipAddress = "10.0.0.102"; } # eero router

     

       33
        
               { macAddress = "c4:f1:74:51:4c:f2"; ipAddress = "10.0.0.124"; } # eero router

     

       34
        
               { macAddress = "5c:61:99:7a:16:40"; ipAddress = "10.0.0.103"; } # brother printer

     

       35
       +
               { macAddress = "1c:1d:d3:de:4b:06"; ipAddress = "10.0.0.35"; }  # irnbru

     

       36
        
             ];

     

       37
        
             nftables.blockForward = [

     

       38
        
               "ec:e5:12:1d:23:40" # tado

+1

machines/sodacream/home.nix

···

       10
        
           };

     

       11
        
           apps = {

     

       12
        
             enable = true;

     

       0
        
       
     

       13
        
             ghostty.enable = true;

     

       14
        
             zen-browser.enable = true;

     

       15
        
             discord.enable = true;

···

       10
        
           };

     

       11
        
           apps = {

     

       12
        
             enable = true;

     

       13
       +
             ollama.enable = true;

     

       14
        
             ghostty.enable = true;

     

       15
        
             zen-browser.enable = true;

     

       16
        
             discord.enable = true;

+18

modules/base/macos.nix

···

       7
        
         system = {

     

       8
        
           primaryUser = "${user}";

     

       9
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       10
        
           keyboard = {

     

       11
        
             enableKeyMapping = true;

     

       12
        
             remapCapsLockToControl = true;

     
···

       31
        
               tilesize = 46;

     

       32
        
               mru-spaces = false;

     

       33
        
             };

     

       0
        
       
     

       34
        
             NSGlobalDomain = {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       35
        
               AppleShowAllExtensions = true;

     

       36
        
               InitialKeyRepeat = 10;

     

       37
        
               KeyRepeat = 2;

     
···

       40
        
               "com.apple.swipescrolldirection" = false;

     

       41
        
             };

     

       42
        
             spaces.spans-displays = false;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       43
        
           };

     

       44
        
         };

     

       45
        
       }

···

       7
        
         system = {

     

       8
        
           primaryUser = "${user}";

     

       9
        
       

     

       10
       +
           activationScripts.postActivation.text = ''

     

       11
       +
             # disable spotlight

     

       12
       +
             launchctl unload -w /System/Library/LaunchDaemons/com.apple.metadata.mds.plist >/dev/null 2>&1 || true

     

       13
       +
             # disable fseventsd on /nix volume

     

       14
       +
             mkdir -p /nix/.fseventsd

     

       15
       +
             test -e /nix/.fseventsd/no_log || touch /nix/.fseventsd/no_log

     

       16
       +
           '';

     

       17
       +
       

     

       18
        
           keyboard = {

     

       19
        
             enableKeyMapping = true;

     

       20
        
             remapCapsLockToControl = true;

     
···

       39
        
               tilesize = 46;

     

       40
        
               mru-spaces = false;

     

       41
        
             };

     

       42
       +
             LaunchServices.LSQuarantine = false;

     

       43
        
             NSGlobalDomain = {

     

       44
       +
               AppleMeasurementUnits = "Centimeters";

     

       45
       +
               AppleMetricUnits = 1;

     

       46
       +
               AppleTemperatureUnit = "Celsius";

     

       47
        
               AppleShowAllExtensions = true;

     

       48
        
               InitialKeyRepeat = 10;

     

       49
        
               KeyRepeat = 2;

     
···

       52
        
               "com.apple.swipescrolldirection" = false;

     

       53
        
             };

     

       54
        
             spaces.spans-displays = false;

     

       55
       +
       

     

       56
       +
             CustomSystemPreferences = {

     

       57
       +
               "com.apple.TimeMachine".DoNotOfferNewDisksForBackup = true;

     

       58
       +
               "com.apple.ImageCapture".disableHotPlug = true;

     

       59
       +
               "com.apple.gamed".Disabled = true;

     

       60
       +
             };

     

       61
        
           };

     

       62
        
         };

     

       63
        
       }

+4 -3

modules/base/nix-config.nix

···

       1
       -
       { lib, pkgs, inputs, helpers, config, ... }:

     

       2
        
       

     

       3
        
       with lib; mkMerge [

     

       4
        
         {

     
···

       31
        
                 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="

     

       32
        
               ];

     

       33
        
               trusted-users = [ "root" "@wheel" ];

     

       0
        
       
     

       0
        
       
     

       34
        
               # on Apple Silicon, Rosetta 2 allows for this

     

       35
        
               extra-platforms = mkIf (helpers.system == "aarch64-darwin") [ helpers.system "x86_64-darwin" ];

     

       36
        
             };

     
···

       53
        
           };

     

       54
        
         }

     

       55
        
         (helpers.darwinAttrs {

     

       56
       -
           system.stateVersion = 5;

     

       57
       -
           ids.gids.nixbld = 30000;

     

       58
        
         })

     

       59
        
       ]

···

       1
       +
       { lib, pkgs, inputs, helpers, user, config, ... }:

     

       2
        
       

     

       3
        
       with lib; mkMerge [

     

       4
        
         {

     
···

       31
        
                 "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="

     

       32
        
               ];

     

       33
        
               trusted-users = [ "root" "@wheel" ];

     

       34
       +
               allowed-users = [ "root" "@wheel" "${user}" ];

     

       35
       +
               extra-trusted-users = [ "${user}" ];

     

       36
        
               # on Apple Silicon, Rosetta 2 allows for this

     

       37
        
               extra-platforms = mkIf (helpers.system == "aarch64-darwin") [ helpers.system "x86_64-darwin" ];

     

       38
        
             };

     
···

       55
        
           };

     

       56
        
         }

     

       57
        
         (helpers.darwinAttrs {

     

       58
       +
           system.stateVersion = 6;

     

       0
        
       
     

       59
        
         })

     

       60
        
       ]

+2 -2

modules/server/caddy.nix

···

       1
       -
       { lib, config, hostname, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       67
        
             }

     

       68
        
           '') cfg.caddy.exposeFolders;

     

       69
        
         in strings.concatStringsSep "\n\n" configs;

     

       70
       -
       in {

     

       71
        
         options.modules.server.caddy = {

     

       72
        
           enable = mkOption {

     

       73
        
             default = false;

···

       1
       +
       { lib, config, hostname, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       67
        
             }

     

       68
        
           '') cfg.caddy.exposeFolders;

     

       69
        
         in strings.concatStringsSep "\n\n" configs;

     

       70
       +
       in helpers.linuxAttrs {

     

       71
        
         options.modules.server.caddy = {

     

       72
        
           enable = mkOption {

     

       73
        
             default = false;

+1 -4

modules/server/default.nix

···

       10
        
           };

     

       11
        
         };

     

       12
        
       

     

       13
       -
         config.modules.server = {

     

       14
       -
           enable = if helpers.isLinux then (mkDefault false) else (mkForce false);

     

       15
       -
         };

     

       16
       -
       } // helpers.linuxAttrs {

     

       17
        
         imports = [

     

       18
        
           ./sshd.nix

     

       19
        
           ./tailscale.nix

     
···

       23
        
           ./jellyfin.nix

     

       24
        
           ./home-assistant.nix

     

       25
        
           ./podman.nix

     

       0
        
       
     

       26
        
         ];

     

       27
        
       }

···

       10
        
           };

     

       11
        
         };

     

       12
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
         imports = [

     

       14
        
           ./sshd.nix

     

       15
        
           ./tailscale.nix

     
···

       19
        
           ./jellyfin.nix

     

       20
        
           ./home-assistant.nix

     

       21
        
           ./podman.nix

     

       22
       +
           ./macos.nix

     

       23
        
         ];

     

       24
        
       }

+2 -2

modules/server/hd-idle.nix

···

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

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
        
         cfgRoot = config.modules.server;

     

       6
        
         cfg = config.modules.server.hd-idle;

     

       7
       -
       in {

     

       8
        
         options.modules.server.hd-idle = {

     

       9
        
           enable = mkOption {

     

       10
        
             default = false;

···

       1
       +
       { lib, config, pkgs, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
        
         cfgRoot = config.modules.server;

     

       6
        
         cfg = config.modules.server.hd-idle;

     

       7
       +
       in helpers.linuxAttrs {

     

       8
        
         options.modules.server.hd-idle = {

     

       9
        
           enable = mkOption {

     

       10
        
             default = false;

+2 -2

modules/server/home-assistant.nix

···

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

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       10
        
         containerImage = if stdenv.isAarch64

     

       11
        
           then "ghcr.io/home-assistant/aarch64-homeassistant:${cfg.revision}"

     

       12
        
           else "ghcr.io/home-assistant/home-assistant:${cfg.revision}";

     

       13
       -
       in {

     

       14
        
         options.modules.server.home-assistant = {

     

       15
        
           enable = mkOption {

     

       16
        
             default = false;

···

       1
       +
       { lib, config, pkgs, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       10
        
         containerImage = if stdenv.isAarch64

     

       11
        
           then "ghcr.io/home-assistant/aarch64-homeassistant:${cfg.revision}"

     

       12
        
           else "ghcr.io/home-assistant/home-assistant:${cfg.revision}";

     

       13
       +
       in helpers.linuxAttrs {

     

       14
        
         options.modules.server.home-assistant = {

     

       15
        
           enable = mkOption {

     

       16
        
             default = false;

+2 -2

modules/server/jellyfin.nix

···

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

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       6
        
         cfg = config.modules.server.jellyfin;

     

       7
        
       

     

       8
        
         group = "share";

     

       9
       -
       in {

     

       10
        
         options.modules.server.jellyfin = {

     

       11
        
           enable = mkOption {

     

       12
        
             default = false;

···

       1
       +
       { lib, config, pkgs, user, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       6
        
         cfg = config.modules.server.jellyfin;

     

       7
        
       

     

       8
        
         group = "share";

     

       9
       +
       in helpers.linuxAttrs {

     

       10
        
         options.modules.server.jellyfin = {

     

       11
        
           enable = mkOption {

     

       12
        
             default = false;

+35

modules/server/macos.nix

···

       1
       +
       { lib, config, user, helpers, ... }:

     

       2
       +
       

     

       3
       +
       with lib;

     

       4
       +
       let

     

       5
       +
         cfg = config.modules.server;

     

       6
       +
       in helpers.darwinAttrs {

     

       7
       +
         options.modules.server = {

     

       8
       +
           disableSleep = mkOption {

     

       9
       +
             default = cfg.enable;

     

       10
       +
             example = true;

     

       11
       +
             description = "Whether to disable sleep";

     

       12
       +
             type = types.bool;

     

       13
       +
           };

     

       14
       +
         };

     

       15
       +
       

     

       16
       +
         config = mkIf cfg.disableSleep {

     

       17
       +
           system.activationScripts.postActivation.text = ''

     

       18
       +
             defaults write com.apple.screensaver idleTime 0

     

       19
       +
             pmset -a powernap 0

     

       20
       +
             pmset -a sms 0

     

       21
       +
             pmset -a sleep 0

     

       22
       +
             pmset -a hibernatemode 0

     

       23
       +
             pmset -a disablesleep 1

     

       24
       +
           '';

     

       25
       +
       

     

       26
       +
           power = {

     

       27
       +
             restartAfterFreeze = true;

     

       28
       +
             restartAfterPowerFailure = true;

     

       29
       +
             sleep = {

     

       30
       +
               allowSleepByPowerButton = false;

     

       31
       +
               computer = "never";

     

       32
       +
             };

     

       33
       +
           };

     

       34
       +
         };

     

       35
       +
       }

+2 -2

modules/server/podman.nix

···

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

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
        
         cfgRoot = config.modules.server;

     

       6
        
         cfg = config.modules.server.podman;

     

       7
       -
       in {

     

       8
        
         options.modules.server.podman = {

     

       9
        
           enable = mkOption {

     

       10
        
             default = false;

···

       1
       +
       { lib, config, user, pkgs, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
        
         cfgRoot = config.modules.server;

     

       6
        
         cfg = config.modules.server.podman;

     

       7
       +
       in helpers.linuxAttrs {

     

       8
        
         options.modules.server.podman = {

     

       9
        
           enable = mkOption {

     

       10
        
             default = false;

+2 -1

modules/server/sshd.nix

···

       1
       -
       { lib, config, user, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       20
        
       

     

       21
        
           services.openssh = {

     

       22
        
             enable = true;

     

       0
        
       
     

       23
        
             openFirewall = mkDefault (!config.modules.router.enable);

     

       24
        
           };

     

       25
        
         };

···

       1
       +
       { lib, config, user, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       20
        
       

     

       21
        
           services.openssh = {

     

       22
        
             enable = true;

     

       23
       +
           } // helpers.linuxAttrs {

     

       24
        
             openFirewall = mkDefault (!config.modules.router.enable);

     

       25
        
           };

     

       26
        
         };

+10 -3

modules/server/tailscale.nix

···

       1
       -
       { lib, config, pkgs, user, hostname, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       15
        
           };

     

       16
        
         };

     

       17
        
       

     

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

     

       19
        
           networking = {

     

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

     

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

     
···

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

     

       43
        
       

     

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

     

       45
       -
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       46
        
       }

···

       1
       +
       { lib, config, pkgs, user, helpers, hostname, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     
···

       15
        
           };

     

       16
        
         };

     

       17
        
       

     

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

     

       19
        
           networking = {

     

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

     

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

     
···

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

     

       43
        
       

     

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

     

       45
       +
         } // helpers.darwinAttrs {

     

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

     

       47
       +
       

     

       48
       +
           services.tailscale = {

     

       49
       +
             enable = true;

     

       50
       +
             overrideLocalDns = true;

     

       51
       +
           };

     

       52
       +
         });

     

       53
        
       }

+2 -2

modules/server/vaultwarden.nix

···

       1
       -
       { lib, config, hostname, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
        
         address = config.modules.router.adress;

     

       6
        
         cfg = config.modules.server;

     

       7
       -
       in {

     

       8
        
         options.modules.server.vaultwarden = {

     

       9
        
           enable = mkOption {

     

       10
        
             default = false;

···

       1
       +
       { lib, config, hostname, helpers, ... }:

     

       2
        
       

     

       3
        
       with lib;

     

       4
        
       let

     

       5
        
         address = config.modules.router.adress;

     

       6
        
         cfg = config.modules.server;

     

       7
       +
       in helpers.linuxAttrs {

     

       8
        
         options.modules.server.vaultwarden = {

     

       9
        
           enable = mkOption {

     

       10
        
             default = false;