diff --git a/base.nix b/base.nix index 7dc4554..0cf9acb 100644 --- a/base.nix +++ b/base.nix @@ -32,6 +32,9 @@ nixpkgs.config.allowUnfreePredicate = (pkg: true); nixpkgs.config.nonfreeLicensing = true; # used by ffmpeg + # TODO: per host? + hardware.enableRedistributableFirmware = true; + nix.settings.experimental-features = [ "nix-command" "flakes" diff --git a/flake.nix b/flake.nix index b336403..c544cd5 100644 --- a/flake.nix +++ b/flake.nix @@ -145,7 +145,7 @@ noximilien = mkConfig "noximilien" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]); bolle = mkConfig "bolle" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel ]); nord = mkConfig "nord" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel-cpu-only common-cpu-intel-sandy-bridge common-gpu-amd common-hidpi ]); - sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia-nonprime ]); + sopp = mkConfig "sopp" "pbsds.net" "x86_64-linux" (with nm; [ common-pc common-pc-ssd common-cpu-intel common-gpu-nvidia ]); }; homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let diff --git a/hosts/sopp/default.nix b/hosts/sopp/default.nix index 916c0fb..4139b8d 100644 --- a/hosts/sopp/default.nix +++ b/hosts/sopp/default.nix @@ -14,9 +14,9 @@ #hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.latest; #hardware.nvidia.modesetting.enable = false; # makes atom behave, but mpv refuses to start - # PRIME: - #hardware.nvidia.prime.intelBusId = "PCI:0:02:0"; - #hardware.nvidia.prime.nvidiaBusId = "PCI:1:00:0"; + # PRIME: (lspci) + hardware.nvidia.prime.intelBusId = "PCI:0:02:0"; + hardware.nvidia.prime.nvidiaBusId = "PCI:1:00:0"; imports = [ ./hardware-configuration.nix @@ -113,7 +113,13 @@ ]; # nvidia bad - nixpkgs.config.packageOverrides = (pkgs: { + nixpkgs.config.packageOverrides = lib.mkIf (!config.hardware.nvidia.prime.offload.enable) (pkgs: { + teams = pkgs.teams.overrideAttrs (old: rec { + postInstall = (old.postInstall or "") + '' + substituteInPlace $out/share/applications/teams.desktop \ + --replace 'Exec=teams' 'Exec=teams --disable-gpu' + ''; + }); discord = pkgs.discord.overrideAttrs (old: rec { desktopItem = old.desktopItem.override (old: { #exec = "${pkgs.coreutils}/bin/env NIXOS_OZONE_WL=1 ${old.exec}"; diff --git a/users/pbsds/home/profiles/desktop.nix b/users/pbsds/home/profiles/desktop.nix index eb5ebd5..2641657 100644 --- a/users/pbsds/home/profiles/desktop.nix +++ b/users/pbsds/home/profiles/desktop.nix @@ -18,6 +18,9 @@ element-desktop#-wayland slack telegram-desktop + teams + zoom-us + f3d firefox zotero diff --git a/users/pbsds/home/profiles/shell.nix b/users/pbsds/home/profiles/shell.nix index c97a5d9..4a1f62e 100644 --- a/users/pbsds/home/profiles/shell.nix +++ b/users/pbsds/home/profiles/shell.nix @@ -40,7 +40,7 @@ home.shellAliases.dc = "cd"; programs.direnv.enable = true; - programs.direnv.nix-direnv.enable = true; + #programs.direnv.nix-direnv.enable = true; programs.tealdeer.enable = true;