From 3e63d485143100e13ff87502f2740170de9a3f4b Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Fri, 9 Sep 2022 23:18:05 +0100
Subject: [PATCH] Review suggestion fixes

---
 checks.nix |  5 +++--
 flake.nix  | 20 +++++++++++---------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/checks.nix b/checks.nix
index b949d64..608a36c 100644
--- a/checks.nix
+++ b/checks.nix
@@ -2,6 +2,7 @@
 { self, nixpkgs, emacs-overlay, ... }@inputs:
 
 let
+  inherit (self.outputs.packages.${system}) doom-emacs-example;
   pkgs = import nixpkgs {
     inherit system;
     # we are not using emacs-overlay's flake.nix here,
@@ -32,8 +33,8 @@ in
       };
     };
   }).activationPackage;
-  init-example-el = self.outputs.packages.${system}.doom-emacs;
-  init-example-el-emacsGit = self.outputs.packages.${system}.doom-emacs.override {
+  init-example-el = doom-emacs-example;
+  init-example-el-emacsGit = doom-emacs-example.override {
     emacsPackages = with pkgs; emacsPackagesFor emacsGit;
   };
 }
diff --git a/flake.nix b/flake.nix
index 61e92ae..b749ac0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -87,15 +87,15 @@
     flake-compat.flake = false;
   };
 
-  outputs = { self, nixpkgs, flake-utils, emacs-overlay, ... }@inputs:
-    let inherit (flake-utils.lib) eachDefaultSystem eachSystem;
+  outputs = { self, nixpkgs, flake-utils, ... }@inputs:
+    let inherit (flake-utils.lib) eachDefaultSystem mkApp;
     in eachDefaultSystem (system:
       let pkgs = import nixpkgs { inherit system; };
       in {
         apps = {
-          default = self.outputs.apps.${system}.doom-emacs;
-          doom-emacs = flake-utils.lib.mkApp {
-            drv = self.outputs.packages.${system}.doom-emacs;
+          default = self.outputs.apps.${system}.doom-emacs-example;
+          doom-emacs-example = mkApp {
+            drv = self.outputs.packages.${system}.doom-emacs-example;
             exePath = "/bin/emacs";
           };
         };
@@ -105,14 +105,16 @@
             [ (pkgs.python3.withPackages (ps: with ps; [ PyGithub ])) ];
         };
 
-        # TODO: remove this after NixOS 23.05 is released
         package = { ... }@args:
-          pkgs.lib.warn "Deprecated, please use `packages.${system}.default` instead!"
+          pkgs.lib.warn ''
+            Deprecated, will be removed after NixOS 23.05 release.
+            Please use `packages.${system}.default` instead!
+          ''
           (pkgs.callPackage self args);
 
         packages = {
-          default = self.outputs.packages.${system}.doom-emacs;
-          doom-emacs = pkgs.callPackage self {
+          default = self.outputs.packages.${system}.doom-emacs-example;
+          doom-emacs-example = pkgs.callPackage self {
             doomPrivateDir = ./test/doom.d;
           };
         };