commit 8a0ce26d145c88f9ca9dbc9841f6ef3546e53703 · kitten.sh/system

+18 -12
modules/base/shell.nix
···

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

     

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

     

       2
       2
        
       

     

       3
       3
       -
       {

     

       4
       4
       -
         environment.systemPackages = [ pkgs.zsh ];

     

       3
       3
       +
       with lib;

     

       4
       4
       +
       mkMerge [

     

       5
       5
       +
         {

     

       6
       6
       +
           environment.systemPackages = [ pkgs.zsh ];

     

       5
       7
        
       

     

       6
       6
       -
         environment.pathsToLink = [ "/share/zsh" ];

     

       7
       7
       -
         environment.variables = {

     

       8
       8
       -
           SHELL = "${pkgs.zsh}/bin/zsh";

     

       9
       9
       -
         };

     

       8
       8
       +
           environment.pathsToLink = [ "/share/zsh" ];

     

       9
       9
       +
           environment.variables = {

     

       10
       10
       +
             SHELL = "${pkgs.zsh}/bin/zsh";

     

       11
       11
       +
           };

     

       10
       12
        
       

     

       11
       11
       -
         programs.zsh = {

     

       12
       12
       -
           enable = true;

     

       13
       13
       -
           promptInit = lib.mkDefault "";

     

       14
       14
       -
         };

     

       15
       15
       -
       }

     

       13
       13
       +
           programs.zsh = {

     

       14
       14
       +
             enable = true;

     

       15
       15
       +
             promptInit = lib.mkDefault "";

     

       16
       16
       +
           };

     

       17
       17
       +
         }

     

       18
       18
       +
         (helpers.linuxAttrs {

     

       19
       19
       +
           environment.systemPackages = [ pkgs.wl-clipboard-rs ];

     

       20
       20
       +
         })

     

       21
       21
       +
       ]