commit fa3c6b76688e8452d12b25fadf405d535c2dfac6 · ovyerus.com/dotfiles

+1 -1

modules/programs/desktop-cli.nix

···

       29
        
         nixos.ifEnabled = {myconfig, ...}: {

     

       30
        
           programs.nh = {

     

       31
        
             enable = true;

     

       32
       -
             flake = "/home/${myconfig.constants.username}/.config/nixos";

     

       33
        
           };

     

       34
        
         };

     

       35

···

       29
        
         nixos.ifEnabled = {myconfig, ...}: {

     

       30
        
           programs.nh = {

     

       31
        
             enable = true;

     

       32
       +
             flake = "/etc/nixos";

     

       33
        
           };

     

       34
        
         };

     

       35

+3 -1

modules/programs/git.nix

···

       99
        
               };

     

       100
        
       

     

       101
        
               aliases = {

     

       102
       -
                 tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       103
        
                 e = ["edit"];

     

       104
        
                 n = ["new"];

     

       0
        
       
     

       0
        
       
     

       105
        
               };

     

       106
        
       

     

       107
        
               merge-tools.mergiraf = {

     
···

       112
        
               git = {

     

       113
        
                 sign-on-push = true;

     

       114
        
                 push-new-bookmarks = true;

     

       0
        
       
     

       115
        
               };

     

       116
        
       

     

       117
        
               signing = {

···

       99
        
               };

     

       100
        
       

     

       101
        
               aliases = {

     

       0
        
       
     

       102
        
                 e = ["edit"];

     

       103
        
                 n = ["new"];

     

       104
       +
                 tug = ["bookmark" "move" "--from" "closest_bookmark(@-)" "--to" "@-"];

     

       105
       +
                 tug-here = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "@"];

     

       106
        
               };

     

       107
        
       

     

       108
        
               merge-tools.mergiraf = {

     
···

       113
        
               git = {

     

       114
        
                 sign-on-push = true;

     

       115
        
                 push-new-bookmarks = true;

     

       116
       +
                 write-change-id-header = true;

     

       117
        
               };

     

       118
        
       

     

       119
        
               signing = {