Skip to content

treewide: avoid repeated keys in attribute sets #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
42willow merged 1 commit into from
Jun 29, 2026
Merged

treewide: avoid repeated keys in attribute sets #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 21 additions & 21 deletions hosts/earthy/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@
};
};

services.openssh = {
enable = true;
settings = {
PermitRootLogin = "yes";
};
};

# samba
environment.systemPackages = [pkgs.cifs-utils];
fileSystems."/mnt/nas" = {
Expand All @@ -34,21 +27,28 @@
in ["${automount_opts},credentials=${config.age.secrets.samba.path}"];
};

# tlp
services.tlp = {
enable = true;
settings = {
CPU_ENERGY_PERF_POLICY_AC = "performance";
CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
PLATFORM_PROFILE_ON_AC = "performance";
PLATFORM_PROFILE_ON_BAT = "low-power";
WIFI_PWR_ON_AC = "off"; # default: off
WIFI_PWR_ON_BAT = "off"; # default: on todo)) trying to resolve samba frozen unit session slice issue
services = {
openssh = {
enable = true;
settings = {
PermitRootLogin = "yes";
};
};
};

# fwupd
services.fwupd = {
enable = true;
tlp = {
enable = true;
settings = {
CPU_ENERGY_PERF_POLICY_AC = "performance";
CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
PLATFORM_PROFILE_ON_AC = "performance";
PLATFORM_PROFILE_ON_BAT = "low-power";
WIFI_PWR_ON_AC = "off"; # default: off
WIFI_PWR_ON_BAT = "off"; # default: on todo)) trying to resolve samba frozen unit session slice issue
};
};

fwupd = {
enable = true;
};
};
}
10 changes: 6 additions & 4 deletions modules/darwin/desktop/aerospace.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@

settings = {
gaps = {
outer.left = 8;
outer.bottom = 8;
outer.top = 8;
outer.right = 8;
outer = {
left = 8;
bottom = 8;
top = 8;
right = 8;
};
};
mode.main.binding =
{
Expand Down
8 changes: 5 additions & 3 deletions modules/shared/home/programs/cli/git.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,11 @@ in {
lfs.enable = true;

settings = {
user.name = "willow";
user.email = "42willow" + "@" + "pm.me";
user = {
name = "willow";
email = "42willow" + "@" + "pm.me";
signingkey = osConfig.age.secrets.gh.path;
};

alias = {
co = "checkout";
Expand Down Expand Up @@ -51,7 +54,6 @@ in {
# commit signing
commit.gpgsign = true;
gpg.format = "ssh";
user.signingkey = osConfig.age.secrets.gh.path;
gpg.ssh.allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
};
};
Expand Down
8 changes: 5 additions & 3 deletions modules/shared/home/programs/tui/helix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,11 @@
in {
config = lib.mkIf (cfg.tui.enable
&& cfg.categories.core.enable) {
xdg.configFile.".prettierrc.json".text = builtins.toJSON (import ./prettier.nix {inherit pkgs;});
xdg.configFile.".dprint.jsonc".text = builtins.toJSON (import ./dprint.nix {inherit pkgs;});
xdg.configFile."moxide/settings.toml".source = ./moxide.toml;
xdg.configFile = {
".prettierrc.json".text = builtins.toJSON (import ./prettier.nix {inherit pkgs;});
".dprint.jsonc".text = builtins.toJSON (import ./dprint.nix {inherit pkgs;});
"moxide/settings.toml".source = ./moxide.toml;
};

programs.helix = {
enable = true;
Expand Down
Loading