commit fd01b3f59c33fa4cd17cad256df92798f076678f · pyrox.dev/nixpkgs

+20 -11

nixos/modules/services/misc/atuin.nix

···

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

     

       2
       2
       -
       

     

       3
       3
       -
       with lib;

     

       4
       4
       -
       

     

       5
       2
        
       let

     

       3
       3
       +
         inherit (lib) mkOption types mdDoc mkIf;

     

       6
       4
        
         cfg = config.services.atuin;

     

       7
       5
        
       in

     

       8
       6
        
       {

     

       9
       7
        
         options = {

     

       10
       8
        
           services.atuin = {

     

       11
       11
       -
             enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin");

     

       9
       9
       +
             enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin");

     

       12
       10
        
       

     

       13
       11
        
             openRegistration = mkOption {

     

       14
       12
        
               type = types.bool;

     
···

       50
       48
        
               createLocally = mkOption {

     

       51
       49
        
                 type = types.bool;

     

       52
       50
        
                 default = true;

     

       53
       53
       -
                 description = lib.mdDoc "Create the database and database user locally.";

     

       51
       51
       +
                 description = mdDoc "Create the database and database user locally.";

     

       52
       52
       +
               };

     

       53
       53
       +
       

     

       54
       54
       +
               uri = mkOption {

     

       55
       55
       +
                 type = types.str;

     

       56
       56
       +
                 default = "postgresql:///atuin?host=/run/postgresql";

     

       57
       57
       +
                 example = "postgresql://atuin@localhost:5432/atuin";

     

       58
       58
       +
                 description = mdDoc "URI to the database";

     

       54
       59
        
               };

     

       55
       60
        
             };

     

       56
       61
        
           };

     

       57
       62
        
         };

     

       58
       63
        
       

     

       59
       64
        
         config = mkIf cfg.enable {

     

       65
       65
       +
           assertions = [

     

       66
       66
       +
             {

     

       67
       67
       +
               assertion = cfg.database.createLocally -> config.services.postgresql.enable;

     

       68
       68
       +
               message = "Postgresql must be enabled to create a local database";

     

       69
       69
       +
             }

     

       70
       70
       +
           ];

     

       60
       71
        
       

     

       61
       61
       -
           # enable postgres to host atuin db

     

       62
       62
       -
           services.postgresql = {

     

       72
       72
       +
           services.postgresql = mkIf cfg.database.createLocally {

     

       63
       73
        
             enable = true;

     

       64
       74
        
             ensureUsers = [{

     

       65
       75
        
               name = "atuin";

     
···

       73
       83
        
           systemd.services.atuin = {

     

       74
       84
        
             description = "atuin server";

     

       75
       85
        
             requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];

     

       76
       76
       -
             after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ] ;

     

       86
       86
       +
             after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];

     

       77
       87
        
             wantedBy = [ "multi-user.target" ];

     

       78
       88
        
       

     

       79
       89
        
             serviceConfig = {

     
···

       87
       97
        
               ATUIN_HOST = cfg.host;

     

       88
       98
        
               ATUIN_PORT = toString cfg.port;

     

       89
       99
        
               ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;

     

       90
       90
       -
               ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration;

     

       91
       91
       -
               ATUIN_DB_URI =  mkIf cfg.database.createLocally "postgresql:///atuin";

     

       100
       100
       +
               ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration;

     

       101
       101
       +
               ATUIN_DB_URI = cfg.database.uri;

     

       92
       102
        
               ATUIN_PATH = cfg.path;

     

       93
       103
        
               ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables

     

       94
       104
        
             };

     

       95
       105
        
           };

     

       96
       106
        
       

     

       97
       107
        
           networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];

     

       98
       98
       -
       

     

       99
       108
        
         };

     

       100
       109
        
       }

nixos/tests/atuin.nix

···

       14
       14
        
           server =

     

       15
       15
        
             { ... }:

     

       16
       16
        
             {

     

       17
       17
       +
               services.postgresql.enable = true;

     

       18
       18
       +
       

     

       17
       19
        
               services.atuin = {

     

       18
       20
        
                 enable = true;

     

       19
       21
        
                 port = testPort;