commit c1017f6bd0c3bc72f7927ab68c26bc14b0f168c5 · pyrox.dev/nix

-12

homes/x86_64-linux/pyrox/programs/gh.nix

···

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

     

       2
       2
       -
         programs.gh = {

     

       3
       3
       -
           enable = true;

     

       4
       4
       -
           gitCredentialHelper.enable = true;

     

       5
       5
       -
           settings = {

     

       6
       6
       -
             editor = lib.getExe pkgs.py.nvim;

     

       7
       7
       -
             git_protocol = "https";

     

       8
       8
       -
             browser = "${pkgs.firefox-wayland}/bin/firefox";

     

       9
       9
       -
             prompt = "enabled";

     

       10
       10
       -
           };

     

       11
       11
       -
         };

     

       12
       12
       -
       }

-75

homes/x86_64-linux/pyrox/programs/git.nix

···

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

     

       2
       2
       -
       {

     

       3
       3
       -
         programs.git = {

     

       4
       4
       -
           enable = true;

     

       5
       5
       -
           package = pkgs.py.customGit;

     

       6
       6
       -
           aliases = {

     

       7
       7
       -
             a = "add -p";

     

       8
       8
       -
             co = "checkout";

     

       9
       9
       -
             cob = "checkout -b";

     

       10
       10
       -
             f = "fetch -p";

     

       11
       11
       -
             c = "commit";

     

       12
       12
       -
             p = "push";

     

       13
       13
       -
             ba = "branch -a";

     

       14
       14
       -
             bd = "branch -d";

     

       15
       15
       -
             bD = "branch -D";

     

       16
       16
       -
             d = "diff";

     

       17
       17
       -
             dc = "diff --cached";

     

       18
       18
       -
             ds = "diff --staged";

     

       19
       19
       -
             r = "restore";

     

       20
       20
       -
             rs = "restore --staged";

     

       21
       21
       -
             st = "status -sb";

     

       22
       22
       -
             # reset

     

       23
       23
       -
             soft = "reset --soft";

     

       24
       24
       -
             hard = "reset --hard";

     

       25
       25
       -
             s1ft = "soft HEAD~1";

     

       26
       26
       -
             h1rd = "hard HEAD~1";

     

       27
       27
       -
             # logging

     

       28
       28
       -
             lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";

     

       29
       29
       -
             plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";

     

       30
       30
       -
             tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";

     

       31
       31
       -
             rank = "shortlog -sn --no-merges";

     

       32
       32
       -
             # delete merged branches

     

       33
       33
       -
             bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";

     

       34
       34
       -
             wt = "worktree";

     

       35
       35
       -
           };

     

       36
       36
       -
           delta = {

     

       37
       37
       -
             enable = true;

     

       38
       38
       -
             options.line-numbers = true;

     

       39
       39
       -
           };

     

       40
       40
       -
           extraConfig = {

     

       41
       41
       -
             core.editor = lib.getExe pkgs.py.nvim;

     

       42
       42
       -
             init.defaultBranch = "main";

     

       43
       43
       -
             pull.rebase = false;

     

       44
       44
       -
             # gpg.format = "ssh";

     

       45
       45
       -
             gpg."ssh".allowedSignersFile = "~/.ssh/authorized_signatures";

     

       46
       46
       -
             "credential \"https://git.pyrox.dev\"".username = "pyrox";

     

       47
       47
       -
             credential.helper = "rbw";

     

       48
       48
       -
           };

     

       49
       49
       -
           lfs = {

     

       50
       50
       -
             enable = true;

     

       51
       51
       -
             skipSmudge = false;

     

       52
       52
       -
           };

     

       53
       53
       -
           signing = {

     

       54
       54
       -
             key = "0xFE1D8A7D620C611F";

     

       55
       55
       -
             signByDefault = true;

     

       56
       56
       -
           };

     

       57
       57
       -
           userEmail = "pyrox@pyrox.dev";

     

       58
       58
       -
           userName = "Pyrox";

     

       59
       59
       -
         };

     

       60
       60
       -
         programs.lazygit = {

     

       61
       61
       -
           enable = true;

     

       62
       62
       -
           catppuccin.enable = true;

     

       63
       63
       -
           settings = {

     

       64
       64
       -
             gui = {

     

       65
       65
       -
               nerdFontsVersion = "3";

     

       66
       66
       -
               showRandomTip = false;

     

       67
       67
       -
               theme.selectedLineBgColor = ["default"];

     

       68
       68
       -
             };

     

       69
       69
       -
             git.paging = {

     

       70
       70
       -
               pager = "${lib.getExe pkgs.delta} --dark --paging=never";

     

       71
       71
       -
               colorArg = "always";

     

       72
       72
       -
             };

     

       73
       73
       -
           };

     

       74
       74
       -
         };

     

       75
       75
       -
       }

+102

