From 35289d7a97e3967e49ad963ca956ffbfc234992e Mon Sep 17 00:00:00 2001 From: steven carpenter Date: Fri, 5 Sep 2025 18:24:40 -0400 Subject: [PATCH] removed unnecessary deps for fnv --- hosts/katana.nix | 3 -- modules/system/applications/fnv.nix | 30 +++++++++++++------ .../system/desktop-environments/default.nix | 4 +-- modules/system/desktop-environments/gnome.nix | 20 ++++++------- 4 files changed, 32 insertions(+), 25 deletions(-) diff --git a/hosts/katana.nix b/hosts/katana.nix index 93fd8e1..1b62752 100644 --- a/hosts/katana.nix +++ b/hosts/katana.nix @@ -169,9 +169,6 @@ wishlist #ssh bastion fd # required for nvim config telescope rustdesk #remote tech support - pciutils #lspci - lshw # for getting bus ids for PRIME - dracut # for lsinitrd ]; # Fonts diff --git a/modules/system/applications/fnv.nix b/modules/system/applications/fnv.nix index 457eb6b..3a6a935 100644 --- a/modules/system/applications/fnv.nix +++ b/modules/system/applications/fnv.nix @@ -4,24 +4,24 @@ config = lib.mkIf config.speccon18.applications.fnv.enable { - # Load nvidia driver for Xorg and Wayland - # For offloading, `modesetting` is needed additionally, - # otherwise the X-server will be running permanently on nvidia, - # thus keeping the GPU always on (see `nvidia-smi`). - services.xserver.videoDrivers = [ - "nvidia" - ]; + # Load nvidia driver for Xorg and Wayland + services.xserver.videoDrivers = ["nvidia"]; + # Blacklist Nouveau driver to force 3060 to use nvidia driver boot.blacklistedKernelModules = [ "nouveau" ]; - # Enable OpenGL + # Enabling Gamemode for better game performance + programs.gamemode.enable = true; + hardware = { + + # Enable OpenGL graphics = { enable = true; enable32Bit = true; - }; + nvidia = { # Optionally, you may need to select the appropriate driver version for your specific GPU. package = config.boot.kernelPackages.nvidiaPackages.latest; @@ -57,6 +57,18 @@ nvidiaSettings = true; }; }; + environment.systemPackages = with pkgs; [ + bottles # Wine Prefix Management + winetricks # For more complex editing of prefix and possibly needed for SDL2 + gamescope # micro compositor written by valve to help with better scaling and alt tabbing + mangohud # performance overlay hud using for testing performance of instance + goverlay # gui to manage huds + vkd3d # vulken to directx + wine + wineWowPackages.stable + cabextract + zenity + ]; }; } diff --git a/modules/system/desktop-environments/default.nix b/modules/system/desktop-environments/default.nix index 1046e58..45f5025 100644 --- a/modules/system/desktop-environments/default.nix +++ b/modules/system/desktop-environments/default.nix @@ -5,8 +5,8 @@ ./hyprland.nix ./tuigreet.nix ]; - speccon18.desktop.budgie.enable = true; - speccon18.desktop.gnome.enable = false; + speccon18.desktop.budgie.enable = false; + speccon18.desktop.gnome.enable = true; speccon18.desktop.hyprland.enable = false; speccon18.desktop.tuigreet.enable = false; } diff --git a/modules/system/desktop-environments/gnome.nix b/modules/system/desktop-environments/gnome.nix index c5b5407..663294c 100644 --- a/modules/system/desktop-environments/gnome.nix +++ b/modules/system/desktop-environments/gnome.nix @@ -17,28 +17,25 @@ # }; # }; # Gnome extensions - environment.systemPackages = with pkgs; [ ]; + environment.systemPackages = with pkgs.gnome; [ ]; services = { gnome = { - core-utilities.enable = false; + core-apps.enable = true; gnome-keyring.enable = true; }; - + displayManager.defaultSession = lib.mkDefault "gnome"; xserver = { enable = true; layout = "us"; xkbVariant = ""; - displayManager = { - gdm = { - enable = true; - wayland = true; - }; - defaultSession = lib.mkDefault "budgie-desktop"; - }; + displayManager.gdm = { + enable = true; + wayland = true; + }; desktopManager = { xterm.enable = false; - gnome.enable = false; + gnome.enable = true; }; }; }; @@ -51,6 +48,7 @@ portal = { enable = lib.mkDefault true; }; mime.defaultApplications = { "text/markdown" = "nvim"; + "x-scheme-handler/nxm" = "mo2-nxm-handler.desktop"; }; }; };