move the git config into a common file

This commit is contained in:
Andreas Zweili 2021-11-22 14:48:47 +01:00
parent 0701773027
commit 3404337eb2
6 changed files with 32 additions and 57 deletions

View File

@ -37,7 +37,5 @@
relativenumber = true;
};
};
# raw files
home.file.".config/git/hooks".source = ./common/git/hooks;
}

View File

@ -1,24 +0,0 @@
{config, pkgs, ...}:
{
imports = [
./common.nix
];
programs.git = {
enable = true;
userName = "Andreas Zweili";
userEmail = "zweili@contria.com";
delta = {
enable = true;
options = {
navigate = true;
line-numbers = true;
syntax-theme = "GitHub";
};
};
};
home.shellAliases = {
management-server = "mosh --ssh=\"ssh -p 22\" localadmin@10.40.0.53 tmux a";
};
# raw config files
home.file.".bashrc".source = ./work_config/bashrc;
}

View File

@ -0,0 +1,17 @@
{config, pkgs, ...}:
{
programs.git = {
enable = true;
userName = "Andreas Zweili";
delta = {
enable = true;
options = {
navigate = true;
line-numbers = true;
syntax-theme = "GitHub";
};
};
};
# raw files
home.file.".config/git/hooks".source = ./hooks;
}

View File

@ -1,7 +1,8 @@
{config, pkgs, ...}:
{
{
imports = [
./common.nix
./common/git/git.nix
];
nixpkgs.config.allowUnfree = true;
home.packages = with pkgs; [
@ -12,19 +13,8 @@
vscode
youtube-dl
];
programs.git = {
enable = true;
userName = "Andreas Zweili";
userEmail = "andreas@zweili.ch";
delta = {
enable = true;
options = {
navigate = true;
line-numbers = true;
syntax-theme = "GitHub";
};
};
};
programs.git.userEmail = "andreas@zweili.ch";
# raw config files
home.file.".config/qtile".source = ./desktop/qtile;
}

View File

@ -1,8 +1,12 @@
{config, pkgs, ...}:
{
{
imports = [
./personal-desktop.nix
./common.nix
./common/git/git.nix
];
programs.git.userEmail = "andreas@zweili.ch";
#programs.bash.enable = true;
targets.genericLinux.enable = true;
}

View File

@ -1,21 +1,11 @@
{config, pkgs, ...}:
{
{
imports = [
./common.nix
./common/git/git.nix
];
programs.git = {
enable = true;
userName = "Andreas Zweili";
userEmail = "zweili@contria.com";
delta = {
enable = true;
options = {
navigate = true;
line-numbers = true;
syntax-theme = "GitHub";
};
};
};
programs.git.userEmail = "zweili@contria.com";
home.shellAliases = {
management-server = "mosh --ssh=\"ssh -p 22\" localadmin@10.40.0.53 tmux a";
};