Compare commits

...

4 Commits

3 changed files with 7 additions and 4 deletions

View File

@ -15,7 +15,8 @@
extraConfig = { extraConfig = {
init.defaultBranch = "master"; init.defaultBranch = "master";
push.autoSetupRemote = true; push.autoSetupRemote = true;
pull.rebase = true; pull.merge = true;
merge.tool = "nvimdiff";
}; };
ignores = [ ignores = [
@ -39,7 +40,7 @@
dc = "diff --cached"; dc = "diff --cached";
amend = "commit --amend -m"; amend = "commit --amend -m";
# aliases for submodule # aliases for submodules
update = "submodule update --init --recursive"; update = "submodule update --init --recursive";
foreach = "submodule foreach"; foreach = "submodule foreach";
}; };

View File

@ -23,6 +23,8 @@
}) })
]; ];
security.sudo.wheelNeedsPassword = false;
users.groups.wyatt = {}; users.groups.wyatt = {};
nix.settings.trusted-users = [userName]; nix.settings.trusted-users = [userName];

View File

@ -14,7 +14,7 @@ Given that this configuration is in the `machine/<hostname>` directory (where ho
# other configuration files here... # other configuration files here...
]; ];
customPowerManagement = { pwrMgmt = {
enable = true; enable = true;
cpuFreqGovernor = "performance"; cpuFreqGovernor = "performance";
powertop.enable = false; powertop.enable = false;
@ -29,7 +29,7 @@ Given that this configuration is in the `machine/<hostname>` directory (where ho
# other configuration files here... # other configuration files here...
]; ];
customPowerManagement = { pwrMgmt = {
enable = true; enable = true;
cpuFreqGovernor = "powersave"; cpuFreqGovernor = "powersave";
powertop = { powertop = {