diff --git a/flake.nix b/flake.nix index 7f71bf8..aa2f77b 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,6 @@ modules = [ ./hosts/server/configuration.nix inputs.home-manager.nixosModules.default - nixos-hardware.nixosModules.system76 ]; }; diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index c9c4cd4..884fb86 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -49,10 +49,10 @@ services.xserver.desktopManager.gnome.enable = false; # Enable CUPS to print documents. - services.auto-cpufreq.enable = true; - services.thermald.enable = true; - powerManagement.powertop.enable = true; - powerManagement.enable = true; + # services.auto-cpufreq.enable = true; + # services.thermald.enable = true; + # powerManagement.powertop.enable = true; + # powerManagement.enable = true; # Enable sound with pipewire. sound.enable = false; @@ -68,7 +68,7 @@ users.users.k = { isNormalUser = true; description = "k"; - extraGroups = [ "networkmanager" "wheel" "libvirtd" ]; + extraGroups = [ "networkmanager" "wheel" "libvirtd"]; packages = with pkgs; [zsh]; shell = pkgs.zsh; }; @@ -78,6 +78,34 @@ }; }; + services.udev.extraRules = '' + # Allows Wolf to acces /dev/uinput +KERNEL=="uinput", SUBSYSTEM=="misc", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput" + +# Allows Wolf to access /dev/uhid +KERNEL=="uhid", TAG+="uaccess" + +# Move virtual keyboard and mouse into a different seat +SUBSYSTEMS=="input", ATTRS{id/vendor}=="ab00", MODE="0660", GROUP="input", ENV{ID_SEAT}="seat9" + +# Joypads +SUBSYSTEMS=="input", ATTRS{name}=="Wolf X-Box One (virtual) pad", MODE="0660", GROUP="input" +SUBSYSTEMS=="input", ATTRS{name}=="Wolf PS5 (virtual) pad", MODE="0660", GROUP="input" +SUBSYSTEMS=="input", ATTRS{name}=="Wolf gamepad (virtual) motion sensors", MODE="0660", GROUP="input" +SUBSYSTEMS=="input", ATTRS{name}=="Wolf Nintendo (virtual) pad", MODE="0660", GROUP="input" + ''; + +users.users.game = { + isNormalUser = true; + extraGroups = ["docker" "input"]; + packages = with pkgs; [docker-compose]; +}; + +users.users.media = { + isNormalUser = true; + packages = with pkgs; [mpv ffmpeg handbrake makemkv]; +}; + system.autoUpgrade.enable = true; nix.gc.automatic = true; diff --git a/hosts/server/service.nix b/hosts/server/service.nix index 8419039..5135cd6 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -28,15 +28,6 @@ labels = ["ubuntu-latest:docker://node:16-bullseye" "ubuntu-22.04:docker://node:16-bullseye" "ubuntu-20.04:docker://node:16-bullseye" "ubuntu-18.04:docker://node:16-buster" "native:host"]; }; - services.pufferpanel = { - enable = true; - extraGroups =["docker"]; - extraPackages = [pkgs.jre]; - environment = { - PUFFER_WEB_HOST = ":8002"; - PUFFER_PANEL_REGISTRATIONENABLED = "false"; - }; - }; services.home-assistant = { enable = true; @@ -94,7 +85,7 @@ }; services.fail2ban = { - enable=false; + enable=true; }; virtualisation.docker = { @@ -142,14 +133,6 @@ }; }; - "puf.dhilton.xyz" = { - addSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8002"; - proxyWebsockets = true; - }; - }; "srx.dhilton.xyz" = { addSSL = true;