From 3fd217504248b57d25dc69a333a7338121d50cbc Mon Sep 17 00:00:00 2001 From: Alexandre LUCAZEAU Date: Fri, 5 Aug 2022 14:16:06 +0200 Subject: [PATCH] ADD gitconfig - initial commit --- hosts/dell-5590/nixos/configuration.nix | 1 + hosts/dell-5590/nixpkgs/home.nix | 5 ++-- hosts/dell-5590/nixpkgs/redshift.nix | 2 +- modules/.gitconfig | 31 +++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 modules/.gitconfig diff --git a/hosts/dell-5590/nixos/configuration.nix b/hosts/dell-5590/nixos/configuration.nix index 2c1c708..7b6fc5a 100644 --- a/hosts/dell-5590/nixos/configuration.nix +++ b/hosts/dell-5590/nixos/configuration.nix @@ -12,6 +12,7 @@ ./services.nix ./scanner.nix ./packages.nix + ../modules/prometheus-node.nix ]; # Use the systemd-boot EFI boot loader. diff --git a/hosts/dell-5590/nixpkgs/home.nix b/hosts/dell-5590/nixpkgs/home.nix index 9d2356d..6ca50ee 100644 --- a/hosts/dell-5590/nixpkgs/home.nix +++ b/hosts/dell-5590/nixpkgs/home.nix @@ -9,8 +9,9 @@ ./emacs.nix ./mails.nix ./dunst.nix - ./redshift.nix - ../../../modules/neovim.nix +# ./redshift.nix +# ../../../modules/neovim.nix + ../../../modules/rust.nix ]; home.keyboard = { layout = "fr"; diff --git a/hosts/dell-5590/nixpkgs/redshift.nix b/hosts/dell-5590/nixpkgs/redshift.nix index 8511000..3d21a9f 100644 --- a/hosts/dell-5590/nixpkgs/redshift.nix +++ b/hosts/dell-5590/nixpkgs/redshift.nix @@ -8,7 +8,7 @@ day = 5500; night = 4500; }; - brightness = { + settings.redshift.brightness = { day = "1.0"; night = "0.9"; }; diff --git a/modules/.gitconfig b/modules/.gitconfig new file mode 100644 index 0000000..795e2e0 --- /dev/null +++ b/modules/.gitconfig @@ -0,0 +1,31 @@ +[alias] + aa = add --all + b = branch -v + bd = branch -d + bD = branch -D + br = branch + ci = commit + cim = commit -m + cima = commit -am + clr = rm -r --cached + co = checkout + cp = cherry-pick -x + d = diff -w + dc = diff --cached + nb = checkout -b + oups = commit --amend --no-edit + r = remote -v + rh = reset --hard + st = status -sb + t = tag -l + unstage = reset HEAD + uncommit = reset --soft HEAD^ + pushfl = push --force-with-lease + lg = lg1 + lg1 = lg1-specific --all + lg2 = lg2-specific --all + lg3 = lg3-specific --all + + lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' + lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' + lg3-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)'