Updated to latest nixos-unstable with xz trojan fix

This commit is contained in:
Emmet 2024-04-03 14:46:38 -05:00
parent 99fe2336c5
commit 4e4aeba29e
5 changed files with 31 additions and 75 deletions

View file

@ -1,4 +1,4 @@
{ lib, pkgs, pkgs-staging-next, systemSettings, userSettings, ... }:
{ lib, pkgs, systemSettings, userSettings, ... }:
{
imports =
@ -9,14 +9,6 @@
( import ../../system/app/docker.nix {storageDriver = null; inherit pkgs userSettings lib;} )
];
# xz trojan https://github.com/NixOS/nixpkgs/issues/300055
system.replaceRuntimeDependencies = [
{
original = pkgs.xz;
replacement = pkgs-staging-next.xz;
}
];
# Fix nix path
nix.nixPath = [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixos-config=$HOME/dotfiles/system/configuration.nix"

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ pkgs, pkgs-staging-next, lib, systemSettings, userSettings, ... }:
{ pkgs, lib, systemSettings, userSettings, ... }:
{
imports =
[ ../../system/hardware-configuration.nix
@ -27,14 +27,6 @@
../../system/style/stylix.nix
];
# xz trojan https://github.com/NixOS/nixpkgs/issues/300055
system.replaceRuntimeDependencies = [
{
original = pkgs.xz;
replacement = pkgs-staging-next.xz;
}
];
# Fix nix path
nix.nixPath = [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixos-config=$HOME/dotfiles/system/configuration.nix"
@ -64,6 +56,7 @@
# Networking
networking.hostName = systemSettings.hostname; # Define your hostname.
networking.networkmanager.enable = true; # Use networkmanager
networking.networkmanager.wifi.backend = "iwd"; # wpa_supplicant broken :(
# Timezone and locale
time.timeZone = systemSettings.timezone; # time zone
@ -97,6 +90,7 @@
git
cryptsetup
home-manager
wpa_supplicant
];
# I use zsh btw

View file

@ -2,7 +2,7 @@
# your system. Help is available in the configuration.nix(5) man page
# and in the NixOS manual (accessible by running nixos-help).
{ lib, pkgs, pkgs-staging-next, systemSettings, userSettings, ... }:
{ lib, pkgs, systemSettings, userSettings, ... }:
with lib;
let
@ -39,14 +39,6 @@ in
};
# xz trojan https://github.com/NixOS/nixpkgs/issues/300055
system.replaceRuntimeDependencies = [
{
original = pkgs.xz;
replacement = pkgs-staging-next.xz;
}
];
# Fix nix path
nix.nixPath = [ "nixpkgs=/nix/var/nix/profiles/per-user/root/channels/nixos"
"nixos-config=$HOME/dotfiles/system/configuration.nix"