cyplo/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

port git

Browse source
This commit is contained in:
Cyryl Płotnicki 2020-07-25 11:57:23 +01:00
parent d474ab5b5d
commit fd2214f778
4 changed files with 40 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
nixos/boxes/foureighty/default.nix
View file

@ -14,6 +14,7 @@
../../backups.nix ../../backups.nix
../../gui ../../gui
../../gnome ../../gnome
../../git
]; ];
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
@ -40,7 +41,6 @@
home-manager.users.cyryl = {...}: { home-manager.users.cyryl = {...}: {
imports = [ imports = [
../../home-manager ../../home-manager
../../home-manager/programs/git.nix
]; ];
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;

25
nixos/boxes/skinnyv/default.nix
View file

@ -2,6 +2,19 @@
{ {
networking.hostName = "skinnyv"; networking.hostName = "skinnyv";
imports = [
<home-manager/nixos>
/etc/nixos/hardware-configuration.nix
../../boot.nix
../../common.nix
../../gfx-intel.nix
../../zerotier.nix
../../i3/system.nix
../../distributed-builds.nix
../../gui
../../git
];
boot = { boot = {
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
initrd.luks.devices = { initrd.luks.devices = {
@ -25,8 +38,6 @@
imports = [ imports = [
imports = [ imports = [
../../home-manager ../../home-manager
../../home-manager/gui.nix
../../home-manager/programs/git.nix
]; ];
]; ];
home.stateVersion = config.system.stateVersion; home.stateVersion = config.system.stateVersion;
@ -37,14 +48,4 @@
home.file.".config/i3/status.toml".source = ../../../.config/i3/status-single-bat.toml; home.file.".config/i3/status.toml".source = ../../../.config/i3/status-single-bat.toml;
}; };
imports = [
<home-manager/nixos>
/etc/nixos/hardware-configuration.nix
../../boot.nix
../../common.nix
../../gfx-intel.nix
../../zerotier.nix
../../i3/system.nix
../../distributed-builds.nix
];
} }

26
nixos/git/default.nix Normal file
View file

@ -0,0 +1,26 @@
{ config, pkgs, lib, ... }:
{
home-manager.users.cyryl = {...}: {
programs.git = {
enable = true;
lfs.enable = true;
userName = "Cyryl Płotnicki";
userEmail = "cyplo@cyplo.net";
extraConfig = {
credential = { helper ="cache"; };
core = { pager = "cat"; };
pager = {
diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
};
};
aliases =
{
tree = "log --show-signature --color --decorate --date=short --all --graph -n 3";
newbranch = "!git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b $2";
head = "log HEAD -n1";
vacuum = "!git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs -r git branch -D && git gc --aggressive --auto";
};
};
};
}

24
nixos/home-manager/programs/git.nix
View file

@ -1,24 +0,0 @@
{ config, pkgs, lib, ... }:
{
programs.git = {
enable = true;
lfs.enable = true;
userName = "Cyryl Płotnicki";
userEmail = "cyplo@cyplo.net";
extraConfig = {
credential = { helper ="cache"; };
core = { pager = "cat"; };
pager = {
diff = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
show = "${pkgs.gitAndTools.diff-so-fancy}/bin/diff-so-fancy | less --tabs=1,5 -RFX";
};
};
aliases =
{
tree = "log --show-signature --color --decorate --date=short --all --graph -n 3";
newbranch = "!git checkout master && git fetch -p && git reset --hard origin/master && git checkout -b $2";
head = "log HEAD -n1";
vacuum = "!git fetch -p && git branch -vv | awk '/: gone]/{print $1}' | xargs -r git branch -D && git gc --aggressive --auto";
};
};
}