commit 9b00b78e6af6ecc7cfe53c46340845f5e4dbb701 · kitten.sh/system

+5 -1

modules/base/gpg.nix

···

       5
       5
        
         cfg = config.modules.gpg;

     

       6
       6
        
       in {

     

       7
       7
        
         options.modules.gpg = {

     

       8
       8
       -
           enable = mkEnableOption "GnuPG";

     

       8
       8
       +
           enable = mkOption {

     

       9
       9
       +
             default = true;

     

       10
       10
       +
             description = "GnuPG";

     

       11
       11
       +
             type = types.bool;

     

       12
       12
       +
           };

     

       9
       13
        
         };

     

       10
       14
        
       

     

       11
       15
        
         config = mkIf cfg.enable {

+10 -2

modules/nvim/default.nix

···

       72
       72
        
         neovim = pkgs.wrapNeovimUnstable neovimPkg neovimConfig;

     

       73
       73
        
       in {

     

       74
       74
        
         options.modules.nvim = {

     

       75
       75
       -
           enable = mkEnableOption "Neovim";

     

       76
       76
       -
           useCustomConfig = mkEnableOption "Custom Configuration";

     

       75
       75
       +
           enable = mkOption {

     

       76
       76
       +
             default = true;

     

       77
       77
       +
             description = "Neovim";

     

       78
       78
       +
             type = types.bool;

     

       79
       79
       +
           };

     

       80
       80
       +
           useCustomConfig = mkOption {

     

       81
       81
       +
             default = cfg.enable;

     

       82
       82
       +
             description = "Custom Configuration";

     

       83
       83
       +
             type = types.bool;

     

       84
       84
       +
           };

     

       77
       85
        
         };

     

       78
       86
        
       

     

       79
       87
        
         config = mkIf cfg.enable {

+3 -3

modules/server/caddy.nix

···

       66
       66
        
               }

     

       67
       67
        
             }

     

       68
       68
        
           '') cfg.caddy.exposeFolders;

     

       69
       69
       -
         in string.concatStringsSep "\n\n" configs;

     

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

     

       70
       70
        
       in {

     

       71
       71
        
         options.modules.server.caddy = {

     

       72
       72
        
           enable = mkOption {

     

       73
       73
       -
             default = cfg.enable;

     

       73
       73
       +
             default = false;

     

       74
       74
        
             example = true;

     

       75
       75
        
             description = "Whether to enable Caddy.";

     

       76
       76
        
             type = types.bool;

     
···

       84
       84
        
           };

     

       85
       85
        
         };

     

       86
       86
        
       

     

       87
       87
       -
         config = mkIf cfg.caddy.enable {

     

       87
       87
       +
         config = mkIf (cfg.enable && cfg.caddy.enable) {

     

       88
       88
        
           services.tailscale = mkIf tailscaleEnabled {

     

       89
       89
        
             permitCertUid = config.services.caddy.user;

     

       90
       90
        
           };

+5 -1

modules/server/jellyfin.nix

···

       15
       15
        
             type = types.bool;

     

       16
       16
        
           };

     

       17
       17
        
       

     

       18
       18
       -
           sync = mkEnableOption "Whether to sync files from remotes";

     

       18
       18
       +
           sync = mkOption {

     

       19
       19
       +
             default = cfg.enable;

     

       20
       20
       +
             description = "Whether to sync files from remotes";

     

       21
       21
       +
             type = types.bool;

     

       22
       22
       +
           };

     

       19
       23
        
         };

     

       20
       24
        
       

     

       21
       25
        
         config = mkIf (cfg.enable && cfgRoot.enable) {

+5 -1

modules/server/podman.nix

···

       13
       13
        
             type = types.bool;

     

       14
       14
        
           };

     

       15
       15
        
       

     

       16
       16
       -
           tweakKernel = mkEnableOption "Whether to tweak kernel configuration";

     

       16
       16
       +
           tweakKernel = mkOption {

     

       17
       17
       +
             default = cfg.enable;

     

       18
       18
       +
             description = "Whether to tweak kernel configuration";

     

       19
       19
       +
             type = types.bool;

     

       20
       20
       +
           };

     

       17
       21
        
         };

     

       18
       22
        
       

     

       19
       23
        
         config = mkIf (cfg.enable && cfgRoot.enable) {