diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index b6056915..e4618631 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -28,9 +28,9 @@ }; systemd.services.NetworkManager-wait-online.enable = lib.mkForce false; - systemd.tmpfiles.rules = [ - "L+ /run/gdm/.config/monitors.xml - - - - ${./monitors.xml}" - ]; + # systemd.tmpfiles.rules = [ + # "L+ /etc/gdm/.config/monitors.xml - - - - ${./monitors.xml}" + # ]; security = { sudo.wheelNeedsPassword = false; polkit.enable = true; @@ -103,7 +103,7 @@ }; }; displayManager.gdm.enable = true; - # desktopManager.gnome.enable = true; + desktopManager.gnome.enable = true; pipewire = { enable = true; alsa.enable = true; @@ -140,6 +140,7 @@ # }; # services.wireplumber.configPackages = with pkgs; [ bluez ]; + environment.etc."xdg/monitors.xml".source = ./monitors.xml; # environment.etc = { # "wireplumber/bluetooth.lua.d/51-bluez-config.lua".text = '' # bluez_monitor.properties = { diff --git a/nixos/ryu/programs/default.nix b/nixos/ryu/programs/default.nix index bd0bc370..9e327ca4 100644 --- a/nixos/ryu/programs/default.nix +++ b/nixos/ryu/programs/default.nix @@ -9,5 +9,6 @@ ./gnome-disks.nix ./nix-ld.nix ./gamemode.nix + ./droidcam.nix ]; } diff --git a/nixos/ryu/programs/droidcam.nix b/nixos/ryu/programs/droidcam.nix new file mode 100644 index 00000000..c5cdcfe2 --- /dev/null +++ b/nixos/ryu/programs/droidcam.nix @@ -0,0 +1,5 @@ +{...}: { + programs.droidcam = { + enable = true; + }; +} diff --git a/nixos/tako/services/fail2ban.nix b/nixos/tako/services/fail2ban.nix index 3fe07105..f019df00 100644 --- a/nixos/tako/services/fail2ban.nix +++ b/nixos/tako/services/fail2ban.nix @@ -15,6 +15,7 @@ }; ignoreIP = [ "106.219.121.52" + "106.219.122.125" ]; }; }; diff --git a/nixos/tako/services/prowlarr.nix b/nixos/tako/services/prowlarr.nix index d66ba13c..e6a62577 100644 --- a/nixos/tako/services/prowlarr.nix +++ b/nixos/tako/services/prowlarr.nix @@ -7,6 +7,7 @@ authentication_enabled = true; authentication_method = "External"; }; + server.port = 9696; }; }; }; diff --git a/scripts/autossh.sh b/scripts/autossh.sh index be407634..661d7294 100755 --- a/scripts/autossh.sh +++ b/scripts/autossh.sh @@ -1 +1 @@ -autossh -M 0 -N -D 1080 mirai +autossh -M 0 -N -D 1080 tako