From fb7500c6e9f0305f5e8338c1d56b87ad244b62fd Mon Sep 17 00:00:00 2001 From: Emmet Date: Mon, 1 Apr 2024 12:42:32 -0500 Subject: [PATCH] Updated system + overriding xz ver with impure evals --- flake.lock | 64 ++++++++++++++++++++------------- flake.nix | 15 +++++--- profiles/homelab/base.nix | 10 +++++- profiles/work/configuration.nix | 10 +++++- profiles/wsl/configuration.nix | 10 +++++- 5 files changed, 78 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 86eb2c9..dc04e51 100644 --- a/flake.lock +++ b/flake.lock @@ -150,11 +150,11 @@ "blocklist-hosts": { "flake": false, "locked": { - "lastModified": 1711027794, - "narHash": "sha256-aT+e3dh4rRL0uKGY95tqwIHV31OM7Mv8kctpNpDaI88=", + "lastModified": 1711673465, + "narHash": "sha256-VnMRgby5ONbUxP3xit4x8bFEMRAqoGRY8l+tqJZXSL4=", "owner": "StevenBlack", "repo": "hosts", - "rev": "cf3c7f5740192c9ebaa7270e5e487c6fa0f47859", + "rev": "f6d230e9a8fa05fb3f46107dac419eedcdd0fadd", "type": "github" }, "original": { @@ -481,11 +481,11 @@ ] }, "locked": { - "lastModified": 1711122977, - "narHash": "sha256-EnHux7wf7/7r+YMv8d/Ym1OTllp4sqqq0Bws1a4s2Zo=", + "lastModified": 1711915616, + "narHash": "sha256-co6LoFA+j6BZEeJNSR8nZ4oOort5qYPskjrDHBaJgmo=", "owner": "nix-community", "repo": "home-manager", - "rev": "19b87b9ae6ecfd81104a2a36ef8364f1de1b54b1", + "rev": "820be197ccf3adaad9a8856ef255c13b6cc561a6", "type": "github" }, "original": { @@ -519,11 +519,11 @@ "hyprland-plugins": { "flake": false, "locked": { - "lastModified": 1711047490, - "narHash": "sha256-uyUenHmRzOdXajeYWA70C2+uzDeiqkiMcaBr3uKs28s=", + "lastModified": 1711847900, + "narHash": "sha256-7lnDcHDZooMw6kTUuJOOHGGd4/VMfBiAgA+xx9qXr0M=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "adec334acfb453014cdff1e5f070bb7c1c4e4a9b", + "rev": "e45066d0741a1a4b9298a4c5ec43a5e57b059a4e", "type": "github" }, "original": { @@ -612,11 +612,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1711001935, - "narHash": "sha256-URtGpHue7HHZK0mrHnSf8wJ6OmMKYSsoLmJybrOLFSQ=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f77aa09916374aa3141cbc605c955626762c9a", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -627,11 +627,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1710951922, - "narHash": "sha256-FOOBJ3DQenLpTNdxMHR2CpGZmYuctb92gF0lpiirZ30=", + "lastModified": 1711668574, + "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f091af045dff8347d66d186a62d42aceff159456", + "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "type": "github" }, "original": { @@ -640,6 +640,21 @@ "type": "indirect" } }, + "nixpkgs-staging-next": { + "locked": { + "lastModified": 1711972879, + "narHash": "sha256-SyQawy0pGsSWPlBM/Lo/5Qi0TCxfx19cgtkUQGynVsU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "2f73b699a30bd1f976d55ee2c22176de288a9486", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "staging-next", + "type": "indirect" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1706487304, @@ -787,11 +802,11 @@ "org-yaap": { "flake": false, "locked": { - "lastModified": 1698161278, - "narHash": "sha256-as0mZLRoArfo1vMeqm/l1r4Cqy9ABi7gcjEupzXJyaw=", + "lastModified": 1711640914, + "narHash": "sha256-eWoRaE10QPOPeE0TnHBn3o+Hz6fX0yDZnfrqVlj1De8=", "owner": "tygrdev", "repo": "org-yaap", - "rev": "b3fa87454b1d96d1a2477ca9aae8976a2bbc5dc4", + "rev": "fcf675382d914f369591052ddb8440cfc714ce74", "type": "gitlab" }, "original": { @@ -877,6 +892,7 @@ "nix-straight": "nix-straight", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", + "nixpkgs-staging-next": "nixpkgs-staging-next", "org-nursery": "org-nursery", "org-side-tree": "org-side-tree", "org-timeblock": "org-timeblock", @@ -908,11 +924,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1711073443, - "narHash": "sha256-PpNb4xq7U5Q/DdX40qe7CijUsqhVVM3VZrhN0+c6Lcw=", + "lastModified": 1711937855, + "narHash": "sha256-jlfDBRtsLoqRNFxtQtG47wsrwVsQSV4AqoMgWG6Bvng=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "eec55ba9fcde6be4c63942827247e42afef7fafe", + "rev": "3f46a51b47f56c24b4d7e8db8fb8e73118923f96", "type": "github" }, "original": { @@ -954,11 +970,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1711106191, - "narHash": "sha256-WX1Tyb94jB3ksSQ5UtlTY/1UBsO7FlFNPjG3BXt9/0Q=", + "lastModified": 1711979457, + "narHash": "sha256-gIJNq0eIdddmEfiKoMS/5nl0Uk84uQ2qnHTwjmtnNGc=", "owner": "danth", "repo": "stylix", - "rev": "4da2d793e586f3f45a54fb9755ee9bf39d3cd52e", + "rev": "a0bdd9c15b23a5db48d29afe3b238333605c357c", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 8064182..32507ec 100644 --- a/flake.nix +++ b/flake.nix @@ -1,10 +1,10 @@ { description = "Flake of LibrePhoenix"; - outputs = inputs@{ self, nixpkgs, nixpkgs-stable, emacs-pin-nixpkgs, kdenlive-pin-nixpkgs, - home-manager, nix-doom-emacs, nix-straight, stylix, blocklist-hosts, - hyprland-plugins, rust-overlay, org-nursery, org-yaap, org-side-tree, - org-timeblock, phscroll, ... }: + outputs = inputs@{ self, nixpkgs, nixpkgs-staging-next, nixpkgs-stable, emacs-pin-nixpkgs, + kdenlive-pin-nixpkgs, home-manager, nix-doom-emacs, nix-straight, stylix, + blocklist-hosts, hyprland-plugins, rust-overlay, org-nursery, org-yaap, + org-side-tree, org-timeblock, phscroll, ... }: let # ---- SYSTEM SETTINGS ---- # systemSettings = { @@ -67,6 +67,10 @@ overlays = [ rust-overlay.overlays.default ]; }; + pkgs-staging-next = import nixpkgs-staging-next { + system = systemSettings.system; + }; + pkgs-stable = import nixpkgs-stable { system = systemSettings.system; config = { @@ -108,6 +112,7 @@ extraSpecialArgs = { # pass config variables from above inherit pkgs-stable; + inherit pkgs-staging-next; inherit pkgs-emacs; inherit pkgs-kdenlive; inherit systemSettings; @@ -134,6 +139,7 @@ specialArgs = { # pass config variables from above inherit pkgs-stable; + inherit pkgs-staging-next; inherit systemSettings; inherit userSettings; inherit (inputs) stylix; @@ -167,6 +173,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-23.11"; + nixpkgs-staging-next.url = "nixpkgs/staging-next"; emacs-pin-nixpkgs.url = "nixpkgs/f8e2ebd66d097614d51a56a755450d4ae1632df1"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; diff --git a/profiles/homelab/base.nix b/profiles/homelab/base.nix index a66ac09..a62cbdc 100644 --- a/profiles/homelab/base.nix +++ b/profiles/homelab/base.nix @@ -1,4 +1,4 @@ -{ lib, pkgs, systemSettings, userSettings, ... }: +{ lib, pkgs, pkgs-staging-next, systemSettings, userSettings, ... }: { imports = @@ -9,6 +9,14 @@ ( 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" diff --git a/profiles/work/configuration.nix b/profiles/work/configuration.nix index 7f71f46..4993aa1 100644 --- a/profiles/work/configuration.nix +++ b/profiles/work/configuration.nix @@ -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, lib, systemSettings, userSettings, ... }: +{ pkgs, pkgs-staging-next, lib, systemSettings, userSettings, ... }: { imports = [ ../../system/hardware-configuration.nix @@ -27,6 +27,14 @@ ../../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" diff --git a/profiles/wsl/configuration.nix b/profiles/wsl/configuration.nix index 9d83988..cc9532e 100644 --- a/profiles/wsl/configuration.nix +++ b/profiles/wsl/configuration.nix @@ -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, systemSettings, userSettings, ... }: +{ lib, pkgs, pkgs-staging-next, systemSettings, userSettings, ... }: with lib; let @@ -39,6 +39,14 @@ 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"