diff --git a/home/apps/default.nix b/home/apps/default.nix index fd2de768..b13a059d 100644 --- a/home/apps/default.nix +++ b/home/apps/default.nix @@ -27,5 +27,7 @@ lib.optionalAttrs device.hasGui { ./wezterm.nix ./zathura.nix ./zed.nix + ./discord.nix + ./slack.nix ]; } diff --git a/home/apps/discord.nix b/home/apps/discord.nix new file mode 100644 index 00000000..270dd916 --- /dev/null +++ b/home/apps/discord.nix @@ -0,0 +1,10 @@ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ + pkgs.discord + pkgs.webcord + ]; +} diff --git a/home/apps/slack.nix b/home/apps/slack.nix new file mode 100644 index 00000000..1e38d1de --- /dev/null +++ b/home/apps/slack.nix @@ -0,0 +1,9 @@ +{ + pkgs, + lib, + ... +}: { + home.packages = lib.optionals pkgs.stdenv.isLinux [ + pkgs.slack + ]; +} diff --git a/home/linux/gui.nix b/home/linux/gui.nix index 56a92e3e..762eecfa 100644 --- a/home/linux/gui.nix +++ b/home/linux/gui.nix @@ -21,8 +21,6 @@ }; home.packages = with pkgs; lib.optionals pkgs.stdenv.isLinux [ - discord - jdk mullvad-closest mullvad-vpn nautilus diff --git a/nixos/ryu/ryu.nix b/nixos/ryu/ryu.nix index 8d7adefd..5e726021 100644 --- a/nixos/ryu/ryu.nix +++ b/nixos/ryu/ryu.nix @@ -102,8 +102,11 @@ ]; boot.extraModulePackages = []; # services.udev.packages = [pkgs.yubikey-personalization pkgs.yubikey-personalization-gui pkgs.via]; - services.udev.packages = [pkgs.via]; - services.yubikey-agent.enable = true; + boot.kernel.sysctl."net.ipv4.ip_forward" = 1; + boot.kernel.sysctl."net.ipv6.conf.all.forwarding" = 1; + + # services.udev.packages = [pkgs.via]; + # services.yubikey-agent.enable = true; services.udev.extraRules = '' KERNEL=="i2c-[0-9]*", GROUP="i2c", MODE="0660" ''; diff --git a/nixos/ryu/services/tailscale.nix b/nixos/ryu/services/tailscale.nix index 0fee56fc..800a81c9 100644 --- a/nixos/ryu/services/tailscale.nix +++ b/nixos/ryu/services/tailscale.nix @@ -1,9 +1,22 @@ -{...}: { +{ + pkgs, + lib, + ... +}: { services = { tailscale = { enable = true; - useRoutingFeatures = true; + useRoutingFeatures = "both"; extraUpFlags = ["--advertise-routes=192.168.0.0/24"]; }; + networkd-dispatcher = { + enable = true; + rules."50-tailscale" = { + onState = ["routable"]; + script = '' + ${lib.getExe pkgs.ethtool} -K en01 rx-udp-gro-forwarding on rg-xgro-list off + ''; + }; + }; }; }