diff --git a/home/gui/mpv.nix b/home/gui/mpv.nix index 63ac7d4..bbbb46b 100644 --- a/home/gui/mpv.nix +++ b/home/gui/mpv.nix @@ -1,4 +1,9 @@ -{ ... }: { +{ + inputs, + outputs, + pkgs, + ... +}: { programs = { mpv = { enable = true; @@ -30,8 +35,8 @@ ytdl = "yes"; ytdl-format = "bestvideo+bestaudio"; # Only needed when/if youtube blocks annon access again - # ytdl-raw-options = "no-playlist=,cookies-from-browser=firefox,force-ipv4="; - ytdl-raw-options = "no-playlist="; + ytdl-raw-options = "no-playlist=,cookies-from-browser=firefox,force-ipv4="; + # ytdl-raw-options = "no-playlist="; }; profiles = { utube = { diff --git a/hosts/pi-server/default.nix b/hosts/pi-server/default.nix index 9c67dc2..25cd052 100644 --- a/hosts/pi-server/default.nix +++ b/hosts/pi-server/default.nix @@ -1,5 +1,11 @@ -{ inputs, outputs, lib, config, pkgs, ... }: -let +{ + inputs, + outputs, + lib, + config, + pkgs, + ... +}: let my-python-packages = python-packages: with python-packages; [ pip @@ -12,10 +18,10 @@ let in { nix = { settings = { - experimental-features = [ "nix-command" "flakes" ]; + experimental-features = ["nix-command" "flakes"]; warn-dirty = false; auto-optimise-store = true; - trusted-users = [ "root" "don" ]; + trusted-users = ["root" "don"]; }; gc = { automatic = true; @@ -25,6 +31,7 @@ in { }; imports = [ ../../home + ./services.nix ./systemd.nix ../vars.nix ./upgrade-diff.nix @@ -48,14 +55,14 @@ in { inputMethod = { enable = true; type = "fcitx5"; - fcitx5.addons = with pkgs; [ fcitx5-mozc fcitx5-gtk ]; + fcitx5.addons = with pkgs; [fcitx5-mozc fcitx5-gtk]; }; }; # Bootloader. boot = { kernelPackages = pkgs.linuxPackages_rpi4; - kernelParams = [ "consoleblank=60" ]; + kernelParams = ["consoleblank=60"]; #loader = { #systemd-boot = { #enable = true; @@ -65,34 +72,36 @@ in { #efiSysMountPoint = "/boot"; #}; #}; - plymouth = { enable = true; }; - kernel = { sysctl = { "vm.swappiness" = 10; }; }; + plymouth = {enable = true;}; + kernel = {sysctl = {"vm.swappiness" = 10;};}; }; security = { - polkit = { enable = true; }; + polkit = {enable = true;}; sudo.enable = false; doas = { enable = true; - extraRules = [{ - users = [ "don" ]; - keepEnv = true; - noPass = true; - }]; + extraRules = [ + { + users = ["don"]; + keepEnv = true; + noPass = true; + } + ]; }; }; services = { - pcscd = { enable = true; }; - beszel-agent = { enable = true; }; + pcscd = {enable = true;}; + beszel-agent = {enable = true;}; avahi = { enable = true; nssmdns4 = true; }; - printing = { enable = true; }; - udisks2 = { enable = true; }; - nscd = { enableNsncd = true; }; - tailscale = { enable = true; }; + printing = {enable = true;}; + udisks2 = {enable = true;}; + nscd = {enableNsncd = true;}; + tailscale = {enable = true;}; locate = { enable = true; package = pkgs.mlocate; @@ -176,8 +185,8 @@ in { ]; programs = { - dconf = { enable = true; }; - mtr = { enable = true; }; + dconf = {enable = true;}; + mtr = {enable = true;}; gnupg = { agent = { enable = true; @@ -189,7 +198,7 @@ in { nixpkgs.overlays = [ (final: super: { - khal = super.khal.overridePythonAttrs (_: { doCheck = false; }); + khal = super.khal.overridePythonAttrs (_: {doCheck = false;}); }) ]; @@ -197,22 +206,26 @@ in { networking.firewall = { enable = true; # always allow traffic from your Tailscale network - trustedInterfaces = [ "tailscale0" ]; + trustedInterfaces = ["tailscale0"]; checkReversePath = "loose"; # allow the Tailscale UDP port through the firewall - allowedUDPPorts = [ config.services.tailscale.port ]; - allowedTCPPortRanges = [{ - from = 1714; - to = 1764; - }]; - allowedUDPPortRanges = [{ - from = 1714; - to = 1764; - }]; + allowedUDPPorts = [config.services.tailscale.port]; + allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; # allow you to SSH in over the public internet - allowedTCPPorts = [ 22 ]; + allowedTCPPorts = [22]; }; # This value determines the NixOS release from which the default diff --git a/hosts/pi-server/services.nix b/hosts/pi-server/services.nix new file mode 100644 index 0000000..26c463a --- /dev/null +++ b/hosts/pi-server/services.nix @@ -0,0 +1,9 @@ +{...}: { + services = { + wlsunset = { + enable = true; + latitude = 29.74; + longitude = 95.77; + }; + }; +}