From c28efb453df4d7f125dc69a6c89bef9c66f69500 Mon Sep 17 00:00:00 2001 From: Soispha Date: Mon, 10 Apr 2023 12:32:27 +0200 Subject: Fix(treewide): Make system compile again --- system/default.nix | 3 ++- system/impermanence/default.nix | 7 +------ system/nixpkgs/default.nix | 6 ++++++ 3 files changed, 9 insertions(+), 7 deletions(-) create mode 100644 system/nixpkgs/default.nix (limited to 'system') diff --git a/system/default.nix b/system/default.nix index a417aecc..64073fb8 100644 --- a/system/default.nix +++ b/system/default.nix @@ -3,7 +3,7 @@ ./boot ./fileSystemLayouts ./font - ./impermanence + #./impermanence already at flake level imported ./locale ./sound ./users # the position of this item is fully arbitrary @@ -11,6 +11,7 @@ ./hardware ./services ./tempfiles + ./nixpkgs ]; # remove all bloat, nixos installs by default environment = { diff --git a/system/impermanence/default.nix b/system/impermanence/default.nix index 2d62dc94..71b023ff 100644 --- a/system/impermanence/default.nix +++ b/system/impermanence/default.nix @@ -1,9 +1,4 @@ -{impermanence, ...}: { - imports = [ - # impermanence.nixosModules.impermanence - "${impermanence}/nixos.nix" - ]; - +{...}: { # needed for the hm impermanence config programs.fuse.userAllowOther = true; diff --git a/system/nixpkgs/default.nix b/system/nixpkgs/default.nix new file mode 100644 index 00000000..f226faa2 --- /dev/null +++ b/system/nixpkgs/default.nix @@ -0,0 +1,6 @@ +# vim: ts=2 +{lib, ...}: { + nixpkgs.config = { + #contentAddressedByDefault = true; + }; +} -- cgit 1.4.1