fixes cli tools config

This commit is contained in:
Dennis Schoepf 2026-03-04 19:45:03 +01:00
parent 65a428b116
commit c69697bbd3
2 changed files with 63 additions and 28 deletions

View file

@ -1,4 +1,4 @@
{ ... }: { inputs, ... }:
let let
commonPackages = commonPackages =
pkgs: with pkgs; [ pkgs: with pkgs; [
@ -15,7 +15,6 @@ let
just just
mmv-go mmv-go
usbutils usbutils
lazygit
opencode opencode
]; ];
in in
@ -24,11 +23,47 @@ in
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = commonPackages pkgs; environment.systemPackages = commonPackages pkgs;
home-manager.sharedModules = [
inputs.self.modules.homeManager.git
];
}; };
flake.modules.darwin.cli-tools = flake.modules.darwin.cli-tools =
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = commonPackages pkgs; environment.systemPackages = commonPackages pkgs;
home-manager.sharedModules = [
inputs.self.modules.homeManager.git
];
};
flake.modules.homeManager.cli-tools =
{ pkgs, ... }:
{
programs.lazygit = {
enable = true;
settings = {
gui = {
nerdFontsVersion = "3";
theme = {
lightTheme = false;
activeBorderColor = [
"magenta"
"bold"
];
searchingActiveBorderColor = [
"cyan"
"bold"
];
inactiveBorderColor = [ "#807c9f" ];
optionsTextColor = [ "#807c9f" ];
selectedLineBgColor = [ "#331531" ];
inactiveViewSelectedLineBgColor = [ "#1d202f" ];
};
};
};
};
}; };
} }

View file

@ -4,7 +4,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
]; ];
home-manager.sharedModules = [ home-manager.sharedModules = [
@ -16,7 +16,7 @@
{ pkgs, ... }: { pkgs, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
git git
]; ];
home-manager.sharedModules = [ home-manager.sharedModules = [
@ -24,35 +24,35 @@
]; ];
}; };
flake.modules.homeManager.git = flake.modules.homeManager.git =
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
programs.git = { programs.git = {
enable = true; enable = true;
settings = { settings = {
init = { init = {
defaultBranch = "main"; defaultBranch = "main";
}; };
core = { core = {
ignorecase = "false"; ignorecase = "false";
}; };
pull = { pull = {
rebase = false; rebase = false;
}; };
push = { push = {
autoSetupRemote = true; autoSetupRemote = true;
}; };
user = { user = {
# TODO get from config # TODO get from config
name = "Dennis Schoepf"; name = "Dennis Schoepf";
email = "me@dnsc.io"; email = "me@dnsc.io";
}; };
}; };
ignores = [ ".DS_Store" ]; ignores = [ ".DS_Store" ];
}; };
}; };
} }