From 99d8c73c166c6d3fb4cef78e71c58d416214ebe0 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Sat, 24 Feb 2024 20:15:46 +0300 Subject: [PATCH] Git : Move config to nix. --- .config/linux/system/flake.nix | 1 + .config/linux/system/module/common/Git.nix | 11 +++++++++++ .config/linux/system/module/common/Package.nix | 1 - .config/linux/system/module/common/Wallpaper.nix | 2 +- .gitconfig | 8 -------- .gitignore | 1 - 6 files changed, 13 insertions(+), 11 deletions(-) create mode 100644 .config/linux/system/module/common/Git.nix delete mode 100644 .gitconfig diff --git a/.config/linux/system/flake.nix b/.config/linux/system/flake.nix index 3b8e36e..c6ec2be 100644 --- a/.config/linux/system/flake.nix +++ b/.config/linux/system/flake.nix @@ -22,6 +22,7 @@ ./module/common/Filesystem.nix ./module/common/Firefox.nix ./module/common/Firewall.nix + ./module/common/Git.nix ./module/common/Kernel.nix ./module/common/Locale.nix ./module/common/Network.nix diff --git a/.config/linux/system/module/common/Git.nix b/.config/linux/system/module/common/Git.nix new file mode 100644 index 0000000..d313558 --- /dev/null +++ b/.config/linux/system/module/common/Git.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: { + programs.git = { + enable = true; + config = { + credential.helper = "store"; + init.defaultBranch = "main"; + pull.rebase = true; + push.autoSetupRemote = true; + }; + }; +} diff --git a/.config/linux/system/module/common/Package.nix b/.config/linux/system/module/common/Package.nix index 1092c86..11347a4 100644 --- a/.config/linux/system/module/common/Package.nix +++ b/.config/linux/system/module/common/Package.nix @@ -10,7 +10,6 @@ ffmpeg file gcc - git gnome.gnome-tweaks gnumake gnused diff --git a/.config/linux/system/module/common/Wallpaper.nix b/.config/linux/system/module/common/Wallpaper.nix index ab0db9e..b69338a 100644 --- a/.config/linux/system/module/common/Wallpaper.nix +++ b/.config/linux/system/module/common/Wallpaper.nix @@ -1,5 +1,5 @@ { environment, ... }: { environment.etc.wallpaper = { - source = ../../../wallpaper; + source = ../../../wallpaper; # TODO: Use a path relative to repo. }; } diff --git a/.gitconfig b/.gitconfig deleted file mode 100644 index e554888..0000000 --- a/.gitconfig +++ /dev/null @@ -1,8 +0,0 @@ -[credential] - helper = store -[pull] - rebase = true -[push] - autoSetupRemote = true -[init] - defaultBranch = main diff --git a/.gitignore b/.gitignore index 958f337..8994266 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ # Git. !/.gitignore -!/.gitconfig # Editorconfig. !/.editorconfig