Compare commits

..

No commits in common. "master" and "nix-ld-refactor" have entirely different histories.

3 changed files with 4 additions and 7 deletions

View File

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

View File

@ -23,8 +23,6 @@
}) })
]; ];
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...
]; ];
pwrMgmt = { customPowerManagement = {
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...
]; ];
pwrMgmt = { customPowerManagement = {
enable = true; enable = true;
cpuFreqGovernor = "powersave"; cpuFreqGovernor = "powersave";
powertop = { powertop = {