stroopwafel: fix screens, inputs, and nm persistence

This commit is contained in:
Benjamin Bädorf 2024-02-02 10:00:51 +01:00
parent ce1e00d5b0
commit f92644693a
No known key found for this signature in database
GPG key ID: 1B7BF5B77A521346
5 changed files with 11 additions and 22 deletions

View file

@ -1,4 +1,4 @@
input "1739:0:Synaptics_TM3288-011" { input "2362:597:PNP0C50:00_093A:0255_Touchpad" {
dwt enabled dwt enabled
tap enabled tap enabled
middle_emulation enabled middle_emulation enabled

View file

@ -3,18 +3,5 @@ set $middle "Hewlett Packard HP E231 3CQ4290S5J"
set $standup "Hewlett Packard HP E231 3CQ4251F33" set $standup "Hewlett Packard HP E231 3CQ4251F33"
output $internal { output $internal {
scale 1 scale 2
pos 1080 1080
}
output $middle {
scale 1
pos 1080 0
}
output $standup {
scale 1
transform 90
pos 0 0
} }

View file

@ -17,7 +17,7 @@ in {
boot.initrd.preLVMCommands = "udevadm trigger --settle"; boot.initrd.preLVMCommands = "udevadm trigger --settle";
boot.swraid.enable = true; boot.swraid.enable = true;
boot.swraid.mdadmConf = '' boot.swraid.mdadmConf = ''
DEVICE /dev/nvme0n1p2 /dev/nvme1n1p2 DEVICE /dev/nvme0n1p2 /dev/nvme1n1p2
ARRAY /dev/md/nixos:root metadata=1.2 name=nixos:root UUID=67d1aa81:1b348887:c17a75e8:f2edf2bd ARRAY /dev/md/nixos:root metadata=1.2 name=nixos:root UUID=67d1aa81:1b348887:c17a75e8:f2edf2bd
''; '';

View file

@ -28,6 +28,8 @@
fileSystems."/home" = fileSystems."/home" =
{ device = "/dev/disk/by-uuid/0cc568f0-402d-4535-980a-ed3a1dc697b9"; { device = "/dev/disk/by-uuid/0cc568f0-402d-4535-980a-ed3a1dc697b9";
fsType = "ext4"; fsType = "ext4";
# https://github.com/ryantm/agenix/issues/45#issuecomment-957865406
neededForBoot = true;
}; };
fileSystems."/nix" = fileSystems."/nix" =
@ -38,6 +40,8 @@
fileSystems."/persist" = fileSystems."/persist" =
{ device = "/dev/disk/by-uuid/a0855aaa-76bf-445e-b0d1-ab1552e5496f"; { device = "/dev/disk/by-uuid/a0855aaa-76bf-445e-b0d1-ab1552e5496f";
fsType = "ext4"; fsType = "ext4";
# https://github.com/ryantm/agenix/issues/45#issuecomment-957865406
neededForBoot = true;
}; };
swapDevices = swapDevices =
@ -54,4 +58,5 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
} }

View file

@ -1,7 +1,7 @@
{ lib, config, ... }: { lib, config, ... }:
{ {
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"L /home/${config.pub-solar.user.name}/Workspace/os - - - - /etc/nixos" "L /etc/nixos - - - - /home/${config.pub-solar.user.name}/Workspace/os"
"L /var/lib/bluetooth - - - - /persist/var/lib/bluetooth" "L /var/lib/bluetooth - - - - /persist/var/lib/bluetooth"
"d /persist/var/lib/bluetooth 0500 root root" "d /persist/var/lib/bluetooth 0500 root root"
@ -9,15 +9,12 @@
"L /var/lib/docker - - - - /persist/var/lib/docker" "L /var/lib/docker - - - - /persist/var/lib/docker"
"d /persist/var/lib/docker 0510 root root" "d /persist/var/lib/docker 0510 root root"
"d /persist/etc/NetworkManager/system-connections 0500 root root" "L /etc/NetworkManager/system-connections - - - - /persist/etc/NetworkManager/system-connections"
"d /persist/etc/NetworkManager/system-connections 0700 root root"
"d /persist/etc/ssh 0400 root root" "d /persist/etc/ssh 0400 root root"
]; ];
environment.etc."NetworkManager/system-connections" = {
source = "/persist/etc/NetworkManager/system-connections/";
};
services.openssh = { services.openssh = {
enable = true; enable = true;
hostKeys = [ hostKeys = [