diff --git a/entropy/nixos/configuration.nix b/entropy/nixos/configuration.nix index 04a7ed1..3b12a74 100644 --- a/entropy/nixos/configuration.nix +++ b/entropy/nixos/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’). -{ config, pkgs, unstable, ... }: +{ config, pkgs, unstable, lib, ... }: #let # use unstable nixpkgs for some specific packages that are still in-dev: @@ -167,7 +167,7 @@ programs.gnupg.agent = { enable = true; enableSSHSupport = true; - pinentryFlavor = "curses"; + pinentryPackage = lib.mkForce pkgs.pinentry-curses; }; # ------------ programs ----------------------------------------------------- @@ -238,7 +238,6 @@ nushell ## password management pass - pinentry-curses ## admin foo ansible ## mail @@ -321,6 +320,7 @@ ## video and media applications zoom-us #unstable.teams + spotify mpv ffmpeg-full musikcube diff --git a/entropy/nixos/flake.lock b/entropy/nixos/flake.lock index a383fcd..0265589 100644 --- a/entropy/nixos/flake.lock +++ b/entropy/nixos/flake.lock @@ -2,9 +2,7 @@ "nodes": { "mlir": { "inputs": { - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { "lastModified": 1710148658, @@ -23,11 +21,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1710123225, - "narHash": "sha256-j3oWlxRZxB7cFsgEntpH3rosjFHRkAo/dhX9H3OfxtY=", + "lastModified": 1710622004, + "narHash": "sha256-6zR642tXcZzzk3C8BHxlCrR0yh8z8zMXLiuXpWDIpX0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "ad2fd7b978d5e462048729a6c635c45d3d33c9ba", + "rev": "968952f950a59dee9ed1e8799dda38c6dfa1bad3", "type": "github" }, "original": { @@ -52,21 +50,36 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { "mlir": "mlir", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "unstable": "unstable" } }, "unstable": { "locked": { - "lastModified": 1709961763, - "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=", + "lastModified": 1710631334, + "narHash": "sha256-rL5LSYd85kplL5othxK5lmAtjyMOBg390sGBTb3LRMM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34", + "rev": "c75037bbf9093a2acb617804ee46320d6d1fea5a", "type": "github" }, "original": { diff --git a/entropy/nixos/flake.nix b/entropy/nixos/flake.nix index d598f37..a3e8aef 100644 --- a/entropy/nixos/flake.nix +++ b/entropy/nixos/flake.nix @@ -13,7 +13,7 @@ mlir = { #url = "github:Feliix42/mlir.nix/main"; url = "github:Feliix42/mlir.nix/circt"; - inputs.nixpkgs.follows = "nixpkgs"; + # inputs.nixpkgs.follows = "nixpkgs"; }; };