···

       
168
       
168
       
 
       


     

       
169
       
169
       
 
       
- The default `kops` version is now 1.33.0 and versions 1.30 and older have been dropped. See [Upgrading Kubernetes](https://kops.sigs.k8s.io/tutorial/upgrading-kubernetes/) for instructions on how to update kOps.

     

       
170
       
170
       
 
       


     

       
171
       
171
       
+
       
- `programs.skim.fuzzyCompletions` has been removed in favor of adding the completions to the package itself.

     

       
172
       
172
       
+
       


     

       
171
       
173
       
 
       
- `Prosody` has been updated to major release 13 which removed some obsoleted modules and brought a couple of major and breaking changes:

     

       
172
       
174
       
 
       
  - The `http_files` module is now disabled by default because it now requires `http_files_dir` to be configured.

     

       
173
       
175
       
 
       
  - The `vcard_muc` module has been removed and got replaced by the inbuilt `muc_vcard` module.

     

···

       
8
       
8
       
 
       
  inherit (lib)

     

       
9
       
9
       
 
       
    mkEnableOption

     

       
10
       
10
       
 
       
    mkPackageOption

     

       
11
       
11
       
-
       
    optional

     

       
11
       
11
       
+
       
    mkRemovedOptionModule

     

       
12
       
12
       
 
       
    optionalString

     

       
13
       
13
       
+
       
    mkIf

     

       
13
       
14
       
 
       
    ;

     

       
14
       
15
       
 
       
  cfg = config.programs.skim;

     

       
15
       
16
       
 
       
in

     

       
16
       
17
       
 
       
{

     

       
18
       
18
       
+
       
  imports = [

     

       
19
       
19
       
+
       
    (mkRemovedOptionModule [ "programs" "skim" "fuzzyCompletion" ]

     

       
20
       
20
       
+
       
      "programs.skim.fuzzyCompletion has been removed. Completions are now included in the package itself."

     

       
21
       
21
       
+
       
    )

     

       
22
       
22
       
+
       
  ];

     

       
23
       
23
       
+
       


     

       
17
       
24
       
 
       
  options = {

     

       
18
       
25
       
 
       
    programs.skim = {

     

       
19
       
19
       
-
       
      fuzzyCompletion = mkEnableOption "fuzzy completion with skim";

     

       
26
       
26
       
+
       
      enable = mkEnableOption "skim fuzzy finder";

     

       
20
       
27
       
 
       
      keybindings = mkEnableOption "skim keybindings";

     

       
21
       
28
       
 
       
      package = mkPackageOption pkgs "skim" { };

     

       
22
       
29
       
 
       
    };

     

       
23
       
30
       
 
       
  };

     

       
24
       
31
       
 
       


     

       
25
       
25
       
-
       
  config = {

     

       
26
       
26
       
-
       
    environment.systemPackages = optional (cfg.keybindings || cfg.fuzzyCompletion) cfg.package;

     

       
32
       
32
       
+
       
  config = mkIf cfg.enable {

     

       
33
       
33
       
+
       
    environment.systemPackages = [ cfg.package ];

     

       
27
       
34
       
 
       


     

       
28
       
28
       
-
       
    programs.bash.interactiveShellInit =

     

       
29
       
29
       
-
       
      optionalString cfg.fuzzyCompletion ''

     

       
30
       
30
       
-
       
        source ${cfg.package}/share/skim/completion.bash

     

       
31
       
31
       
-
       
      ''

     

       
32
       
32
       
-
       
      + optionalString cfg.keybindings ''

     

       
33
       
33
       
-
       
        source ${cfg.package}/share/skim/key-bindings.bash

     

       
34
       
34
       
-
       
      '';

     

       
35
       
35
       
+
       
    programs.bash.interactiveShellInit = optionalString cfg.keybindings ''

     

       
36
       
36
       
+
       
      source ${cfg.package}/share/skim/key-bindings.bash

     

       
37
       
37
       
+
       
    '';

     

       
35
       
38
       
 
       


     

       
36
       
36
       
-
       
    programs.zsh.interactiveShellInit =

     

       
37
       
37
       
-
       
      optionalString cfg.fuzzyCompletion ''

     

       
38
       
38
       
-
       
        source ${cfg.package}/share/skim/completion.zsh

     

       
39
       
39
       
-
       
      ''

     

       
40
       
40
       
-
       
      + optionalString cfg.keybindings ''

     

       
41
       
41
       
-
       
        source ${cfg.package}/share/skim/key-bindings.zsh

     

       
42
       
42
       
-
       
      '';

     

       
39
       
39
       
+
       
    programs.zsh.interactiveShellInit = optionalString cfg.keybindings ''

     

       
40
       
40
       
+
       
      source ${cfg.package}/share/skim/key-bindings.zsh

     

       
41
       
41
       
+
       
    '';

     

       
43
       
42
       
 
       


     

       
44
       
43
       
 
       
    programs.fish.interactiveShellInit = optionalString cfg.keybindings ''

     

       
45
       
44
       
 
       
      source ${cfg.package}/share/skim/key-bindings.fish && skim_key_bindings

     

···

       
51
       
51
       
 
       


     

       
52
       
52
       
 
       
    installBin sk-share

     

       
53
       
53
       
 
       
    installManPage $(find man -type f)

     

       
54
       
54
       
+
       
    installShellCompletion \

     

       
55
       
55
       
+
       
      --cmd sk \

     

       
56
       
56
       
+
       
      --bash shell/completion.bash \

     

       
57
       
57
       
+
       
      --fish shell/completion.fish \

     

       
58
       
58
       
+
       
      --zsh shell/completion.zsh

     

       
54
       
59
       
 
       
  '';

     

       
55
       
60
       
 
       


     

       
56
       
61
       
 
       
  # Doc tests are broken on aarch64