From 097185ce4fc74c28becdb71d6dc6f0df1d67060b Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Sun, 24 Nov 2024 23:40:24 +0100
Subject: [PATCH 1/5] removed dockerignore, flake outputs plcom package by
 default

---
 .dockerignore | 10 ----------
 flake.nix     | 16 +++-------------
 2 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index d1f2474..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,10 +0,0 @@
-target/
-wallpapers.json
-
-.idea/
-.vscode/
-.DS_Store
-.gitea/
-readme.md
-Dockerfile
-.dockerignore
diff --git a/flake.nix b/flake.nix
index db769f9..aa33ba8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,21 +54,11 @@
 
       in
       {
-        apps.default = {
-          type = "app";
-          program = "${plcom}/bin/plcom";
-        };
-
-        packages = {
-          inherit plcom;
-          default = plcom;
-        };
+        packages.system.default = plcom;
 
         checks = {
-          inherit
-            # Build the crate as part of `nix flake check` for convenience
-            plcomBinary
-            ;
+          # Build the crate as part of `nix flake check` for convenience
+          inherit plcomBinary;
         };
 
       }

From 3924b4845d1cbae23c9f4483babddc5d667fa11e Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Wed, 27 Nov 2024 22:19:20 +0100
Subject: [PATCH 2/5] flake: output package for system

---
 flake.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index aa33ba8..5f1c3ce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,7 +54,10 @@
 
       in
       {
-        packages.system.default = plcom;
+        packages.${system} = {
+          plcom = plcom;
+          default = plcom;
+        };
 
         checks = {
           # Build the crate as part of `nix flake check` for convenience

From 958fa9baed280c792b9bbf0821205cc0d1ac457e Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Wed, 27 Nov 2024 23:29:42 +0100
Subject: [PATCH 3/5] flake: recusrive packages, apps

---
 flake.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5f1c3ce..b89ea49 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,7 @@
 
   outputs =
     {
+      self,
       nixpkgs,
       crane,
       flake-utils,
@@ -47,15 +48,13 @@
           craneLib = craneLib;
         };
 
-        # How to launch binary
-        plcom = pkgs.writeShellScriptBin "plcom" ''
-          PLCOM_ASSETS_PATH=${plcomAssets} ${plcomBinary}/bin/plcom
-        '';
-
       in
       {
-        packages.${system} = {
-          plcom = plcom;
+        packages = rec {
+          # How to launch binary
+          plcom = pkgs.writeShellScriptBin "plcom" ''
+            PLCOM_ASSETS_PATH=${plcomAssets} ${plcomBinary}/bin/plcom
+          '';
           default = plcom;
         };
 
@@ -64,6 +63,11 @@
           inherit plcomBinary;
         };
 
+        apps = rec {
+          plcomBinary = flake-utils.lib.mkApp { drv = self.packages.${system}.plcom; };
+          default = plcomBinary;
+        };
+
       }
     );
 }

From 97ee77f9bbac1fcc176bb6b03433676a4bfff468 Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Wed, 27 Nov 2024 23:48:14 +0100
Subject: [PATCH 4/5] flake: removed apps

---
 flake.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index b89ea49..74e0a02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,7 +13,6 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       crane,
       flake-utils,
@@ -63,11 +62,6 @@
           inherit plcomBinary;
         };
 
-        apps = rec {
-          plcomBinary = flake-utils.lib.mkApp { drv = self.packages.${system}.plcom; };
-          default = plcomBinary;
-        };
-
       }
     );
 }

From 3f1abb9956acc297182b35f2d014e9d684b4bffc Mon Sep 17 00:00:00 2001
From: Philippe Loctaux <p@philippeloctaux.com>
Date: Thu, 28 Nov 2024 21:42:57 +0100
Subject: [PATCH 5/5] flake: avoid `rec`

---
 flake.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 74e0a02..1120f5f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,13 +47,15 @@
           craneLib = craneLib;
         };
 
+        # How to launch binary
+        plcom = pkgs.writeShellScriptBin "plcom" ''
+          PLCOM_ASSETS_PATH=${plcomAssets} ${plcomBinary}/bin/plcom
+        '';
+
       in
       {
-        packages = rec {
-          # How to launch binary
-          plcom = pkgs.writeShellScriptBin "plcom" ''
-            PLCOM_ASSETS_PATH=${plcomAssets} ${plcomBinary}/bin/plcom
-          '';
+        packages = {
+          inherit plcom;
           default = plcom;
         };