diff --git a/.sops.yaml b/.sops.yaml index 9e7956c..1faf874 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -1,6 +1,7 @@ keys: - &ulmo_1 age19qfpf980tadguqq44zf6xwvjvl428dyrj46ha3n6aeqddwhtnuqqml7etq - &ulmo_2 age1ewes0f5snqx3sh5ul6fa6qtxzhd25829v6mf5rx2wnheat6fefps5rme2x + - &manwe_1 age1jmrmdw4kmjeu9d6z74r2unqt7wpgsx24vqejmdjretsnsn8g4drsl3m98w creation_rules: # All Machine secrets @@ -8,4 +9,5 @@ creation_rules: key_groups: - age: - *ulmo_1 - - *ulmo_2 \ No newline at end of file + - *ulmo_2 + - *manwe_1 diff --git a/modules/home/application/teamspeak/default.nix b/modules/home/application/teamspeak/default.nix index d234e9a..3e5e530 100644 --- a/modules/home/application/teamspeak/default.nix +++ b/modules/home/application/teamspeak/default.nix @@ -10,6 +10,9 @@ in }; config = mkIf cfg.enable { - home.packages = with pkgs; [ teamspeak3 teamspeak6-client ]; + home.packages = with pkgs; [ + # teamspeak3 + teamspeak6-client + ]; }; } diff --git a/modules/home/themes/default.nix b/modules/home/themes/default.nix index 3fb8f15..d338b88 100644 --- a/modules/home/themes/default.nix +++ b/modules/home/themes/default.nix @@ -26,13 +26,13 @@ in { config = mkIf (cfg.enable) { stylix = { - enable = true; + enable = true; base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml"; image = ./${cfg.theme}.jpg; polarity = cfg.polarity; -# targets.qt.platform = mkDefault "kde"; + targets.qt.platform = mkDefault "kde"; targets.zen-browser.profileNames = [ "Chris" ]; fonts = { diff --git a/modules/nixos/application/steam/default.nix b/modules/nixos/application/steam/default.nix index 5b08d31..fc42935 100644 --- a/modules/nixos/application/steam/default.nix +++ b/modules/nixos/application/steam/default.nix @@ -15,15 +15,20 @@ in { }; config = mkIf cfg.enable { + # environment.systemPackages = with pkgs; [ steam ]; + programs = { steam = { enable = true; - package = pkgs.steam.override { - extraEnv = { - DXVK_HUD = "compiler"; - MANGOHUD = true; - }; - }; + remotePlay.openFirewall = true; + dedicatedServer.openFirewall = true; + localNetworkGameTransfers.openFirewall = true; + # package = pkgs.steam.override { + # extraEnv = { + # DXVK_HUD = "compiler"; + # MANGOHUD = true; + # }; + # }; # gamescopeSession = { # enable = true; diff --git a/modules/nixos/desktop/plasma/default.nix b/modules/nixos/desktop/plasma/default.nix index d1e2a28..aa1e497 100644 --- a/modules/nixos/desktop/plasma/default.nix +++ b/modules/nixos/desktop/plasma/default.nix @@ -22,7 +22,7 @@ in konsole kate ghostwriter - oxygen + # oxygen ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/packages/studio/default.nix b/packages/studio/default.nix index e3061d4..84610a3 100644 --- a/packages/studio/default.nix +++ b/packages/studio/default.nix @@ -11,8 +11,8 @@ in mkWindowsAppNoCC rec { version = "2.25.4"; src = fetchurl { - url = "https://studio.download.bricklink.info/Studio2.0+EarlyAccess/Archive/2.25.4_1/Studio+2.0+EarlyAccess.exe"; - sha256 = "sha256:1gw6pyvfr7zr42g21hqgiwkjs88nvhq2c2v40y21frvwv17hja92"; + url = "https://studio.download.bricklink.info/Studio2.0+EarlyAccess/Archive/2.25.12_1/Studio+2.0+EarlyAccess.exe"; + sha256 = "sha256:1xl3zvzkzr64zphk7rnpfx3whhbaykzw06m3nd5dc12r2p4sdh3v"; }; enableMonoBootPrompt = false; @@ -59,7 +59,10 @@ in mkWindowsAppNoCC rec { wine64 reg add 'HKEY_CURRENT_USER\Software\Wine\X11 Driver' /t REG_SZ /v UseTakeFocus /d N /f ''; - winAppPreRun = ''''; + winAppPreRun = '' + wineserver -W + wine64 reg add 'HKEY_CURRENT_USER\Software\Wine\X11 Driver' /t REG_SZ /v UseTakeFocus /d N /f + ''; winAppRun = '' wine64 "$WINEPREFIX/drive_c/Program Files/Studio 2.0/Studio.exe" "$ARGS" diff --git a/shells/default/default.nix b/shells/default/default.nix index 5bd5b5f..ed12b5c 100644 --- a/shells/default/default.nix +++ b/shells/default/default.nix @@ -17,5 +17,6 @@ mkShell { nixd openssl inputs.clan-core.packages.${stdenv.hostPlatform.system}.clan-cli + nix-output-monitor ]; } diff --git a/systems/x86_64-linux/manwe/default.nix b/systems/x86_64-linux/manwe/default.nix index a2c478f..179e410 100644 --- a/systems/x86_64-linux/manwe/default.nix +++ b/systems/x86_64-linux/manwe/default.nix @@ -1,4 +1,4 @@ -{...}: { +{ pkgs, ...}: { imports = [ ./disks.nix ./hardware.nix @@ -8,6 +8,8 @@ services.logrotate.checkConfig = false; + environment.systemPackages = with pkgs; [ beyond-all-reason ]; + sneeuwvlok = { hardware.has = { gpu.amd = true; @@ -20,7 +22,7 @@ animated = true; }; - desktop.use = "cosmic"; + desktop.use = "plasma"; application = { steam.enable = true;