diff --git a/home-manager/modules/discord.nix b/home-manager/modules/discord.nix index 280f835..9a96b83 100644 --- a/home-manager/modules/discord.nix +++ b/home-manager/modules/discord.nix @@ -27,15 +27,11 @@ allowMentions = true; ignoreUsers = "Wumpus"; # die }; - RPCEditor = { - enable = true; - }; ReviewDB = { enable = true; }; anonymiseFileNames = { enable = true; - consistent = "killallWumpus"; }; autoZipper = { enable = true; @@ -46,12 +42,6 @@ biggerStreamPreview = { enable = true; }; - blockKeywords = { - enable = true; - useRegex = true; - caseSensitive = true; - blockedWords = "Wumpus"; - }; customIdle = { enable = true; }; @@ -70,9 +60,6 @@ reverseImageSearch = { enable = true; }; - richMagnetLinks = { - enable = true; - }; sekaiStickers = { enable = true; }; diff --git a/home-manager/modules/matugen.nix b/home-manager/modules/matugen.nix index 7e7d519..45ab43d 100644 --- a/home-manager/modules/matugen.nix +++ b/home-manager/modules/matugen.nix @@ -1,3 +1,3 @@ {pkgs, ...}: { - home.packages = [pkgs.matugen]; + home.packages = with pkgs; [matugen]; } diff --git a/hosts/modules/hyprland.nix b/hosts/modules/hyprland.nix index b4dc2ff..9cbde51 100644 --- a/hosts/modules/hyprland.nix +++ b/hosts/modules/hyprland.nix @@ -3,7 +3,6 @@ programs.hyprland = { enable = true; - package = pkgs.hyprland; xwayland.enable = true; }; @@ -12,12 +11,10 @@ extraPortals = [pkgs.xdg-desktop-portal-gtk]; config = { common = { - default = ["gtk"]; + default = ["hyprland" "gtk"]; }; hyprland = { - default = ["gtk"]; - "org.freedesktop.impl.portal.ScreenCast" = ["hyprland"]; - "org.freedesktop.impl.portal.Screenshot" = ["hyprland"]; + default = ["hyprland" "gtk"]; }; }; }; diff --git a/hosts/modules/net.nix b/hosts/modules/net.nix index 1e3c9eb..61950f8 100644 --- a/hosts/modules/net.nix +++ b/hosts/modules/net.nix @@ -11,21 +11,22 @@ posting ]; - networking.firewall.allowedTCPPorts = [57621]; - networking.firewall.allowedUDPPorts = [5353]; + networking = { + hostName = "nixos"; + networkmanager.enable = true; + firewall = { + enable = true; + allowedTCPPorts = [80 443 57621]; + allowedTCPPortRanges = [ + { + from = 6000; + to = 6767; + } + ]; + allowedUDPPorts = [5353]; + }; + }; - networking.wireless.enable = false; # Enables wireless support via wpa_supplicant. - networking.hostName = "nixos"; - # Configure network proxy if necessary - # networking.proxy.default = "http://user:password@proxy:port/"; - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - - networking.networkmanager.enable = true; - # Open ports in the firewall. - # networking.firewall.allowedTCPPorts = [ ... ]; - # networking.firewall.allowedUDPPorts = [ ... ]; - # Or disable the firewall altogether. - networking.firewall.enable = false; services.openssh.enable = true; # Disable NetworkManager-wait-online to fix boot hang diff --git a/hosts/modules/steam.nix b/hosts/modules/steam.nix index 0fee1d5..cb0af7a 100644 --- a/hosts/modules/steam.nix +++ b/hosts/modules/steam.nix @@ -5,6 +5,7 @@ extraCompatPackages = [ pkgs.proton-ge-bin pkgs.proton-cachyos + pkgs.dw-proton ]; # for hosting # dedicatedServer.openFirewall = true; @@ -13,12 +14,6 @@ protontricks.enable = true; }; - programs.wine = { - enable = true; - package = pkgs.wine-cachyos; - ntsync = true; - }; - programs.gamescope = { enable = true; capSysNice = true; @@ -45,11 +40,12 @@ }; environment.systemPackages = with pkgs; [ lutris - wine-cachyos + wine-tkg winetricks mangohud libstrangle gamescope-wsi ipc-bridge + umu-launcher ]; } diff --git a/hosts/system-packages.nix b/hosts/system-packages.nix index 3963d1c..29d1d7a 100644 --- a/hosts/system-packages.nix +++ b/hosts/system-packages.nix @@ -39,7 +39,6 @@ ./modules/flatpak.nix ./modules/aagl.nix inputs.nix-gaming.nixosModules.pipewireLowLatency - inputs.nix-gaming.nixosModules.wine ]; npm.enable = true; services.udisks2.enable = true;