From 71f3379ae2ed92e6ca473cb267ebe52c899e2e1e Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@pleshevski.ru>
Date: Thu, 6 Mar 2025 18:25:35 +0300
Subject: [PATCH] modules/nixos: use latest nixos-option to support flakes
---
modules/machine.nix | 2 +-
modules/nixos/configs/nix.nix | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/modules/machine.nix b/modules/machine.nix
index 41924bb..cd8b16b 100644
--- a/modules/machine.nix
+++ b/modules/machine.nix
@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ lib, ... }:
{
imports = [ ./common.nix ];
diff --git a/modules/nixos/configs/nix.nix b/modules/nixos/configs/nix.nix
index 47a1b25..1768fee 100644
--- a/modules/nixos/configs/nix.nix
+++ b/modules/nixos/configs/nix.nix
@@ -1,4 +1,4 @@
-{ lib, inputs, config, ... }:
+{ lib, inputs, config, pkgs, ... }:
let
inherit (builtins) elem;
@@ -24,6 +24,9 @@ in
};
config = {
+ environment.systemPackages =
+ lib.optional config.system.tools.nixos-option.enable pkgs.unstable.nixos-option;
+
nixpkgs.config.allowUnfreePredicate = lib.mkIf
(cfg.allowUnfreePackages != [ ])
(pkg: elem (lib.getName pkg) cfg.allowUnfreePackages);