From ffd53dee19012c5b3029fb201fce9fc3d9eac425 Mon Sep 17 00:00:00 2001 From: Aaron Bieber Date: Sat, 22 Oct 2022 10:20:50 -0600 Subject: [PATCH] europa: clear out some configs that are not used and switch to nixos-hardware for framewrok --- flake.nix | 3 +- hosts/europa/default.nix | 65 ------------------------- hosts/europa/hardware-configuration.nix | 1 - 3 files changed, 2 insertions(+), 67 deletions(-) diff --git a/flake.nix b/flake.nix index b0e26c1..84a5c52 100644 --- a/flake.nix +++ b/flake.nix @@ -131,7 +131,8 @@ devShells.aarch64-darwin.default = buildShell darwinPkgs; nixosConfigurations = { - europa = buildSys "x86_64-linux" unstable [ ] "europa"; + europa = buildSys "x86_64-linux" unstable [ + nixos-hardware.nixosModules.framework ] "europa"; stan = buildSys "x86_64-linux" unstable [ ] "stan"; weather = buildSys "aarch64-linux" unstable [ nixos-hardware.nixosModules.raspberry-pi-4 ] "weather"; diff --git a/hosts/europa/default.nix b/hosts/europa/default.nix index e4cc870..47dae89 100644 --- a/hosts/europa/default.nix +++ b/hosts/europa/default.nix @@ -72,43 +72,6 @@ in { }; sshFidoAgent.enable = true; - configManager = { - enable = true; - router = { - enable = true; - - hostName = "10.6.0.1"; - pfAllowUnifi = false; - - interfaces = { - em0 = { - text = '' - inet autoconf - inet6 autoconf - ''; - }; - em1 = { - text = '' - inet 10.99.99.1 255.255.255.0 10.99.99.255 - description "Trunk" - up - ''; - }; - vlan2 = { - text = '' - inet 10.3.0.1 255.255.255.0 10.3.0.255 vnetid 2 parent em1 description "Lab" up''; - }; - vlan10 = { - text = '' - inet 10.10.0.1 255.255.255.0 10.10.0.255 vnetid 10 parent em1 description "Untrusted WiFi" up''; - }; - vlan11 = { - text = '' - inet 10.12.0.1 255.255.255.0 10.12.0.255 vnetid 11 parent em1 description "Trusted WiFi" up''; - }; - }; - }; - }; nixManager = { enable = true; @@ -143,8 +106,6 @@ in { programs.steam.enable = true; - systemd.sleep.extraConfig = "HibernateDelaySec=2h"; - services = { clamav.updater.enable = true; emacs = { @@ -165,31 +126,6 @@ in { ]; }; - fprintd.enable = true; - - logind = { - lidSwitch = "suspend-then-hibernate"; - lidSwitchExternalPower = "lock"; - extraConfig = '' - HandlePowerKey=suspend-then-hibernate - IdleAction=suspend-then-hibernate - IdleActionSec=2h - ''; - }; - - fstrim.enable = true; - - tlp = { - enable = false; - settings = { - CPU_BOOST_ON_BAT = 0; - CPU_SCALING_GOVERNOR_ON_BATTERY = "powersave"; - START_CHARGE_THRESH_BAT0 = 90; - STOP_CHARGE_THRESH_BAT0 = 97; - RUNTIME_PM_ON_BAT = "auto"; - }; - }; - fwupd = { enable = true; enableTestRemote = true; @@ -216,7 +152,6 @@ in { fido2luks isync klavaro - libfprint-2-tod1-goodix linphone logseq minicom diff --git a/hosts/europa/hardware-configuration.nix b/hosts/europa/hardware-configuration.nix index 1a8ed96..53adebc 100644 --- a/hosts/europa/hardware-configuration.nix +++ b/hosts/europa/hardware-configuration.nix @@ -28,7 +28,6 @@ hardware = { cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - acpilight.enable = true; video.hidpi.enable = lib.mkDefault true; bluetooth.enable = true; };