diff --git a/modules/graphical/default.nix b/modules/graphical/default.nix index a6bd541..5b3b6ef 100644 --- a/modules/graphical/default.nix +++ b/modules/graphical/default.nix @@ -26,5 +26,6 @@ ./nightlight.nix ./xfce.nix ./basics.nix + ./sway.nix ]; } diff --git a/modules/graphical/games.nix b/modules/graphical/games.nix index 19d4e73..7f4f8ad 100644 --- a/modules/graphical/games.nix +++ b/modules/graphical/games.nix @@ -5,6 +5,7 @@ in { options.custom.graphical.games = { enable = mkEnableOption "Enables games"; enablePreinstalled = mkEnableOption "Enables preinstalled games"; + enableVr = mkEnableOption "Enables VR support"; }; config = mkIf cfg.enable { @@ -24,6 +25,11 @@ in { end = "${pkgs.libnotify}/bin/notify-send 'GameMode ended'"; }; }; + nixpkgs.config.permittedInsecurePackages = [ + "dotnet-runtime-wrapped-7.0.20" + "dotnet-runtime-wrapped-7.0.20" + "dotnet-runtime-wrapped-7.0.20" + ]; environment.systemPackages = [ pkgs.mangohud ] ++ optionals cfg.enablePreinstalled (with pkgs; [ #taisei @@ -35,6 +41,7 @@ in { steamtinkerlaunch #tetrio-desktop #fuck you osk #libs - ]); + ]) ++ optionals cfg.enableVr (with pkgs; [ beatsabermodmanager ]); + }; } diff --git a/modules/graphical/sway.nix b/modules/graphical/sway.nix new file mode 100644 index 0000000..ac5af92 --- /dev/null +++ b/modules/graphical/sway.nix @@ -0,0 +1,27 @@ +{ config, pkgs, lib, ... }: +let cfg = config.custom.graphical.sway; +in { + + options = { + custom.graphical.sway.enable = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enable sway window manager"; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + grim # screenshot functionality + slurp # screenshot functionality + wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout + mako # notification system developed by swaywm maintainer + ]; + + # enable sway window manager + programs.sway = { + enable = true; + wrapperFeatures.gtk = true; + }; + }; +} diff --git a/modules/services/adguard.nix b/modules/services/adguard.nix index ff352e3..a4dfe03 100644 --- a/modules/services/adguard.nix +++ b/modules/services/adguard.nix @@ -60,7 +60,6 @@ in { filtering_enabled = true; upstream_dns = [ "https://dns10.quad9.net/dns-query" - "https://doh.tiar.app/dns-query" "https://dns.adguard-dns.com/dns-query" ]; use_http3_upstreams = true; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index 98e7b10..ee40fff 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -61,6 +61,7 @@ games = { enable = true; enablePreinstalled = true; + enableVr = true; }; ime.enable = true; noise-supression.enable = true; @@ -70,6 +71,7 @@ nightlight.enable = true; #plasma.enable = true; i3.enable = true; + sway.enable = true; hyprland.enable = true; #gnome.enable = true; #cosmic.enable = true; @@ -91,7 +93,17 @@ ifuse # optional, to mount using 'ifuse' ]; - nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" ]; + nixpkgs.config.permittedInsecurePackages = [ + "electron-27.3.11" + + "dotnet-runtime-wrapped-7.0.20" + "dotnet-runtime-7.0.20" + "dotnet-core-combined" + "dotnet-sdk-7.0.410" + "dotnet-sdk-6.0.428" + "dotnet-sdk-wrapped-6.0.428" + "dotnet-sdk-wrapped-7.0.410" + ]; networking.firewall.allowedTCPPorts = [ 6567 ]; # mindustry networking.firewall.allowedUDPPorts = [ 6567 ]; # mindustry