clean up flake for nix flake check

Author: idrisr

.envrc

@@ -1 +0,0 @@
-use flake

app/Main.hs

@@ -13,6 +13,11 @@ import System.IO
 import Command
 import Data.ByteString (ByteString)
 
+-- TODO
+-- remove bag pages
+-- remove current cover
+-- option to put newfile in CWD or in same dir as input file
+
 runCommand :: [String] -> IO
         ( S.OutputStream ByteString
         , S.InputStream ByteString

flake.nix

@@ -1,76 +1,71 @@
 {
-  inputs.nixpkgs.url = "github:nixos/nixpkgs/23.11";
-  inputs.flake-utils.url = "github:numtide/flake-utils";
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/23.11";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
 
   outputs = { nixpkgs, self, flake-utils }:
-    flake-utils.lib.eachDefaultSystem (system:
-      let
-        compiler = "ghc948";
-        hPkgs = pkgs.haskell.packages."${compiler}";
-        devTools = with pkgs; [
-          asciinema
-          asciinema-agg
-          cabal2nix
-          imagemagick
-          zlib
-        ];
+    # flake-utils.lib.eachDefaultSystem (system:
+    let
+      compiler = "ghc948";
+      system = flake-utils.lib.system.x86_64-linux;
+      hPkgs = pkgs.haskell.packages."${compiler}";
+      devTools = with pkgs; [
+        asciinema
+        asciinema-agg
+        cabal2nix
+        imagemagick
+        zlib
+      ];
 
-        haskDevTools = with hPkgs; [
-          ghc
-          ghcid
-          fourmolu
-          hlint
-          haskell-language-server
-          implicit-hie
-          retrie
-          cabal-install
-        ];
+      haskDevTools = with hPkgs; [
+        ghc
+        ghcid
+        fourmolu
+        hlint
+        haskell-language-server
+        implicit-hie
+        retrie
+        cabal-install
+      ];
 
-        tools = devTools ++ haskDevTools;
+      tools = devTools ++ haskDevTools;
 
-        pkgs = import nixpkgs {
-          inherit system;
-          config = { allowUnfree = true; };
-        };
-
-        pdftc = pkgs.callPackage ./packages/pdftc.nix { };
-        awscost = pkgs.callPackage ./packages/awscost.nix { };
-        booknote = pkgs.callPackage ./packages/booknote.nix { inherit pdftc; };
-        epubthumb = pkgs.callPackage ./packages/epubthumb.nix { };
-        mdtopdf = pkgs.callPackage ./packages/mdtopdf.nix { };
-        roamamer = pkgs.callPackage ./packages/roamamer.nix { };
-        seder = pkgs.callPackage ./packages/seder.nix { };
-        transcribe = pkgs.callPackage ./packages/transcribe.nix { };
+      pkgs = import nixpkgs {
+        inherit system;
+        overlays = [ self.overlays.all ];
+      };
 
-        mkApp = p:
-          let name = pkgs.lib.getName p;
-          in {
-            type = "app";
-            program = "${p}/bin/${name}";
-          };
-        newcover2 = with pkgs; haskell.packages.${compiler}.callPackage ./. { };
+    in {
+      devShells.${system}.default = pkgs.mkShell {
+        buildInputs = tools;
+        LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath tools;
+      };
 
-      in {
-        apps = {
-          awscost = mkApp awscost;
-          booknote = mkApp booknote;
-          epubthumb = mkApp epubthumb;
-          mdtopdf = mkApp mdtopdf;
-          pdftc = mkApp pdftc;
-          roamamer = mkApp roamamer;
-          seder = mkApp seder;
-          transcribe = mkApp transcribe;
-        };
-
-        devShells.default = pkgs.mkShell {
-          buildInputs = tools;
-          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath tools;
-        };
+      packages.${system} = with pkgs; {
+        inherit awscost;
+        inherit booknote;
+        inherit epubthumb;
+        inherit mdtopdf;
+        inherit newcover;
+        inherit pdftc;
+        inherit roamamer;
+        inherit seder;
+        inherit transcribe;
+      };
 
-        packages = {
-          default = newcover2;
-          inherit pdftc;
+      overlays = {
+        all = final: prev: {
+          awscost = prev.callPackage ./packages/awscost.nix { };
+          booknote = prev.callPackage ./packages/booknote.nix { };
+          epubthumb = prev.callPackage ./packages/epubthumb.nix { };
+          mdtopdf = prev.callPackage ./packages/mdtopdf.nix { };
+          newcover = prev.haskell.packages.${compiler}.callPackage ./. { };
+          pdftc = prev.callPackage ./packages/pdftc.nix { };
+          roamamer = prev.callPackage ./packages/roamamer.nix { };
+          seder = prev.callPackage ./packages/seder.nix { };
+          transcribe = prev.callPackage ./packages/transcribe.nix { };
         };
-        overlays = import ./overlay.nix;
-      });
+      };
+    };
 }

overlay.nix

@@ -1,9 +1,9 @@
 final: prev: rec {
-  pdftc = prev.callPackage ./packages/pdftc.nix { };
   awscost = prev.callPackage ./packages/awscost.nix { };
   booknote = prev.callPackage ./packages/booknote.nix { inherit pdftc; };
   epubthumb = prev.callPackage ./packages/epubthumb.nix { };
   mdtopdf = prev.callPackage ./packages/mdtopdf.nix { };
+  pdftc = prev.callPackage ./packages/pdftc.nix { };
   roamamer = prev.callPackage ./packages/roamamer.nix { };
   seder = prev.callPackage ./packages/seder.nix { };
   transcribe = prev.callPackage ./packages/transcribe.nix { };