My Nix Configuration
[flake] solve home-manager eval issues
+33
-48
+20
-47
homeModules/programs/git/default.nix
+20
-47
homeModules/programs/git/default.nix
···
21
21
git = lib.mkIf cfg.enable {
22
22
enable = true;
23
23
package = pkgs.git;
24
-
aliases = {
25
-
a = "add -p";
26
-
co = "checkout";
27
-
cob = "checkout -b";
28
-
f = "fetch -p";
29
-
c = "commit";
30
-
p = "push";
31
-
ba = "branch -a";
32
-
bd = "branch -d";
33
-
bD = "branch -D";
34
-
d = "diff";
35
-
dc = "diff --cached";
36
-
ds = "diff --staged";
37
-
r = "restore";
38
-
rs = "restore --staged";
39
-
st = "status -sb";
40
-
# reset
41
-
soft = "reset --soft";
42
-
hard = "reset --hard";
43
-
s1ft = "soft HEAD~1";
44
-
h1rd = "hard HEAD~1";
45
-
# logging
46
-
lg = "log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit";
47
-
plog = "log --graph --pretty='format:%C(red)%d%C(reset) %C(yellow)%h%C(reset) %ar %C(green)%aN%C(reset) %s'";
48
-
tlog = "log --stat --since='1 Day Ago' --graph --pretty=oneline --abbrev-commit --date=relative";
49
-
rank = "shortlog -sn --no-merges";
50
-
# delete merged branches
51
-
bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d";
52
-
wt = "worktree";
53
-
};
54
-
delta = {
55
-
enable = true;
56
-
options.line-numbers = true;
57
-
};
58
-
extraConfig = {
24
+
settings = {
59
25
branch.sort = "-committerdate";
60
26
column.ui = "auto";
61
27
core.editor = lib.getExe pkgs.neovim;
62
28
"credential \"https://git.pyrox.dev\"".username = "pyrox";
63
29
credential.helper = "rbw";
64
30
diff = {
65
-
algorithm = "histogram";
31
+
algorithm = "diff3";
66
32
colorMoved = "plain";
67
33
mnemonicPrefix = true;
68
34
renames = true;
···
81
47
};
82
48
rebase.updateRefs = true;
83
49
tag.sort = "version:refname";
50
+
lfs = {
51
+
enable = true;
52
+
skipSmudge = false;
53
+
};
54
+
user = {
55
+
email = "pyrox@pyrox.dev";
56
+
name = "dish";
57
+
};
58
+
signing = {
59
+
key = "~/.ssh/main.pub";
60
+
format = "ssh";
61
+
signByDefault = true;
62
+
};
84
63
};
85
-
lfs = {
86
-
enable = true;
87
-
skipSmudge = false;
88
-
};
89
-
signing = {
90
-
key = "~/.ssh/main.pub";
91
-
format = "ssh";
92
-
signByDefault = true;
93
-
};
94
-
userEmail = "pyrox@pyrox.dev";
95
-
userName = "dish";
64
+
};
65
+
delta = {
66
+
enable = true;
67
+
options.line-numbers = true;
68
+
enableGitIntegration = true;
96
69
};
97
70
mergiraf = lib.mkIf cfg.enable {
98
71
enable = true;
+13
-1
homeModules/programs/ssh/default.nix
+13
-1
homeModules/programs/ssh/default.nix
···
7
7
config = lib.mkIf cfg.enable {
8
8
programs.ssh = {
9
9
enable = true;
10
-
compression = true;
10
+
enableDefaultConfig = false;
11
11
matchBlocks = {
12
+
"*" = {
13
+
forwardAgent = false;
14
+
addKeysToAgent = "no";
15
+
serverAliveInterval = 0;
16
+
serverAliveCountMax = 3;
17
+
hashKnownHosts = false;
18
+
userKnownHostsFile = "~/.ssh/known_hosts";
19
+
controlMaster = "no";
20
+
controlPath = "~/.ssh/master-%r@%n:%p";
21
+
controlPersist = "no";
22
+
compression = true;
23
+
};
12
24
"marvin" = {
13
25
hostname = "100.123.15.72";
14
26
user = "thehedgehog";