fix: missing settings from nixpkgs update

This commit is contained in:
Leon Schwarzäugl 2025-02-25 22:45:41 +01:00
parent 4cef1b2727
commit 8006a0abf2
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
6 changed files with 17 additions and 4 deletions

View file

@ -1032,6 +1032,7 @@ My work machine. Built for more security, this is the gold standard of my config
tap = "enabled"; tap = "enabled";
natural_scroll = "enabled"; natural_scroll = "enabled";
middle_emulation = "enabled"; middle_emulation = "enabled";
drag_lock = "disabled";
}; };
"1133:50504:Logitech_USB_Receiver" = { "1133:50504:Logitech_USB_Receiver" = {
xkb_layout = "us"; xkb_layout = "us";
@ -1238,7 +1239,6 @@ This is my main server that I run at home. It handles most tasks that require bi
firewall.allowedTCPPorts = [ 80 443 ]; firewall.allowedTCPPorts = [ 80 443 ];
}; };
swarselsystems = { swarselsystems = {
hasBluetooth = false; hasBluetooth = false;
hasFingerprint = false; hasFingerprint = false;
@ -3949,7 +3949,11 @@ This holds modules that are to be used on most hosts. These are also the most im
:CUSTOM_ID: h:ec08cd7e-4a9a-419f-a0a7-6cc4576302a1 :CUSTOM_ID: h:ec08cd7e-4a9a-419f-a0a7-6cc4576302a1
:END: :END:
Laptops are not always plugged in, so they should show a battery icon in Waybar. Also, most laptops have a touchpad which usually needs to be configured. Laptops are not always plugged in, so they should show a battery icon in Waybar. Also, most laptops have a touchpad which usually needs to be configured:
- Tapping should be enabled.
- The touchpad should be disabled while typing (=dwt= option).
- Natural scrolling should be enabled.
- Tag-and-drag lock should be disbled - it gets in my way too much.
#+begin_src nix :tangle modules/home/laptop.nix #+begin_src nix :tangle modules/home/laptop.nix
{ lib, config, ... }: { lib, config, ... }:
@ -3961,6 +3965,7 @@ Laptops are not always plugged in, so they should show a battery icon in Waybar.
tap = "enabled"; tap = "enabled";
natural_scroll = "enabled"; natural_scroll = "enabled";
middle_emulation = "enabled"; middle_emulation = "enabled";
drag_lock = "disabled";
}; };
}; };
config.swarselsystems.waybarModules = lib.mkIf config.swarselsystems.isLaptop [ config.swarselsystems.waybarModules = lib.mkIf config.swarselsystems.isLaptop [
@ -6245,6 +6250,8 @@ Here we just define some aliases for rebuilding the system, and we allow some in
"aspnetcore-runtime-6.0.36" "aspnetcore-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428" "dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428" "dotnet-sdk-6.0.428"
#
"SDL_ttf-2.0.11"
]; ];
} }
@ -7104,6 +7111,7 @@ Here we just define some aliases for rebuilding the system, and we allow some in
config = { config = {
adminuser = "admin"; adminuser = "admin";
adminpassFile = config.sops.secrets.nextcloudadminpass.path; adminpassFile = config.sops.secrets.nextcloudadminpass.path;
dbtype = "sqlite";
}; };
}; };
@ -8478,7 +8486,7 @@ This holds packages that I can use as provided, or with small modifications (as
spotify-player spotify-player
element-desktop element-desktop
nicotine-plus nicotine-plus
stable.transmission stable.transmission_3
mktorrent mktorrent
hexchat hexchat
hugo hugo

View file

@ -190,6 +190,7 @@ in
tap = "enabled"; tap = "enabled";
natural_scroll = "enabled"; natural_scroll = "enabled";
middle_emulation = "enabled"; middle_emulation = "enabled";
drag_lock = "disabled";
}; };
"1133:50504:Logitech_USB_Receiver" = { "1133:50504:Logitech_USB_Receiver" = {
xkb_layout = "us"; xkb_layout = "us";

View file

@ -7,6 +7,7 @@
tap = "enabled"; tap = "enabled";
natural_scroll = "enabled"; natural_scroll = "enabled";
middle_emulation = "enabled"; middle_emulation = "enabled";
drag_lock = "disabled";
}; };
}; };
config.swarselsystems.waybarModules = lib.mkIf config.swarselsystems.isLaptop [ config.swarselsystems.waybarModules = lib.mkIf config.swarselsystems.isLaptop [

View file

@ -73,7 +73,7 @@
spotify-player spotify-player
element-desktop element-desktop
nicotine-plus nicotine-plus
stable.transmission stable.transmission_3
mktorrent mktorrent
hexchat hexchat
hugo hugo

View file

@ -23,6 +23,7 @@
config = { config = {
adminuser = "admin"; adminuser = "admin";
adminpassFile = config.sops.secrets.nextcloudadminpass.path; adminpassFile = config.sops.secrets.nextcloudadminpass.path;
dbtype = "sqlite";
}; };
}; };

View file

@ -18,6 +18,8 @@
"aspnetcore-runtime-6.0.36" "aspnetcore-runtime-6.0.36"
"dotnet-sdk-wrapped-6.0.428" "dotnet-sdk-wrapped-6.0.428"
"dotnet-sdk-6.0.428" "dotnet-sdk-6.0.428"
#
"SDL_ttf-2.0.11"
]; ];
} }