modules/home/programs/git/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         pkgs,

     

       3
       3
       +
         lib,

     

       4
       4
       +
         config,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       7
       7
       +
       let

     

       8
       8
       +
         cfg = config.py.programs.git;

     

       9
       9
       +
       in

     

       10
       10
       +
       {

     

       11
       11
       +
         options.py.programs.git = {

     

       12
       12
       +
           enable = lib.mkEnableOption "git configuration";

     

       13
       13
       +
           lazygit.enable = lib.mkEnableOption "lazygit configuration";

     

       14
       14
       +
           gh.enable = lib.mkEnableOption "gh configuration";

     

       15
       15
       +
         };

     

       16
       16
       +
         config = {

     

       17
       17
       +
           programs = {

     

       18
       18
       +
             git = lib.mkIf cfg.enable {

     

       19
       19
       +
               enable = true;

     

       20
       20
       +
               package = pkgs.py.customGit;

     

       21
       21
       +
               aliases = {

     

       22
       22
       +
                 a = "add -p";

     

       23
       23
       +
                 co = "checkout";

     

       24
       24
       +
                 cob = "checkout -b";

     

       25
       25
       +
                 f = "fetch -p";

     

       26
       26
       +
                 c = "commit";

     

       27
       27
       +
                 p = "push";

     

       28
       28
       +
                 ba = "branch -a";

     

       29
       29
       +
                 bd = "branch -d";

     

       30
       30
       +
                 bD = "branch -D";

     

       31
       31
       +
                 d = "diff";

     

       32
       32
       +
                 dc = "diff --cached";

     

       33
       33
       +
                 ds = "diff --staged";

     

       34
       34
       +
                 r = "restore";

     

       35
       35
       +
                 rs = "restore --staged";

     

       36
       36
       +
                 st = "status -sb";

     

       37
       37
       +
                 # reset

     

       38
       38
       +
                 soft = "reset --soft";

     

       39
       39
       +
                 hard = "reset --hard";

     

       40
       40
       +
                 s1ft = "soft HEAD~1";

     

       41
       41
       +
                 h1rd = "hard HEAD~1";

     

       42
       42
       +
                 # logging

     

       43
       43
       +
                 lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";

     

       44
       44
       +
                 plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";

     

       45
       45
       +
                 tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";

     

       46
       46
       +
                 rank = "shortlog -sn --no-merges";

     

       47
       47
       +
                 # delete merged branches

     

       48
       48
       +
                 bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";

     

       49
       49
       +
                 wt = "worktree";

     

       50
       50
       +
               };

     

       51
       51
       +
               delta = {

     

       52
       52
       +
                 enable = true;

     

       53
       53
       +
                 options.line-numbers = true;

     

       54
       54
       +
               };

     

       55
       55
       +
               extraConfig = {

     

       56
       56
       +
                 core.editor = lib.getExe pkgs.py.nvim;

     

       57
       57
       +
                 init.defaultBranch = "main";

     

       58
       58
       +
                 pull.rebase = false;

     

       59
       59
       +
                 # gpg.format = "ssh";

     

       60
       60
       +
                 gpg."ssh".allowedSignersFile = "~/.ssh/authorized_signatures";

     

       61
       61
       +
                 "credential \"https://git.pyrox.dev\"".username = "pyrox";

     

       62
       62
       +
                 credential.helper = "rbw";

     

       63
       63
       +
               };

     

       64
       64
       +
               lfs = {

     

       65
       65
       +
                 enable = true;

     

       66
       66
       +
                 skipSmudge = false;

     

       67
       67
       +
               };

     

       68
       68
       +
               signing = {

     

       69
       69
       +
                 key = "0xFE1D8A7D620C611F";

     

       70
       70
       +
                 signByDefault = true;

     

       71
       71
       +
               };

     

       72
       72
       +
               userEmail = "pyrox@pyrox.dev";

     

       73
       73
       +
               userName = "Pyrox";

     

       74
       74
       +
             };

     

       75
       75
       +
             lazygit = lib.mkIf cfg.lazygit.enable {

     

       76
       76
       +
               enable = true;

     

       77
       77
       +
               catppuccin.enable = true;

     

       78
       78
       +
               settings = {

     

       79
       79
       +
                 gui = {

     

       80
       80
       +
                   nerdFontsVersion = "3";

     

       81
       81
       +
                   showRandomTip = false;

     

       82
       82
       +
                   theme.selectedLineBgColor = [ "default" ];

     

       83
       83
       +
                 };

     

       84
       84
       +
                 git.paging = {

     

       85
       85
       +
                   pager = "${lib.getExe pkgs.delta} --dark --paging=never";

     

       86
       86
       +
                   colorArg = "always";

     

       87
       87
       +
                 };

     

       88
       88
       +
               };

     

       89
       89
       +
             };

     

       90
       90
       +
             gh = lib.mkIf cfg.gh.enable {

     

       91
       91
       +
               enable = true;

     

       92
       92
       +
               gitCredentialHelper.enable = true;

     

       93
       93
       +
               settings = {

     

       94
       94
       +
                 editor = lib.getExe pkgs.py.nvim;

     

       95
       95
       +
                 git_protocol = "https";

     

       96
       96
       +
                 browser = lib.mkIf config.py.sway.enable pkgs.firefox-wayland;

     

       97
       97
       +
                 prompt = "enabled";

     

       98
       98
       +
               };

     

       99
       99
       +
             };

     

       100
       100
       +
           };

     

       101
       101
       +
         };

     

       102
       102
       +
       }