From efb34826fc563afa08c0c8c6add16cf9ebf19310 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Sat, 18 May 2024 20:43:28 +0200 Subject: remove old files --- system/autorandr/docked-close/block | 3 - system/autorandr/docked-close/config | 23 -------- system/autorandr/docked-close/setup | 3 - system/autorandr/docked-open/block | 3 - system/autorandr/docked-open/config | 25 -------- system/autorandr/docked-open/setup | 3 - system/autorandr/laptop/config | 19 ------- system/autorandr/laptop/setup | 1 - system/autorandr/postswitch | 2 - system/autorandr/work-1/config | 21 ------- system/autorandr/work-1/setup | 2 - system/settings/configuration/networking.nix | 11 ---- system/settings/hardware/intel-gpu.nix | 18 ------ system/settings/hardware/laptop.nix | 79 -------------------------- system/settings/hardware/network-manager.nix | 16 ------ system/settings/hardware/personal-computer.nix | 8 --- system/settings/hardware/thinkpad.nix | 23 -------- system/settings/hardware/trackball.nix | 15 ----- system/settings/machines/t470s.nix | 57 ------------------- system/settings/programs/barrier.nix | 10 ---- system/settings/programs/gnome.nix | 26 --------- system/settings/programs/tor.nix | 27 --------- system/settings/programs/window-manager.nix | 57 ------------------- system/settings/programs/xfce.nix | 8 --- 24 files changed, 460 deletions(-) delete mode 100755 system/autorandr/docked-close/block delete mode 100644 system/autorandr/docked-close/config delete mode 100644 system/autorandr/docked-close/setup delete mode 100755 system/autorandr/docked-open/block delete mode 100644 system/autorandr/docked-open/config delete mode 100644 system/autorandr/docked-open/setup delete mode 100644 system/autorandr/laptop/config delete mode 100644 system/autorandr/laptop/setup delete mode 100755 system/autorandr/postswitch delete mode 100644 system/autorandr/work-1/config delete mode 100644 system/autorandr/work-1/setup delete mode 100644 system/settings/configuration/networking.nix delete mode 100644 system/settings/hardware/intel-gpu.nix delete mode 100644 system/settings/hardware/laptop.nix delete mode 100644 system/settings/hardware/network-manager.nix delete mode 100644 system/settings/hardware/personal-computer.nix delete mode 100644 system/settings/hardware/thinkpad.nix delete mode 100644 system/settings/hardware/trackball.nix delete mode 100644 system/settings/machines/t470s.nix delete mode 100644 system/settings/programs/barrier.nix delete mode 100644 system/settings/programs/gnome.nix delete mode 100644 system/settings/programs/tor.nix delete mode 100644 system/settings/programs/window-manager.nix delete mode 100644 system/settings/programs/xfce.nix diff --git a/system/autorandr/docked-close/block b/system/autorandr/docked-close/block deleted file mode 100755 index 782c3a74..00000000 --- a/system/autorandr/docked-close/block +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec grep -vq close /proc/acpi/button/lid/LID/state \ No newline at end of file diff --git a/system/autorandr/docked-close/config b/system/autorandr/docked-close/config deleted file mode 100644 index d8ce5031..00000000 --- a/system/autorandr/docked-close/config +++ /dev/null @@ -1,23 +0,0 @@ -output DP1 -off -output DP2 -off -output DP2-3 -off -output HDMI1 -off -output HDMI2 -off -output VIRTUAL1 -off -output eDP1 -off -output DP2-1 -mode 2560x1440 -pos 0x0 -primary -rate 59.95 -output DP2-2 -mode 2560x1440 -pos 2560x0 -rate 59.95 diff --git a/system/autorandr/docked-close/setup b/system/autorandr/docked-close/setup deleted file mode 100644 index 607eacbc..00000000 --- a/system/autorandr/docked-close/setup +++ /dev/null @@ -1,3 +0,0 @@ -DP2-1 00ffffffffffff0030aeaf61010101011c1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20010d02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd -DP2-2 00ffffffffffff0030aeaf61010101010a1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20011f02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd -eDP1 00ffffffffffff0006af3d2400000000001a0104951f117802a2b591575894281c505400000001010101010101010101010101010101843a8034713828403064310035ad10000018d02e8034713828403064310035ad10000018000000fe0041554f0a202020202020202020000000fe004231343048414e30322e34200a00e4 diff --git a/system/autorandr/docked-open/block b/system/autorandr/docked-open/block deleted file mode 100755 index 4c82692a..00000000 --- a/system/autorandr/docked-open/block +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -exec grep -vq open /proc/acpi/button/lid/LID/state \ No newline at end of file diff --git a/system/autorandr/docked-open/config b/system/autorandr/docked-open/config deleted file mode 100644 index 231a3942..00000000 --- a/system/autorandr/docked-open/config +++ /dev/null @@ -1,25 +0,0 @@ -output DP1 -off -output DP2 -off -output DP2-3 -off -output HDMI1 -off -output HDMI2 -off -output VIRTUAL1 -off -output eDP1 -mode 1920x1080 -pos 1600x1440 -rate 60.03 -output DP2-1 -mode 2560x1440 -pos 0x0 -primary -rate 59.95 -output DP2-2 -mode 2560x1440 -pos 2560x0 -rate 59.95 diff --git a/system/autorandr/docked-open/setup b/system/autorandr/docked-open/setup deleted file mode 100644 index 607eacbc..00000000 --- a/system/autorandr/docked-open/setup +++ /dev/null @@ -1,3 +0,0 @@ -DP2-1 00ffffffffffff0030aeaf61010101011c1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20010d02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd -DP2-2 00ffffffffffff0030aeaf61010101010a1c0104a53c22783e9325a9544d9e250c5054a1080081809500b300d1c0d100a9c001010101565e00a0a0a029503020350055502100001a023a801871382d40582c450055502100001e000000fd00324c1e7822000a202020202020000000fc004c454e20503237682d31300a20011f02031df14a01020304051413901f12230907078301000065030c001000011d007251d01e206e28550055502100001e8c0ad08a20e02d10103e96005550210000180000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000bd -eDP1 00ffffffffffff0006af3d2400000000001a0104951f117802a2b591575894281c505400000001010101010101010101010101010101843a8034713828403064310035ad10000018d02e8034713828403064310035ad10000018000000fe0041554f0a202020202020202020000000fe004231343048414e30322e34200a00e4 diff --git a/system/autorandr/laptop/config b/system/autorandr/laptop/config deleted file mode 100644 index 94f4e43d..00000000 --- a/system/autorandr/laptop/config +++ /dev/null @@ -1,19 +0,0 @@ -output DP1 -off -output HDMI1 -off -output DP2 -off -output HDMI2 -off -output DP2-1 -off -output DP2-2 -off -output DP2-3 -off -output eDP1 -mode 1920x1080 -pos 0x0 -primary -rate 60.03 diff --git a/system/autorandr/laptop/setup b/system/autorandr/laptop/setup deleted file mode 100644 index dc17ff13..00000000 --- a/system/autorandr/laptop/setup +++ /dev/null @@ -1 +0,0 @@ -eDP1 00ffffffffffff0006af3d2400000000001a0104951f117802a2b591575894281c505400000001010101010101010101010101010101843a8034713828403064310035ad10000018d02e8034713828403064310035ad10000018000000fe0041554f0a202020202020202020000000fe004231343048414e30322e34200a00e4 diff --git a/system/autorandr/postswitch b/system/autorandr/postswitch deleted file mode 100755 index 25b068d2..00000000 --- a/system/autorandr/postswitch +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -notify-send --expire-time=5000 "Display profile: '$AUTORANDR_CURRENT_PROFILE'" diff --git a/system/autorandr/work-1/config b/system/autorandr/work-1/config deleted file mode 100644 index 34fda0db..00000000 --- a/system/autorandr/work-1/config +++ /dev/null @@ -1,21 +0,0 @@ -output DP1 -off -output HDMI1 -off -output DP2 -off -output HDMI2 -mode 1920x1200 -pos 0x0 -primary -rate 59.95 -output DP2-1 -off -output DP2-2 -off -output DP2-3 -off -output eDP1 -mode 1920x1080 -pos 1920x0 -rate 60.03 diff --git a/system/autorandr/work-1/setup b/system/autorandr/work-1/setup deleted file mode 100644 index 12a4c698..00000000 --- a/system/autorandr/work-1/setup +++ /dev/null @@ -1,2 +0,0 @@ -HDMI2 00ffffffffffff0015c33425b1a21403041b010380342178ea0495a9554d9d26105054a10800a9408180b300a9c081c0810001010101283c80a070b023403020360007442100001a023a801871382d40582c450007442100001e000000fd00313d0f4c11000a202020202020000000fc004556323435350a202020202020011e020325f14e901f051404130312021107160615230907078301000066030c00100080e2007b011d8018711c1620582c250007442100009e011d80d0721c1620102c258007442100009e8c0ad08a20e02d10103e96000744210000188c0ad090204031200c4055000744210000180000000000000000000000000000000000008e -eDP1 00ffffffffffff0006af3d2400000000001a0104951f117802a2b591575894281c505400000001010101010101010101010101010101843a8034713828403064310035ad10000018d02e8034713828403064310035ad10000018000000fe0041554f0a202020202020202020000000fe004231343048414e30322e34200a00e4 diff --git a/system/settings/configuration/networking.nix b/system/settings/configuration/networking.nix deleted file mode 100644 index ad4200b1..00000000 --- a/system/settings/configuration/networking.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ config -, pkgs -, ... -}: { - environment.systemPackages = with pkgs; [ lxqt.lxqt-policykit ]; # provides a default authentification client for policykit - services.gvfs.enable = true; # enables gvfs - - imports = [ - ../services/zeroconf.nix - ]; -} diff --git a/system/settings/hardware/intel-gpu.nix b/system/settings/hardware/intel-gpu.nix deleted file mode 100644 index 494cb86e..00000000 --- a/system/settings/hardware/intel-gpu.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ config -, pkgs -, ... -}: { - # https://wiki.gentoo.org/wiki/Intel#Feature_support - services.xserver = { - useGlamor = true; - deviceSection = '' - Option "DRI" "3" - ''; - videoDrivers = [ "intel" ]; - }; - - boot.kernelParams = [ - "i915.enable_guc=2" - "i915.fastboot=1" - ]; -} diff --git a/system/settings/hardware/laptop.nix b/system/settings/hardware/laptop.nix deleted file mode 100644 index bd66fb8f..00000000 --- a/system/settings/hardware/laptop.nix +++ /dev/null @@ -1,79 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: { - imports = [ - ./bluetooth.nix - ./bluetooth-audio.nix - ./connman.nix - ./iwd.nix - ./personal-computer.nix - ../user-interface.nix - ]; - - boot.kernelModules = [ "coretemp" ]; - - environment.systemPackages = with pkgs; [ - powerstat - powertop - - arandr - autorandr - ]; - - programs.light.enable = true; - - services.autorandr = { - enable = true; - defaultTarget = "common"; - }; - systemd.services.autorandr.wantedBy = [ "graphical.target" ]; - - environment.etc.autorandr = { - enable = true; - source = ../../autorandr; - target = "xdg/autorandr"; - }; - - services.logind = { - lidSwitch = "suspend"; - lidSwitchExternalPower = "ignore"; - extraConfig = '' - IdleAction=suspend - IdleActionSec=600 - ''; - }; - - services.acpid = { - enable = true; - lidEventCommands = '' - ${pkgs.autorandr}/bin/autorandr --batch --change - ''; - }; - - services.tlp = { - extraConfig = '' - CPU_SCALING_GOVERNOR_ON_BAT=powersave - ENERGY_PERF_POLICY_ON_BAT="balance_power" - - SOUND_POWER_SAVE_ON_AC=60 - DEVICES_TO_DISABLE_ON_BAT_NOT_IN_USE="bluetooth wwan" - ''; - }; - - services.xserver = { - libinput = { - enable = lib.mkDefault true; - naturalScrolling = true; - disableWhileTyping = true; - }; - displayManager.sessionCommands = '' - ${pkgs.autorandr}/bin/autorandr --change --force - ''; - }; - - systemd.services.nixos-upgrade.unitConfig.ConditionACPower = true; - systemd.services.nix-gc.unitConfig.ConditionACPower = true; - systemd.services.docker-prune.unitConfig.ConditionACPower = true; -} diff --git a/system/settings/hardware/network-manager.nix b/system/settings/hardware/network-manager.nix deleted file mode 100644 index a27ca892..00000000 --- a/system/settings/hardware/network-manager.nix +++ /dev/null @@ -1,16 +0,0 @@ -{ config -, lib -, pkgs -, ... -}: { - networking = { - networkmanager = { - enable = true; - }; - }; - - environment.systemPackages = with pkgs; [ - networkmanagerapplet - networkmanager_dmenu - ]; -} diff --git a/system/settings/hardware/personal-computer.nix b/system/settings/hardware/personal-computer.nix deleted file mode 100644 index 35824136..00000000 --- a/system/settings/hardware/personal-computer.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: { - boot.kernelPackages = lib.mkDefault pkgs.linuxPackages_zen; - powerManagement.cpuFreqGovernor = "schedutil"; -} diff --git a/system/settings/hardware/thinkpad.nix b/system/settings/hardware/thinkpad.nix deleted file mode 100644 index 649f626a..00000000 --- a/system/settings/hardware/thinkpad.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ config -, pkgs -, ... -}: { - boot.kernelModules = [ ]; - boot.blacklistedKernelModules = [ "thinkpad_ec" ]; - boot.extraModulePackages = with config.boot.kernelPackages; [ - acpi_call - ]; - - services.fwupd = { - enable = true; - }; - - services.thinkfan = { - enable = true; - }; - - imports = [ - ./bare-metal.nix - ./laptop.nix - ]; -} diff --git a/system/settings/hardware/trackball.nix b/system/settings/hardware/trackball.nix deleted file mode 100644 index c2f7e68c..00000000 --- a/system/settings/hardware/trackball.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ config -, pkgs -, ... -}: { - services.xserver.config = '' - Section "InputClass" - Identifier "Trackball (No Acceleration)" - MatchIsPointer "yes" - MatchIsTouchpad "no" - MatchProduct "Trackball" - Option "AccelerationProfile" "-1" - Option "AccelerationScheme" "none" - EndSection - ''; -} diff --git a/system/settings/machines/t470s.nix b/system/settings/machines/t470s.nix deleted file mode 100644 index 5f1f4a1c..00000000 --- a/system/settings/machines/t470s.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config -, pkgs -, ... -}: { - hardware.usbWwan.enable = false; # unused - systemd.services.ModemManager.enable = false; - - hardware.enableRedistributableFirmware = true; - - boot.extraModprobeConfig = '' - options thinkpad_acpi fan_control=1 - ''; - - services.thinkfan.sensors = '' - hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp3_input - hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp1_input - hwmon /sys/devices/platform/coretemp.0/hwmon/hwmon0/temp2_input - ''; - services.thinkfan.levels = '' - (0, 0, 48) - (1, 45, 52) - (2, 50, 57) - (3, 55, 63) - (6, 60, 65) - (7, 60, 85) - (127, 80, 32767) - ''; - - boot.postBootCommands = '' - echo bfq > /sys/block/nvme0n1/queue/scheduler - ''; - - hardware.pulseaudio.extraConfig = '' - load-module module-alsa-sink device=hw:0,7 - ''; - - services.tlp.extraConfig = '' - DISK_DEVICES="nvme0n1" - DISK_IOSCHED="keep" - ''; - - services.xserver = { - dpi = 109; - monitorSection = '' - DisplaySize 310 176 - ''; - }; - - environment.systemPackages = with pkgs; [ - nvme-cli - ]; - - imports = [ - ../hardware/intel-gpu.nix - ../hardware/thinkpad.nix - ]; -} diff --git a/system/settings/programs/barrier.nix b/system/settings/programs/barrier.nix deleted file mode 100644 index 76e1b06b..00000000 --- a/system/settings/programs/barrier.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ config -, pkgs -, ... -}: { - environment.systemPackages = with pkgs; [ - barrier - ]; - - networking.firewall.allowedTCPPorts = [ 24800 ]; -} diff --git a/system/settings/programs/gnome.nix b/system/settings/programs/gnome.nix deleted file mode 100644 index f9618009..00000000 --- a/system/settings/programs/gnome.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ config -, lib -, pkgs -, ... -}: -with lib; { - services = { - gnome3 = { - gnome-documents.enable = false; - gnome-user-share.enable = false; - gnome-online-accounts.enable = false; - tracker.enable = false; - }; - telepathy.enable = false; - - xserver = { - desktopManager.gnome3 = { - enable = true; - extraGSettingsOverrides = '' - [org.gnome.desktop.input-sources] - sources=[('xkb','${config.services.xserver.layout + (optionalString (config.services.xserver.xkbVariant != "") ("+" + config.services.xserver.xkbVariant))}')] - ''; - }; - }; - }; -} diff --git a/system/settings/programs/tor.nix b/system/settings/programs/tor.nix deleted file mode 100644 index 31521857..00000000 --- a/system/settings/programs/tor.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: { - services.tor = { - enable = true; - client = { - enable = true; - socksListenAddress = { - IPv6Traffic = true; - port = 9050; - }; - }; - torsocks = { - enable = true; - }; - }; - systemd.services.tor.wantedBy = lib.mkForce [ ]; - systemd.timers.tor = { - description = "Delayed startup of Tor"; - wantedBy = [ "timers.target" ]; - timerConfig = { - OnActiveSec = "1 min"; - }; - }; -} diff --git a/system/settings/programs/window-manager.nix b/system/settings/programs/window-manager.nix deleted file mode 100644 index bbe4c638..00000000 --- a/system/settings/programs/window-manager.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ config -, pkgs -, lib -, ... -}: { - services.xserver = { - desktopManager.xterm.enable = false; - - displayManager = { - autoLogin = { - user = "alan"; - enable = false; - }; - lightdm = { - enable = true; - greeter.enable = true; - greeters.mini = { - enable = false; - user = "alan"; - }; - }; - sessionCommands = '' - ${pkgs.xorg.xrdb}/bin/xrdb -merge $HOME/.xresources/main - ${pkgs.xorg.xsetroot}/bin/xsetroot -cursor_name left_ptr -solid '#4d4d4c' - '' ++ (lib.optionalString config.networking.networkmanager.enable '' - ${pkgs.networkmanagerapplet}/bin/nm-applet & - ''); - }; - xautolock = { - enable = true; - locker = "${pkgs.i3lock}/bin/i3lock -n"; - enableNotifier = true; - notifier = "${pkgs.libnotify}/bin/notify-send \"Locking in 10 seconds\""; - time = 5; - }; - }; - - services.xserver.displayManager.setupCommands = '' - ${pkgs.redshift}/bin/redshift \ - -l ${toString config.location.latitude}:${toString config.location.longitude} \ - -t ${toString config.services.redshift.temperature.day}:${toString config.services.redshift.temperature.night} \ - -b 1:1 \ - -o \ - -r - ''; - - environment.systemPackages = with pkgs; [ - dmenu - libnotify # for notify-send - xterm - rofi - sxhkd - maim - - perlPackages.FileMimeInfo # xdg-utils uses this when no DE - ]; -} diff --git a/system/settings/programs/xfce.nix b/system/settings/programs/xfce.nix deleted file mode 100644 index a896810a..00000000 --- a/system/settings/programs/xfce.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: { - services.xserver.desktopManager.xfce = { - enable = true; - }; - environment.systemPackages = with pkgs; [ - xfce.xfce4-panel-profiles - ]; -} -- cgit 1.4.1