commit 329e097828de876410d2f82f23126115fcfc28dd · pyrox.dev/nixpkgs

+4 -1

nixos/modules/config/users-groups.nix

···

       564
       564
        
             };

     

       565
       565
        
           }) (filterAttrs (_: u: u.packages != []) cfg.users));

     

       566
       566
        
       

     

       567
       567
       -
           environment.profiles = [ "/etc/profiles/per-user/$USER" ];

     

       567
       567
       +
           environment.profiles = [

     

       568
       568
       +
             "$HOME/.nix-profile"

     

       569
       569
       +
             "/etc/profiles/per-user/$USER"

     

       570
       570
       +
           ];

     

       568
       571
        
       

     

       569
       572
        
           assertions = [

     

       570
       573
        
             { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique);

+2 -3

nixos/modules/programs/environment.nix

···

       23
       23
        
               XCURSOR_PATH = [ "$HOME/.icons" ];

     

       24
       24
        
             };

     

       25
       25
        
       

     

       26
       26
       -
           environment.profiles =

     

       27
       27
       -
             [ "$HOME/.nix-profile"

     

       28
       28
       -
               "/nix/var/nix/profiles/default"

     

       26
       26
       +
           environment.profiles = mkAfter

     

       27
       27
       +
             [ "/nix/var/nix/profiles/default"

     

       29
       28
        
               "/run/current-system/sw"

     

       30
       29
        
             ];

     

       31
       30