commit aa46b1ec0ecb498716813549fe4de479b8f5e893 · pyrox.dev/nixpkgs

nixos/modules/module-list.nix

···

       127
       127
        
         ./programs/zsh/oh-my-zsh.nix

     

       128
       128
        
         ./programs/zsh/zsh.nix

     

       129
       129
        
         ./programs/zsh/zsh-autoenv.nix

     

       130
       130
       +
         ./programs/zsh/zsh-autosuggestions.nix

     

       130
       131
        
         ./programs/zsh/zsh-syntax-highlighting.nix

     

       131
       132
        
         ./rename.nix

     

       132
       133
        
         ./security/acme.nix

+60

nixos/modules/programs/zsh/zsh-autosuggestions.nix

···

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

     

       2
       2
       +
       

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       

     

       5
       5
       +
       let

     

       6
       6
       +
         cfg = config.programs.zsh.autosuggestions;

     

       7
       7
       +
       in

     

       8
       8
       +
       {

     

       9
       9
       +
         options.programs.zsh.autosuggestions = {

     

       10
       10
       +
       

     

       11
       11
       +
           enable = mkEnableOption "zsh-autosuggestions";

     

       12
       12
       +
       

     

       13
       13
       +
           highlightStyle = mkOption {

     

       14
       14
       +
             type = types.str;

     

       15
       15
       +
             default = "fg=8"; # https://github.com/zsh-users/zsh-autosuggestions/tree/v0.4.3#suggestion-highlight-style

     

       16
       16
       +
             description = "Highlight style for suggestions ({fore,back}ground color)";

     

       17
       17
       +
             example = "fg=cyan";

     

       18
       18
       +
           };

     

       19
       19
       +
       

     

       20
       20
       +
           strategy = mkOption {

     

       21
       21
       +
             type = types.enum [ "default" "match_prev_cmd" ];

     

       22
       22
       +
             default = "default";

     

       23
       23
       +
             description = ''

     

       24
       24
       +
               Set ZSH_AUTOSUGGEST_STRATEGY to choose the strategy for generating suggestions.

     

       25
       25
       +
               There are currently two to choose from:

     

       26
       26
       +
       

     

       27
       27
       +
                 * default: Chooses the most recent match.

     

       28
       28
       +
                 * match_prev_cmd: Chooses the most recent match whose preceding history item matches

     

       29
       29
       +
                   the most recently executed command (more info). Note that this strategy won't work as

     

       30
       30
       +
                   expected with ZSH options that don't preserve the history order such as

     

       31
       31
       +
                   HIST_IGNORE_ALL_DUPS or HIST_EXPIRE_DUPS_FIRST.

     

       32
       32
       +
             '';

     

       33
       33
       +
           };

     

       34
       34
       +
       

     

       35
       35
       +
           extraConfig = mkOption {

     

       36
       36
       +
             type = with types; attrsOf str;

     

       37
       37
       +
             default = {};

     

       38
       38
       +
             description = "Attribute set with additional configuration values";

     

       39
       39
       +
             example = literalExample ''

     

       40
       40
       +
               {

     

       41
       41
       +
                 "ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" = "20";

     

       42
       42
       +
               }

     

       43
       43
       +
             '';

     

       44
       44
       +
           };

     

       45
       45
       +
       

     

       46
       46
       +
         };

     

       47
       47
       +
       

     

       48
       48
       +
         config = mkIf cfg.enable {

     

       49
       49
       +
       

     

       50
       50
       +
           programs.zsh.interactiveShellInit = ''

     

       51
       51
       +
             source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh

     

       52
       52
       +
       

     

       53
       53
       +
             export ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="${cfg.highlightStyle}"

     

       54
       54
       +
             export ZSH_AUTOSUGGEST_STRATEGY="${cfg.strategy}"

     

       55
       55
       +
       

     

       56
       56
       +
             ${concatStringsSep "\n" (mapAttrsToList (key: value: ''export ${key}="${value}"'') cfg.extraConfig)}

     

       57
       57
       +
           '';

     

       58
       58
       +
       

     

       59
       59
       +
         };

     

       60
       60
       +
       }

-11

nixos/modules/programs/zsh/zsh.nix

···

       87
       87
        
               type = types.bool;

     

       88
       88
        
             };

     

       89
       89
        
       

     

       90
       90
       -
             enableAutosuggestions = mkOption {

     

       91
       91
       -
               default = false;

     

       92
       92
       -
               description = ''

     

       93
       93
       -
                 Enable zsh-autosuggestions

     

       94
       94
       -
               '';

     

       95
       95
       -
               type = types.bool;

     

       96
       96
       -
             };

     

       97
       90
        
           };

     

       98
       91
        
       

     

       99
       92
        
         };

     
···

       167
       160
        
               done

     

       168
       161
        
       

     

       169
       162
        
               ${optionalString cfg.enableCompletion "autoload -U compinit && compinit"}

     

       170
       170
       -
       

     

       171
       171
       -
               ${optionalString (cfg.enableAutosuggestions)

     

       172
       172
       -
                 "source ${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"

     

       173
       173
       -
               }

     

       174
       163
        
       

     

       175
       164
        
               ${cfge.interactiveShellInit}

     

       176
       165

nixos/modules/rename.nix

···

       247
       247
        
           (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "custom" ] [ "programs" "zsh" "ohMyZsh" "custom" ])

     

       248
       248
        
           (mkRenamedOptionModule [ "programs" "zsh" "oh-my-zsh" "plugins" ] [ "programs" "zsh" "ohMyZsh" "plugins" ])

     

       249
       249
        
       

     

       250
       250
       +
           (mkRenamedOptionModule [ "programs" "zsh" "enableAutosuggestions" ] [ "programs" "zsh" "autosuggestions" "enable" ])

     

       251
       251
       +
       

     

       250
       252
        
           # Xen

     

       251
       253
        
           (mkRenamedOptionModule [ "virtualisation" "xen" "qemu-package" ] [ "virtualisation" "xen" "package-qemu" ])

     

       252
       254