From d94d620d2f393e274676a619b8a56f97f0ed7524 Mon Sep 17 00:00:00 2001 From: Freya Murphy Date: Thu, 26 Jun 2025 13:26:37 -0400 Subject: make system config more modular --- system/default.nix | 67 +++++------------------------------------------------- 1 file changed, 6 insertions(+), 61 deletions(-) (limited to 'system/default.nix') diff --git a/system/default.nix b/system/default.nix index ae04066..36d11ee 100644 --- a/system/default.nix +++ b/system/default.nix @@ -5,7 +5,11 @@ ... }: { imports = [ + ./battery.nix + ./bluetooth.nix + ./desktop.nix ./hardware.nix + ./networking.nix ./sshd.nix ]; @@ -30,7 +34,6 @@ bash zsh # utility - acpi curl dig file @@ -49,15 +52,6 @@ wget ]; - # nix-ld - programs.nix-ld.enable = true; - - # appimage - programs.appimage = { - enable = !config.minimal; - binfmt = !config.minimal; - }; - # use the latest kernel boot.kernelPackages = pkgs.linuxPackages_latest; @@ -65,7 +59,7 @@ boot.kernel.sysctl."kernel.sysrq" = 246; # timezone - time.timeZone = "America/New_York"; + time.timeZone = config.timeZone; # docs documentation = { @@ -77,60 +71,11 @@ # locale i18n.defaultLocale = "en_US.UTF-8"; - # networking - networking.networkmanager.enable = true; - networking.networkmanager.dns = "systemd-resolved"; - networking.firewall.enable = true; - services.resolved.enable = true; - - # hardware - services.dbus.implementation = "broker"; - services.fwupd.enable = true; - services.libinput.enable = config.desktop.enable; - services.pipewire = { - enable = config.desktop.enable; - alsa.enable = config.desktop.enable; - pulse.enable = config.desktop.enable; - jack.enable = config.desktop.enable; - }; - - # power - services.upower = { - enable = !config.minimal; - percentageLow = 20; - percentageCritical = 10; - percentageAction = 4; - criticalPowerAction = "Hibernate"; - }; - services.tlp = { - enable = !config.minimal; - settings = { - CPU_SCALING_GOVERNOR_ON_AC = "performance"; - CPU_SCALING_GOVERNOR_ON_BAT = "powersave"; - - CPU_ENERGY_PERF_POLICY_ON_BAT = "power"; - CPU_ENERGY_PERF_POLICY_ON_AC = "performance"; - - CPU_MIN_PERF_ON_AC = 0; - CPU_MAX_PERF_ON_AC = 100; - CPU_MIN_PERF_ON_BAT = 0; - CPU_MAX_PERF_ON_BAT = 20; - }; - }; - - # printing - services.printing.enable = config.desktop.enable; - services.avahi = { - enable = config.desktop.enable; - nssmdns4 = config.desktop.enable; - openFirewall = config.desktop.enable; - }; - # create user account users.users.${config.user} = { isNormalUser = true; description = config.fullName; - extraGroups = ["networkmanager" "wheel" "sys" "video" "audio"]; + extraGroups = ["wheel" "sys" "video" "audio"]; home = config.homePath; shell = pkgs.zsh; }; -- cgit v1.2.3-freya