diff --git a/home/user/gtk.nix b/home/user/gtk.nix index e2e0eb8..d53c349 100644 --- a/home/user/gtk.nix +++ b/home/user/gtk.nix @@ -22,15 +22,11 @@ }; gtk3.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme = 1; - ''; + gtk-application-prefer-dark-theme = 1; }; gtk4.extraConfig = { - Settings = '' - gtk-application-prefer-dark-theme = 1; - ''; + gtk-application-prefer-dark-theme = 1; }; }; diff --git a/home/user/packages.nix b/home/user/packages.nix index 1eff68a..69a8537 100644 --- a/home/user/packages.nix +++ b/home/user/packages.nix @@ -1,8 +1,17 @@ -{ pkgs, ... }: - +{ pkgs, lib, ... }: +let + vesktop = pkgs.vesktop.overrideAttrs (oldAttrs: { + desktopItems = lib.optional pkgs.stdenv.hostPlatform.isLinux ( + (lib.head oldAttrs.desktopItems).override { + name = "discord"; + desktopName = "Discord"; + } + ); + }); +in { home.packages = [ - pkgs.vesktop # discord + vesktop # discord pkgs.firefox # Dev stuff diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix index 4f2e3e4..9c2e049 100644 --- a/system/dev/dn-pre7780/default.nix +++ b/system/dev/dn-pre7780/default.nix @@ -2,15 +2,15 @@ { imports = [ + inputs.home-manager.nixosModules.default ./hardware-configuration.nix ../../modules ../../modules/nvidia.nix ./boot.nix - inputs.home-manager.nixosModules.default ]; # Overrides - networking.hostName = "dn-pre7780"; + networking.hostName = lib.mkForce "dn-pre7780"; system.stateVersion = "24.11"; home-manager = { diff --git a/system/modules/gaming.nix b/system/modules/gaming.nix index 28588db..16e34a0 100644 --- a/system/modules/gaming.nix +++ b/system/modules/gaming.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: { nix = { diff --git a/system/modules/nvidia.nix b/system/modules/nvidia.nix index e3fe8cc..4f3026f 100644 --- a/system/modules/nvidia.nix +++ b/system/modules/nvidia.nix @@ -1,24 +1,26 @@ -{ ... }: +{ config, ... }: { services.xserver.videoDrivers = [ "nvidia" ]; - nvidia.open = false; - nvidia.modesetting.enable = true; + hardware = { + nvidia.open = false; + nvidia.modesetting.enable = true; - nvidia.powerManagement.enable = true; - nvidia.powerManagement.finegrained = true; + nvidia.powerManagement.enable = true; + nvidia.powerManagement.finegrained = true; - nvidia.nvidiaSettings = true; - nvidia.dynamicBoost.enable = true; - nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; + nvidia.nvidiaSettings = true; + nvidia.dynamicBoost.enable = true; + nvidia.package = config.boot.kernelPackages.nvidiaPackages.stable; - nvidia.prime = { - offload = { - enable = true; - enableOffloadCmd = true; + nvidia.prime = { + offload = { + enable = true; + enableOffloadCmd = true; + }; + # This may different between devices + intelBusId = "PCI:0:2:0"; + nvidiaBusId = "PCI:1:0:0"; }; - # This may different between devices - intelBusId = "PCI:0:2:0"; - nvidiaBusId = "PCI:1:0:0"; }; }