Compare commits

...

4 Commits

Author SHA1 Message Date
Noah Masur
494cf355e9 try to enable hw accel for mpv and firefox 2023-06-05 23:50:32 -04:00
Noah Masur
c88718b649 add protonup-qt for downloading proton versions 2023-06-05 23:50:17 -04:00
Noah Masur
790cb4a9d0 use keyd instead of xkb for key remap 2023-06-05 23:50:01 -04:00
Noah Masur
e3d4b36613 decouple wireguard and transmission 2023-06-05 23:49:41 -04:00
5 changed files with 19 additions and 8 deletions

View File

@ -71,6 +71,8 @@
"layout.css.color-mix.enabled" = true; "layout.css.color-mix.enabled" = true;
"ui.systemUsesDarkTheme" = "ui.systemUsesDarkTheme" =
if config.theme.dark == true then 1 else 0; if config.theme.dark == true then 1 else 0;
"media.ffmpeg.vaapi.enabled" =
true; # Enable hardware video acceleration
}; };
userChrome = '' userChrome = ''
:root { :root {

View File

@ -21,7 +21,10 @@
programs.mpv = { programs.mpv = {
enable = true; enable = true;
bindings = { }; bindings = { };
config = { image-display-duration = 2; }; config = {
image-display-duration = 2;
hwdec = "auto-safe";
};
scripts = [ scripts = [
# Automatically load playlist entries before and after current file # Automatically load playlist entries before and after current file

View File

@ -17,6 +17,9 @@
steamPackages.steamcmd steamPackages.steamcmd
steam-tui steam-tui
# Allow downloading of GE-Proton and other versions
protonup-qt
]; ];
}; };

View File

@ -10,9 +10,12 @@
autoRepeatDelay = 250; autoRepeatDelay = 250;
autoRepeatInterval = 40; autoRepeatInterval = 40;
# Swap escape key with caps lock key };
xkbOptions = "eurosign:e,caps:swapescape";
# Use capslock as escape and/or control
services.keyd = {
enable = true;
settings = { main = { capslock = "overload(control, esc)"; }; };
}; };
# Enable num lock on login # Enable num lock on login

View File

@ -2,7 +2,7 @@
options = { options = {
transmissionServer = lib.mkOption { transmissionServer = lib.mkOption {
type = lib.types.str; type = lib.types.nullOr lib.types.str;
description = "Hostname for Transmission"; description = "Hostname for Transmission";
default = null; default = null;
}; };
@ -12,7 +12,7 @@
namespace = config.networking.wireguard.interfaces.wg0.interfaceNamespace; namespace = config.networking.wireguard.interfaces.wg0.interfaceNamespace;
vpnIp = lib.strings.removeSuffix "/32" vpnIp = lib.strings.removeSuffix "/32"
(builtins.head config.networking.wireguard.interfaces.wg0.ips); (builtins.head config.networking.wireguard.interfaces.wg0.ips);
in lib.mkIf (config.wireguard.enable && config.transmissionServer != null) { in lib.mkIf (config.transmissionServer != null) {
# Setup transmission # Setup transmission
services.transmission = { services.transmission = {
@ -26,13 +26,13 @@
rpc-host-whitelist = config.transmissionServer; rpc-host-whitelist = config.transmissionServer;
rpc-host-whitelist-enabled = true; rpc-host-whitelist-enabled = true;
rpc-whitelist = "127.0.0.1,${vpnIp}"; rpc-whitelist = "127.0.0.1,${vpnIp}";
rpc-whitelist-enabled = true; rpc-whitelist-enabled = config.wireguard.enable;
}; };
credentialsFile = config.secrets.transmission.dest; credentialsFile = config.secrets.transmission.dest;
}; };
# Bind transmission to wireguard namespace # Bind transmission to wireguard namespace
systemd.services.transmission = { systemd.services.transmission = lib.mkIf config.wireguard.enable {
bindsTo = [ "netns@${namespace}.service" ]; bindsTo = [ "netns@${namespace}.service" ];
requires = [ "network-online.target" "transmission-secret.service" ]; requires = [ "network-online.target" "transmission-secret.service" ];
after = [ "wireguard-wg0.service" "transmission-secret.service" ]; after = [ "wireguard-wg0.service" "transmission-secret.service" ];
@ -59,7 +59,7 @@
boot.kernel.sysctl."net.core.rmem_max" = 4194304; boot.kernel.sysctl."net.core.rmem_max" = 4194304;
# Allow inbound connections to reach namespace # Allow inbound connections to reach namespace
systemd.services.transmission-web-netns = { systemd.services.transmission-web-netns = lib.mkIf config.wireguard.enable {
description = "Forward to transmission in wireguard namespace"; description = "Forward to transmission in wireguard namespace";
requires = [ "transmission.service" ]; requires = [ "transmission.service" ];
after = [ "transmission.service" ]; after = [ "transmission.service" ];