diff --git a/overlays/default.nix b/overlays/default.nix index 5d92b59..45f0a1d 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -1,13 +1,13 @@ { inputs, ... }: { - # When applied, the stable nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.stable' + # Additional package sets are accessible through `pkgs.`. stable = final: _prev: { stable = import inputs.nixpkgs-stable { system = final.stdenv.hostPlatform.system; config.allowUnfree = true; }; }; - # When applied, the master nixpkgs set (declared in the flake inputs) will be accessible through 'pkgs.master' + master = final: _prev: { master = import inputs.nixpkgs-master { system = final.stdenv.hostPlatform.system; @@ -15,5 +15,14 @@ }; }; + # Baseline x86-64 (v1) packages for prebuilt applications that should not + # inherit an x86-64-v3 host platform. + x86-v1 = final: _prev: { + x86-v1 = import inputs.nixpkgs { + system = final.stdenv.hostPlatform.system; + config.allowUnfree = true; + }; + }; + patches = import ./patches; } diff --git a/users/richie/home/gui/comms.nix b/users/richie/home/gui/comms.nix index 3f54acc..a19d952 100644 --- a/users/richie/home/gui/comms.nix +++ b/users/richie/home/gui/comms.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - home.packages = with pkgs; [ + home.packages = with pkgs.x86-v1; [ discord-canary signal-desktop slack diff --git a/users/richie/home/gui/default.nix b/users/richie/home/gui/default.nix index 4a944f9..12c964c 100644 --- a/users/richie/home/gui/default.nix +++ b/users/richie/home/gui/default.nix @@ -14,7 +14,7 @@ gimp mediainfo obs-studio - obsidian + x86-v1.obsidian prismlauncher prusa-slicer qalculate-gtk diff --git a/users/richie/home/gui/vscode/default.nix b/users/richie/home/gui/vscode/default.nix index d7c8ca8..b1925c9 100644 --- a/users/richie/home/gui/vscode/default.nix +++ b/users/richie/home/gui/vscode/default.nix @@ -13,7 +13,7 @@ in programs.vscode = { enable = true; - package = pkgs.vscode; + package = pkgs.x86-v1.vscode; mutableExtensionsDir = true; }; }