From 5ac8539990b4d9d164e819263f5cf40d9f4a6c53 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Wed, 27 Dec 2023 12:29:56 -0500 Subject: [PATCH] Fix mangohud plus other stuff --- home-manager/vscode.nix | 1 + modules/common-desktop/mangohud/default.nix | 9 +++++ modules/common-desktop/mangohud/mangohud.conf | 31 +++++++++++++++ modules/common-desktop/packages.nix | 1 + modules/common-desktop/variables.nix | 5 --- wrappers/common-desktop/mangohud/default.nix | 6 --- .../common-desktop/mangohud/mangohud.conf | 31 --------------- wrappers/common-desktop/vscode/default.nix | 38 +++++++++---------- 8 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 modules/common-desktop/mangohud/default.nix create mode 100644 modules/common-desktop/mangohud/mangohud.conf delete mode 100644 modules/common-desktop/variables.nix delete mode 100644 wrappers/common-desktop/mangohud/default.nix delete mode 100644 wrappers/common-desktop/mangohud/mangohud.conf diff --git a/home-manager/vscode.nix b/home-manager/vscode.nix index b060153..936b76d 100755 --- a/home-manager/vscode.nix +++ b/home-manager/vscode.nix @@ -21,6 +21,7 @@ streetsidesoftware.code-spell-checker arcticicestudio.nord-visual-studio-code ]; + keybindings = [ { key = "ctrl+s"; diff --git a/modules/common-desktop/mangohud/default.nix b/modules/common-desktop/mangohud/default.nix new file mode 100644 index 0000000..7750c0d --- /dev/null +++ b/modules/common-desktop/mangohud/default.nix @@ -0,0 +1,9 @@ +{pkgs, ...}: { + environment = { + systemPackages = [pkgs.mangohud]; + sessionVariables = { + MANGOHUD = "1"; + MANGOHUD_CONFIGFILE = ./mangohud.conf; + }; + }; +} diff --git a/modules/common-desktop/mangohud/mangohud.conf b/modules/common-desktop/mangohud/mangohud.conf new file mode 100644 index 0000000..458383a --- /dev/null +++ b/modules/common-desktop/mangohud/mangohud.conf @@ -0,0 +1,31 @@ +gpu_stats=1 +gpu_text=GPU +gpu_load_change=1 +gpu_load_value=50,90 +gpu_load_color=FFFFFF,FFAA7F,CC0000 + +cpu_text=CPU +cpu_color=2e97cb +cpu_load_change=1 +core_load_change=1 +cpu_load_value=50,90 +cpu_load_color=FFFFFF,FFAA7F,CC0000 + +vram=1 +vram_color=ad64c1 + +fps=1 +frametime=0 +frame_timing=0 +engine_color=eb5b5b + +gpu_name=1 +gpu_color=2e9762 + +font_size=24 +table_columns=2 +round_corners=10 +text_color=ffffff +background_alpha=0.4 +position=bottom-right +background_color=020202 \ No newline at end of file diff --git a/modules/common-desktop/packages.nix b/modules/common-desktop/packages.nix index 3a1c384..e2df230 100644 --- a/modules/common-desktop/packages.nix +++ b/modules/common-desktop/packages.nix @@ -26,6 +26,7 @@ prismlauncher android-studio mission-center + nodePackages_latest.pnpm hunspellDicts.en_CA-large inputs.nix-gaming.packages.${system}.wine-ge ]; diff --git a/modules/common-desktop/variables.nix b/modules/common-desktop/variables.nix deleted file mode 100644 index becb123..0000000 --- a/modules/common-desktop/variables.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - environment.sessionVariables = { - MANGOHUD = "1"; - }; -} \ No newline at end of file diff --git a/wrappers/common-desktop/mangohud/default.nix b/wrappers/common-desktop/mangohud/default.nix deleted file mode 100644 index e542609..0000000 --- a/wrappers/common-desktop/mangohud/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{pkgs, ...}: { - wrappers.mangohud = { - basePackage = pkgs.mangohud; - env.MANGOHUD_CONFIGFILE.value = ./mangohud.conf; - }; -} \ No newline at end of file diff --git a/wrappers/common-desktop/mangohud/mangohud.conf b/wrappers/common-desktop/mangohud/mangohud.conf deleted file mode 100644 index a75e97f..0000000 --- a/wrappers/common-desktop/mangohud/mangohud.conf +++ /dev/null @@ -1,31 +0,0 @@ -gpu_stats = True -gpu_text = "GPU" -gpu_load_change = True -gpu_load_value = [50 90] -gpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"] - -cpu_text = "CPU" -cpu_color = "2e97cb" -cpu_load_change = True -core_load_change = True -cpu_load_value = [50 90] -cpu_load_color = ["FFFFFF" "FFAA7F" "CC0000"] - -vram = True -vram_color = "ad64c1" - -fps = True -frametime = False -frame_timing = False -engine_color = "eb5b5b" - -gpu_name = True -gpu_color = "2e9762" - -font_size = 24 -table_columns = 2 -round_corners = 10 -text_color = "ffffff" -background_alpha = 0.4 -position = "bottom-right" -background_color = "020202" \ No newline at end of file diff --git a/wrappers/common-desktop/vscode/default.nix b/wrappers/common-desktop/vscode/default.nix index a8e63ab..7601a48 100644 --- a/wrappers/common-desktop/vscode/default.nix +++ b/wrappers/common-desktop/vscode/default.nix @@ -1,21 +1,21 @@ {pkgs, ...}: { - # wrappers.vscode = { - # basePackage = pkgs.vscodium; + wrappers.vscode = { + basePackage = pkgs.vscodium; - # pathAdd = with pkgs.vscode-extensions; [ - # mkhl.direnv - # eamodio.gitlens - # jnoortheen.nix-ide - # timonwong.shellcheck - # usernamehw.errorlens - # ritwickdey.liveserver - # dbaeumer.vscode-eslint - # esbenp.prettier-vscode - # oderwat.indent-rainbow - # astro-build.astro-vscode - # pkief.material-icon-theme - # streetsidesoftware.code-spell-checker - # arcticicestudio.nord-visual-studio-code - # ]; - # }; -} \ No newline at end of file + pathAdd = with pkgs.vscode-extensions; [ + mkhl.direnv + eamodio.gitlens + jnoortheen.nix-ide + timonwong.shellcheck + usernamehw.errorlens + ritwickdey.liveserver + dbaeumer.vscode-eslint + esbenp.prettier-vscode + oderwat.indent-rainbow + astro-build.astro-vscode + pkief.material-icon-theme + streetsidesoftware.code-spell-checker + arcticicestudio.nord-visual-studio-code + ]; + }; +}