From 84e466bbef4af2af8a82c696552ccdffb49c2275 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Sat, 20 Jul 2024 22:34:32 +0100 Subject: [PATCH] flake: refactor trying again --- .gitignore | 2 +- flake.nix | 4 +++- overlay/default.nix | 3 --- {overlay/package => package}/config.org | 0 {overlay/package => package}/default.nix | 0 5 files changed, 4 insertions(+), 5 deletions(-) delete mode 100644 overlay/default.nix rename {overlay/package => package}/config.org (100%) rename {overlay/package => package}/default.nix (100%) diff --git a/.gitignore b/.gitignore index 36bdb2b..8ac11c6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ /* /**/*~ !/flake.* -!/overlay +!/package !/.gitignore !/README.org !/media diff --git a/flake.nix b/flake.nix index 70a9981..80669f9 100644 --- a/flake.nix +++ b/flake.nix @@ -18,7 +18,9 @@ ]; flake = { - overlays.default = final: _prev: import ./overlay final; + overlays.default = final: _prev: { + pankomacs = final.callPackage ./package { }; + }; }; perSystem = { pkgs, self', config, system, ... }: { diff --git a/overlay/default.nix b/overlay/default.nix deleted file mode 100644 index 1aa0655..0000000 --- a/overlay/default.nix +++ /dev/null @@ -1,3 +0,0 @@ -pkgs: { - pankomacs = pkgs.callPackage ./package { }; -} diff --git a/overlay/package/config.org b/package/config.org similarity index 100% rename from overlay/package/config.org rename to package/config.org diff --git a/overlay/package/default.nix b/package/default.nix similarity index 100% rename from overlay/package/default.nix rename to package/default.nix