From e7ee14c9b2d22379e43e3ab781b8fd9f519dcd16 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Wed, 16 Oct 2019 19:43:36 +0200 Subject: Remove configuration for marvin --- system/marvin.nix | 33 --------------------------------- system/settings/hardware/synaptics.nix | 27 --------------------------- system/settings/machines/x250.nix | 33 --------------------------------- 3 files changed, 93 deletions(-) delete mode 100644 system/marvin.nix delete mode 100644 system/settings/hardware/synaptics.nix delete mode 100644 system/settings/machines/x250.nix (limited to 'system') diff --git a/system/marvin.nix b/system/marvin.nix deleted file mode 100644 index 59b90e9b..00000000 --- a/system/marvin.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, pkgs, ... }: - -{ imports = [ - ./hardware-configuration.nix - - ./settings/base.nix - ./settings/configuration/berlin.nix - ./settings/configuration/british-english.nix - ./settings/configuration/nix.nix - ./settings/configuration/user.nix - ./settings/hardware/adb.nix - ./settings/hardware/audio.nix - ./settings/hardware/qwerty.nix - ./settings/hardware/network-manager.nix - ./settings/hardware/nitrokey.nix - ./settings/hardware/systemd-boot.nix - ./settings/hardware/trackball.nix - ./settings/hardware/trezor.nix - ./settings/machines/x250.nix - ./settings/programs/accounting.nix - ./settings/programs/i3.nix - ./settings/programs/infrastructure.nix - ./settings/programs/shell.nix - ./settings/services/syncthing.nix - ]; - - networking = { - hostName = "marvin"; - domain = "alanpearce.eu"; - }; - - system.stateVersion = "18.09"; -} diff --git a/system/settings/hardware/synaptics.nix b/system/settings/hardware/synaptics.nix deleted file mode 100644 index 9f075cce..00000000 --- a/system/settings/hardware/synaptics.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config, pkgs, ... }: - -{ services.xserver = { - libinput.enable = false; - synaptics = { - enable = true; - - accelFactor = "0.04"; - - minSpeed = "0.3"; - maxSpeed = "0.6"; - - palmDetect = true; - palmMinWidth = 5; - palmMinZ = 20; - - twoFingerScroll = true; - vertTwoFingerScroll = true; - horizTwoFingerScroll = true; - additionalOptions = '' - Option "RBCornerButton" "3" - Option "VertScrollDelta" "-111" - Option "HorizScrollDelta" "-111" - ''; - }; - }; -} diff --git a/system/settings/machines/x250.nix b/system/settings/machines/x250.nix deleted file mode 100644 index 0e8ac04e..00000000 --- a/system/settings/machines/x250.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ config, pkgs, ... }: - -{ boot.extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; - - hardware.firmware = with pkgs; [ - firmwareLinuxNonfree - ]; - - services.tlp.extraConfig = '' - # Newer Thinkpads have a battery firmware - # it conflicts with TLP if stop thresholds are set - START_CHARGE_THRESH_BAT0=70 - # STOP_CHARGE_THRESH_BAT0=80 - START_CHARGE_THRESH_BAT1=70 - # STOP_CHARGE_THRESH_BAT1=80 - - DISK_APM_LEVEL_ON_AC="254 254" - DISK_APM_LEVEL_ON_BAT="128 128" - - # One or both of these lines stops disk corruption - # when re-attaching to AC whilst on. - SATA_LINKPWR_ON_BAT=medium_power - SATA_LINKPWR_BLACKLIST="host1" - ''; - - imports = [ - ../hardware/synaptics.nix - ../hardware/intel-gpu.nix - ../hardware/thinkpad.nix - ]; -} -- cgit 1.4.1