From e16dd46796a4856af674a567fb2ff447404bd674 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Sun, 11 Jun 2023 14:26:19 +0200 Subject: [PATCH] 23.05@nord --- hosts/bolle/default.nix | 3 --- hosts/nord/default.nix | 3 --- hosts/nord/hardware-configuration.nix | 2 -- hosts/noximilien/default.nix | 3 --- profiles/desktop/steam.nix | 8 +++++--- 5 files changed, 5 insertions(+), 14 deletions(-) diff --git a/hosts/bolle/default.nix b/hosts/bolle/default.nix index bc2b23a..22edbb6 100644 --- a/hosts/bolle/default.nix +++ b/hosts/bolle/default.nix @@ -72,9 +72,6 @@ # System fonts # Nice to have when X-forwading on headless machines - # TODO: move? - #hardware.video.hidpi.enable = true; # highdpi (for nord only) - #fonts.fontconfig.hinting.enable = true; # lowdpi fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji fonts.fonts = with pkgs; [ diff --git a/hosts/nord/default.nix b/hosts/nord/default.nix index a127ff9..4c5745d 100644 --- a/hosts/nord/default.nix +++ b/hosts/nord/default.nix @@ -89,9 +89,6 @@ services.openssh.settings.X11Forwarding = true; # System fonts - # Nice to have when X-forwading on headless machines - hardware.video.hidpi.enable = true; # highdpi (TODO: for nord only? move?) - #fonts.fontconfig.hinting.enable = true; # lowdpi fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji fonts.fonts = with pkgs; [ diff --git a/hosts/nord/hardware-configuration.nix b/hosts/nord/hardware-configuration.nix index 5b82011..5cdbe56 100644 --- a/hosts/nord/hardware-configuration.nix +++ b/hosts/nord/hardware-configuration.nix @@ -36,6 +36,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - # high-resolution display - hardware.video.hidpi.enable = lib.mkDefault true; } diff --git a/hosts/noximilien/default.nix b/hosts/noximilien/default.nix index eea9d95..bf90645 100644 --- a/hosts/noximilien/default.nix +++ b/hosts/noximilien/default.nix @@ -145,9 +145,6 @@ # System fonts # Nice to have when X-forwading on headless machines - # TODO: move? - #hardware.video.hidpi.enable = true; # highdpi (for nord only) - #fonts.fontconfig.hinting.enable = true; # lowdpi fonts.fontDir.enable = true; # creates /run/current-system/sw/share/X11/fonts fonts.enableDefaultFonts = true; # dejavu, freefont, gyre, liberation, unifont, noto-fonts-emoji fonts.fonts = with pkgs; [ diff --git a/profiles/desktop/steam.nix b/profiles/desktop/steam.nix index 9e54cfd..e7a3af7 100644 --- a/profiles/desktop/steam.nix +++ b/profiles/desktop/steam.nix @@ -12,12 +12,13 @@ "steam-runtime" ]; + /** / #programs.java.enable = true; nixpkgs.config.packageOverrides = pkgs: { - # TODO: mesa, see https://sourcegraph.com/github.com/corngood/nixos-mesa-git/-/blob/configuration.nix steam = pkgs.steam.override { - withPrimus = config.hardware.nvidia.modesetting.enable; - withJava = config.programs.java.enable; + #withPrimus = config.hardware.nvidia.modesetting.enable; + #withJava = config.programs.java.enable; + #nativeOnly = true; #newStdcpp = true; #extraProfile = "export SDL_VIDEODRIVER=x11"; @@ -59,6 +60,7 @@ ]; }; }; + /**/ #services.joycond.enable = true;