ma x.r: cleanup input

This commit is contained in:
makefu 2021-03-12 20:12:56 +01:00
parent f20695084e
commit e377be755f
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
3 changed files with 38 additions and 20 deletions

View File

@ -158,7 +158,8 @@
# temporary # temporary
# { services.redis.enable = true; } # { services.redis.enable = true; }
# <stockholm/makefu/2configs/pyload.nix> { services.mongodb.enable = true; }
# <stockholm/makefu/2configs/home/photoprism.nix>
# <stockholm/makefu/2configs/dcpp/airdcpp.nix> # <stockholm/makefu/2configs/dcpp/airdcpp.nix>
# <stockholm/makefu/2configs/nginx/rompr.nix> # <stockholm/makefu/2configs/nginx/rompr.nix>
# <stockholm/makefu/2configs/lanparty/lancache.nix> # <stockholm/makefu/2configs/lanparty/lancache.nix>

View File

@ -8,6 +8,7 @@
<nixos-hardware/lenovo/thinkpad/l14/amd> # close enough <nixos-hardware/lenovo/thinkpad/l14/amd> # close enough
# <stockholm/makefu/2configs/hw/tpm.nix> # <stockholm/makefu/2configs/hw/tpm.nix>
<stockholm/makefu/2configs/hw/ssd.nix> <stockholm/makefu/2configs/hw/ssd.nix>
<stockholm/makefu/2configs/hw/xmm7360.nix>
]; ];
boot.zfs.requestEncryptionCredentials = true; boot.zfs.requestEncryptionCredentials = true;
networking.hostId = "f8b8e0a2"; networking.hostId = "f8b8e0a2";
@ -19,32 +20,15 @@
services.xserver.videoDrivers = [ services.xserver.videoDrivers = [
"amdgpu" "amdgpu"
]; ];
hardware.opengl.extraPackages = [ pkgs.amdvlk ]; hardware.opengl.extraPackages = [ pkgs.amdvlk pkgs.rocm-opencl-icd ];
# is required for amd graphics support ( xorg wont boot otherwise ) # is required for amd graphics support ( xorg wont boot otherwise )
boot.kernelPackages = pkgs.linuxPackages_latest; boot.kernelPackages = pkgs.linuxPackages_latest;
environment.variables.VK_ICD_FILENAMES = environment.variables.VK_ICD_FILENAMES =
"/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json"; "/run/opengl-driver/share/vulkan/icd.d/amd_icd64.json";
programs.light.enable = true; programs.light.enable = true;
services.actkbd = {
enable = true;
bindings = [
{ keys = [ 225 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -A 10"; }
{ keys = [ 224 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -U 10"; }
{ keys = [ 227 ]; events = [ "key" ]; command = builtins.toString (
pkgs.writers.writeDash "toggle_lcdshadow" ''
proc=/proc/acpi/ibm/lcdshadow
status=$(${pkgs.gawk}/bin/awk '/status:/{print $2}' "$proc")
if [ "$status" -eq 0 ];then
echo 1 > "$proc"
else
echo 0 > "$proc"
fi
'');
}
];
};
users.groups.video = {}; users.groups.video = {};
users.users.makefu.extraGroups = [ "video" ]; users.users.makefu.extraGroups = [ "video" ];

View File

@ -1,3 +1,4 @@
{ pkgs, lib, ... }:
{ {
# current issues: # current issues:
# 1. for pressing insert hold shift+fn+Fin # 1. for pressing insert hold shift+fn+Fin
@ -9,5 +10,37 @@
xinput set-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5 xinput set-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Axes" 6 7 4 5
# configure timeout of pressing and holding middle button # configure timeout of pressing and holding middle button
# xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Timeout" 8 200 # xinput set-int-prop "ETPS/2 Elantech TrackPoint" "Evdev Wheel Emulation Timeout" 8 200
xinput disable 'ETPS/2 Elantech Touchpad'
''; '';
boot.kernelParams = [
#"psmouse.proto=imps"
#"psmouse.proto=bare"
#"psmouse.resetafter=0"
"psmouse.synaptics_intertouch=1" # echo 1 > /sys/devices/platform/i8042/serio1/reg_07
];
programs.light.enable = true;
services.actkbd = {
enable = true;
bindings = [
{ keys = [ 225 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -A 10"; } # fn - F5
{ keys = [ 224 ]; events = [ "key" ]; command = "${pkgs.light}/bin/light -U 10"; } # fn - F6
# fn - 4 => suspend
# fn - d => lcdshadow
{ keys = [ 227 ]; events = [ "key" ]; command = builtins.toString ( # fn - F7
pkgs.writers.writeDash "toggle_touchpad" ''
PATH=${lib.makeBinPath [ pkgs.xorg.xinput pkgs.gnugrep ]}
DISPLAY=:0
export DISPLAY PATH
device=$(xinput list --name-only | grep Touchpad)
if [ "$(xinput list-props "$device" | grep -P ".*Device Enabled.*\K.(?=$)" -o)" -eq 1 ];then
xinput disable "$device"
else
xinput enable "$device"
fi
'');
}
];
};
} }