From c52c7f314ccadcc2fcd91e28c8fd1b88f6d5ce0c Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 18 Oct 2024 17:07:46 +0200 Subject: refactor(modules): Move all system modules to `by-name` From now on all modules should be added to the new `by-name` directory. This should help remove the (superficial and utterly useless) distinction between `home-manager` and `NixOS` modules. --- modules/system/nixpkgs/config.nix | 28 ---------------------------- modules/system/nixpkgs/default.nix | 17 ----------------- 2 files changed, 45 deletions(-) delete mode 100644 modules/system/nixpkgs/config.nix delete mode 100644 modules/system/nixpkgs/default.nix (limited to 'modules/system/nixpkgs') diff --git a/modules/system/nixpkgs/config.nix b/modules/system/nixpkgs/config.nix deleted file mode 100644 index 1a24444d..00000000 --- a/modules/system/nixpkgs/config.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - cfg, - myPkgs, - lib, - ... -}: let - myPkgsOverlay = self: super: myPkgs; -in { - nixpkgs = { - hostPlatform = cfg.systemName; - - overlays = [ - myPkgsOverlay - ]; - - config = { - # TODO: this fails because of the root tempsize, which should be increased - # contentAddressedByDefault = true; - - hostSystem = cfg.systemName; - - allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "pypemicro" # required by pynitrokey - ]; - }; - }; -} diff --git a/modules/system/nixpkgs/default.nix b/modules/system/nixpkgs/default.nix deleted file mode 100644 index eda3ac89..00000000 --- a/modules/system/nixpkgs/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ - lib, - config, - ... -} @ args: let - cfg = config.soispha.nixpkgs; -in { - options.soispha.nixpkgs = { - enable = lib.mkEnableOption "Nixpkgs config"; - systemName = lib.mkOption { - description = "The name of the system."; - example = "x86_64-linux"; - type = lib.types.str; - }; - }; - config = lib.mkIf cfg.enable (import ./config.nix (args // {inherit cfg;})); -} -- cgit 1.4.1