some more work laptop things
This commit is contained in:
parent
b1a2cd686f
commit
566ec67fdd
3 changed files with 8 additions and 1 deletions
|
@ -65,7 +65,7 @@
|
||||||
mkHome = { user ? "sammy", hostname ? null }:
|
mkHome = { user ? "sammy", hostname ? null }:
|
||||||
lib.homeManagerConfiguration {
|
lib.homeManagerConfiguration {
|
||||||
inherit pkgs;
|
inherit pkgs;
|
||||||
modules = [ ./users/${user} ] ++ lib.optional (!isNull hostname) (./. + "/users/${user}@${hostname}");
|
modules = [ ./users/${user}/home.nix ] ++ lib.optional (!isNull hostname) (./. + "/users/${user}@${hostname}/home.nix");
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
|
pkgs-unstable = import nixpkgs-unstable { system = "x86_64-linux"; };
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
init = { defaultBranch = "main"; };
|
init = { defaultBranch = "main"; };
|
||||||
core = { editor = "nvim"; };
|
core = { editor = "nvim"; };
|
||||||
pull.rebase = true;
|
pull.rebase = true;
|
||||||
|
push.autoSetupRemote = true;
|
||||||
};
|
};
|
||||||
aliases = {
|
aliases = {
|
||||||
a = "add";
|
a = "add";
|
||||||
|
|
|
@ -2,4 +2,10 @@
|
||||||
programs.ssh.includes = [
|
programs.ssh.includes = [
|
||||||
"./famedly-config"
|
"./famedly-config"
|
||||||
];
|
];
|
||||||
|
programs.git.includes = [
|
||||||
|
{
|
||||||
|
path = "~/famedly/.gitconfig";
|
||||||
|
condition = "gitdir:~/famedly/";
|
||||||
|
}
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue