diff --git a/configs/packages/default.nix b/configs/packages/default.nix index 6a48d05..794307b 100644 --- a/configs/packages/default.nix +++ b/configs/packages/default.nix @@ -1,5 +1,7 @@ -{ pkgs, lib, ... }: -let hc = pkgs.callPackage {}; +{ pkgs, lib, ... }: +let + hc = pkgs.callPackage {}; + inherit (import ) nixpkgs-unstable; in { imports = [ ./krebs.nix @@ -97,7 +99,7 @@ in { audacity calibre inkscape - zoom-us # video conferencing + nixpkgs-unstable.zoom-us # video conferencing pdfgrep # search in pdf pdftk # pdf toolkit evince # for viewing pdf annotations diff --git a/configs/packages/writing.nix b/configs/packages/writing.nix index 813b6ba..e305b97 100644 --- a/configs/packages/writing.nix +++ b/configs/packages/writing.nix @@ -2,8 +2,6 @@ let inherit (import ) nixpkgs-unstable; - unstable = import nixpkgs-unstable {}; - zoteroStyle = { name, sha256 }: { name = "${name}.csl"; path = pkgs.fetchurl { @@ -70,7 +68,7 @@ in { libreoffice # gnumeric dia - unstable.pandoc + nixpkgs-unstable.pandoc # proselint asciidoctor wordnet diff --git a/lib/default.nix b/lib/default.nix index 96117c2..7796b1a 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -1,8 +1,9 @@ -{ - nixpkgs-unstable = builtins.fetchGit { +rec { + nixpkgs-src = builtins.fetchGit { url = "https://github.com/NixOS/nixpkgs"; - rev = "c40f06022a83d6f286dd2a906e1d5fefcc05dfa1"; + rev = "f3042e30785437f6cb2d99b15625b962fb96799f"; }; + nixpkgs-unstable = import nixpkgs-src { config.allowUnfree = true; }; sshPort = 22022; diff --git a/modules/retiolum.nix b/modules/retiolum.nix index 2917c43..c2e19b0 100644 --- a/modules/retiolum.nix +++ b/modules/retiolum.nix @@ -4,7 +4,7 @@ let netname = "retiolum"; cfg = config.networking.retiolum; in { - imports = [ "${(import ).nixpkgs-unstable}/nixos/modules/services/networking/tinc.nix" ]; + imports = [ "${(import ).nixpkgs-src}/nixos/modules/services/networking/tinc.nix" ]; disabledModules = [ "services/networking/tinc.nix" ]; options = { diff --git a/systems/wilde/configuration.nix b/systems/wilde/configuration.nix index 70fc8b1..1e893bb 100644 --- a/systems/wilde/configuration.nix +++ b/systems/wilde/configuration.nix @@ -1,9 +1,6 @@ { config, pkgs, lib, ... }: let inherit (import ) nixpkgs-unstable; - unstable = import nixpkgs-unstable { - config.allowUnfree = true; - }; in { imports = [ @@ -39,7 +36,7 @@ in nix.buildCores = 1; nix.maxJobs = 2; - environment.systemPackages = [ unstable.minecraft ]; + environment.systemPackages = [ nixpkgs-unstable.minecraft ]; boot.loader.systemd-boot = { enable = true;