Personal Nix setup
Delete overlays folder
+3
-6
+2
-2
config/home/git.nix
+2
-2
config/home/git.nix
···
31
31
lol = "log --pretty=longline";
32
32
recommit = "commit -a --amend --no-edit";
33
33
pushf = "push --force-with-lease";
34
-
glog = "log --pretty=longline --decorate --all --graph";
34
+
glog = "log --pretty=longline --decorate --all --graph --date=relative";
35
35
};
36
36
37
37
extraConfig = {
···
51
51
difftool.prompt = false;
52
52
mergetool.prompt = true;
53
53
"mergetool \"vimdiff\"".cmd = "nvim -d $LOCAL $REMOTE $MERGED -c '$wincmd w' -c 'wincmd J'";
54
-
pretty.longline = "tformat:%Cgreen%h %Cred%D %Creset%s %Cblue(%cr, by %an)";
54
+
pretty.longline = "tformat:%Cgreen%h %Cred%D %Creset%s %Cblue(%cd, by %an)";
55
55
"remote \"origin\"" = {
56
56
fetch = "+refs/pull/*/head:refs/remotes/origin/pr/*";
57
57
pruneTags = true;
-1
nix/channels.nix
-1
nix/channels.nix
···
34
34
{ prefix = "nixos"; path = nixpkgs_src; }
35
35
{ prefix = "nixos-config"; path = ../configuration.nix; }
36
36
{ prefix = "nixpkgs"; path = nixpkgs_src; }
37
-
{ prefix = "nixpkgs-overlays"; path = ../overlays/default.nix; }
38
37
];
39
38
40
39
nixPath = map ({ prefix, path }: "${prefix}=${__replaceStrings [ "/mnt/" ] [ "/" ] (toString path)}") __nixPath;
+1
-2
nix/nix-path.nix
+1
-2
nix/nix-path.nix
···
10
10
11
11
rec {
12
12
nixpkgs = {
13
-
overlays = import <nixpkgs-overlays>;
14
13
config.allowUnfree = true;
15
14
config.allowBroken = true;
16
15
};
···
21
20
let
22
21
pkgsConf = {
23
22
inherit (config.nixpkgs) localSystem crossSystem;
24
-
overlays = config.nixpkgs.overlays ++ nixpkgs.overlays;
23
+
overlays = config.nixpkgs.overlays;
25
24
config = config.nixpkgs.config // nixpkgs.config;
26
25
};
27
26
in rec {
-1
overlays/default.nix
-1
overlays/default.nix
···
1
-
[]