From daa782bb53f9ddc7627333ca85915fea5b0d4590 Mon Sep 17 00:00:00 2001 From: tristan Date: Wed, 28 Jun 2023 08:39:18 +0100 Subject: [PATCH] more games, fix helix, bluetooth --- lib/modules/gamer.nix | 45 +++++++++++++++++++++++----------------- lib/modules/personal.nix | 4 ++-- system/global/home.nix | 26 ++++++++++++----------- system/global/system.nix | 6 ++++-- 4 files changed, 46 insertions(+), 35 deletions(-) diff --git a/lib/modules/gamer.nix b/lib/modules/gamer.nix index f5edf13..b16799b 100644 --- a/lib/modules/gamer.nix +++ b/lib/modules/gamer.nix @@ -6,26 +6,33 @@ with lib; }; config = mkIf config.roles.gamer.enable { - - home-manager.users.${user}.imports = [{ - home.packages = with pkgs; [ - airshipper - minetest - superTuxKart - heroic + + home-manager.users.${user}.imports = [{ + home.packages = with pkgs; [ + airshipper + minetest + superTuxKart + heroic + BeatSaberModManager + gamemode + (makeDesktopItem { + name = "x11steam"; + desktopName = "X11 Steam Wrapper"; + exec = "QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 ${steam}/bin/steam"; + }) + ]; + }]; + + nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ + "steam" + "steam-run" + "steam-original" ]; - }]; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "steam" - "steam-run" - "steam-original" - ]; - - programs.steam = { - enable = true; - remotePlay.openFirewall = true; - dedicatedServer.openFirewall = true; + programs.steam = { + enable = true; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + }; }; - }; } diff --git a/lib/modules/personal.nix b/lib/modules/personal.nix index 020de5f..463bd2d 100644 --- a/lib/modules/personal.nix +++ b/lib/modules/personal.nix @@ -6,7 +6,7 @@ with lib; }; config = mkIf config.roles.personal.enable { - + roles.email = { enable = true; email = "tristan@tristans.cloud"; @@ -24,7 +24,7 @@ with lib; ardour blender musescore - handbrake + jellyfin-media-player monero-gui xmrig transmission-remote-gtk diff --git a/system/global/home.nix b/system/global/home.nix index a173958..23bf256 100644 --- a/system/global/home.nix +++ b/system/global/home.nix @@ -43,6 +43,7 @@ in swww neofetch obs-studio + selectdefaultapplication inkscape libsForQt5.okular @@ -99,7 +100,7 @@ in extraConfig = '' ## global hyprland configuration env = GDK_BACKEND,wayland,x11 - env = QT_QPA_PLATFORM,xcb + env = QT_QPA_PLATFORM,wayland;xcb env = SDL_VIDEODRIVER,wayland env = CLUTTER_BACKEND,wayland env = XDG_CURRENT_DESKTOP,Hyprland @@ -199,6 +200,10 @@ in mfact = 0.7 new_on_top = yes } + + misc { + vrr = 2 + } ''; }; @@ -504,29 +509,26 @@ in programs.helix = { enable = true; - languages = [ - { - name = "nix"; + languages = { + nix = { auto-format = true; language-server = { command = "${pkgs.rnix-lsp}/bin/rnix-lsp"; }; - } - { - name = "go"; + }; + go = { auto-format = true; language-server = { command = "${pkgs.gopls}/bin/gopls"; }; - } - { - name = "tsx"; + }; + typescript = { auto-format = true; language-server = { command = "${pkgs.nodePackages.typescript-language-server}/bin/typescript-language-server"; }; - } - ]; + }; + }; }; programs.neomutt.extraConfig = '' diff --git a/system/global/system.nix b/system/global/system.nix index ea7c5fd..d93158c 100644 --- a/system/global/system.nix +++ b/system/global/system.nix @@ -41,7 +41,7 @@ # kde connect networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; - + networking.firewall.interfaces.tailscale0 = { allowedTCPPortRanges = [{ from = 0; to = 65535; }]; }; @@ -64,7 +64,6 @@ }; }; - i18n.defaultLocale = "en_GB.UTF-8"; services.xserver = { @@ -167,5 +166,8 @@ services.tlp.enable = true; + hardware.bluetooth.enable = true; + services.blueman.enable = true; + }