restructure pkgs

16 files changed, 92 insertions, 57 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index aec97a3..176d627 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,37 +1,35 @@
-pkgs:
+super:
 
 let
-  mozillaAddons = pkgs.callPackage ./mozilla/addons {
-    inherit (pkgs.nur.repos.rycee.firefox-addons) buildFirefoxXpiAddon;
-  };
-  gitignores = pkgs.callPackage ./gitignore { };
-  icons = pkgs.callPackage ./icons { };
-  personal =
-    # lib
-    {
-      lib = import ./lib { inherit (pkgs) lib; };
-    } //
-    # css
-    {
-      line-awesome-css = pkgs.callPackage ./css/lineAwesome { };
-    } //
-    # mozilla packages
-    mozillaAddons // {
-      arkenfoxUserJS = pkgs.callPackage ./mozilla/user-js/arkenfox.nix { };
-      thunderbirdUserJS =
-        pkgs.callPackage ./mozilla/user-js/thunderbird.nix { };
-    } //
-    # font metadata
-    {
-      fontawesomeMetadata = pkgs.callPackage ./fontMetadata/fontawesome.nix { };
+  self = {
+    barista = super.callPackage ./barista {
+      fontawesomeMetadata = self.static.fontMetadata.fontawesome;
       materialDesignIconsMetadata =
-        pkgs.callPackage ./fontMetadata/materialDesignIcons.nix { };
-    } //
-    # miscellaneous
-    {
-      barista = pkgs.callPackage ./barista {
-        inherit (personal) fontawesomeMetadata materialDesignIconsMetadata;
+        self.static.fontMetadata.materialDesignIcons;
+    };
+
+    lib = import ./lib { inherit (super) lib; };
+
+    lockscreen = super.callPackage ./lockscreen { };
+
+    firefoxAddons = super.callPackage ./firefoxAddons {
+      inherit (super.nur.repos.rycee.firefox-addons) buildFirefoxXpiAddon;
+    };
+
+    static = {
+      css = { lineAwesome = super.callPackage ./static/css/lineAwesome { }; };
+      fontMetadata = {
+        fontawesome = super.callPackage ./static/fontMetadata/fontawesome { };
+        materialDesignIcons =
+          super.callPackage ./static/fontMetadata/materialDesignIcons { };
+      };
+      gitignore = super.callPackage ./static/gitignore { };
+      icons = super.callPackage ./static/icons { };
+      userjs = {
+        arkenfox = super.callPackage ./static/userjs/arkenfox { };
+        thunderbird = super.callPackage ./static/userjs/thunderbird { };
       };
-      lockscreen = pkgs.callPackage ./lockscreen { };
-    } // gitignores // icons;
-in personal
+      wallpapers = super.callPackage ./static/wallpapers { };
+    };
+  };
+in self
diff --git a/pkgs/mozilla/addons/addons.json b/pkgs/firefoxAddons/addons.json
index d39900d..d39900d 100644
--- a/pkgs/mozilla/addons/addons.json
+++ b/pkgs/firefoxAddons/addons.json
diff --git a/pkgs/mozilla/addons/default.nix b/pkgs/firefoxAddons/default.nix
index f87acb5..f87acb5 100644
--- a/pkgs/mozilla/addons/default.nix
+++ b/pkgs/firefoxAddons/default.nix
diff --git a/pkgs/gitignore/default.nix b/pkgs/gitignore/default.nix
deleted file mode 100644
index fbf2d2e..0000000
--- a/pkgs/gitignore/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ fetchurl }:
-
-let
-  fetch-gitignore = module: sha256:
-    let url = "https://www.toptal.com/developers/gitignore/api/" + module;
-        name = module + ".gitignore";
-    in fetchurl { inherit url sha256 name; };
-in {
-  emacsGitignore = fetch-gitignore "emacs"
-    "sha256:34LaJsGa5fFSMjE7l8JgQAmH8f07jcQmsaOdPVctHMk=";
-  linuxGitignore = fetch-gitignore "linux"
-    "sha256:Az39kpxJ1pG0T+3KUwx217+f+L8FQEWzwvRFSty8cJU=";
-  direnvGitignore = fetch-gitignore "direnv"
-    "sha256:CK47JLrsjf9yyjGAUfhjxLns0r1jDYgSBsp6LN0Yut8=";
-  fetcherGitignore = fetch-gitignore;
-}
diff --git a/pkgs/css/lineAwesome/default.nix b/pkgs/static/css/lineAwesome/default.nix
index 15946e6..b1376fe 100644
--- a/pkgs/css/lineAwesome/default.nix
+++ b/pkgs/static/css/lineAwesome/default.nix
@@ -12,8 +12,8 @@ stdenv.mkDerivation rec {
 
   phases = [ "installPhase" ];
   installPhase = ''
-    cp $src $out
-    substituteInPlace $out --replace '../fonts' '${fontsRelativeDirectory}' \
-                           --replace 'font-display: auto' 'font-display: ${fontDisplay}'
+    cp "$src" "$out"
+    substituteInPlace "$out" --replace '../fonts' '${fontsRelativeDirectory}' \
+                             --replace 'font-display: auto' 'font-display: ${fontDisplay}'
   '';
 }
diff --git a/pkgs/fontMetadata/fontawesome.nix b/pkgs/static/fontMetadata/fontawesome/default.nix
index a54537e..a54537e 100644
--- a/pkgs/fontMetadata/fontawesome.nix
+++ b/pkgs/static/fontMetadata/fontawesome/default.nix
diff --git a/pkgs/fontMetadata/materialDesignIcons.nix b/pkgs/static/fontMetadata/materialDesignIcons/default.nix
index fb24f3c..fb24f3c 100644
--- a/pkgs/fontMetadata/materialDesignIcons.nix
+++ b/pkgs/static/fontMetadata/materialDesignIcons/default.nix
diff --git a/pkgs/static/gitignore/default.nix b/pkgs/static/gitignore/default.nix
new file mode 100644
index 0000000..ac825a5
--- /dev/null
+++ b/pkgs/static/gitignore/default.nix
@@ -0,0 +1,12 @@
+{ fetchurl, lib }:
+
+let
+  fetchGitignore = module: sha256:
+    let
+      url = "https://www.toptal.com/developers/gitignore/api/" + module;
+      name = module + ".gitignore";
+    in fetchurl { inherit url sha256 name; };
+  sources = lib.importJSON ./sources.json;
+in {
+  fetcher = fetchGitignore;
+} // builtins.mapAttrs fetchGitignore sources
diff --git a/pkgs/static/gitignore/sources.json b/pkgs/static/gitignore/sources.json
new file mode 100644
index 0000000..a46ff9e
--- /dev/null
+++ b/pkgs/static/gitignore/sources.json
@@ -0,0 +1,6 @@
+{
+    "direnv": "CK47JLrsjf9yyjGAUfhjxLns0r1jDYgSBsp6LN0Yut8=",
+    "emacs" : "34LaJsGa5fFSMjE7l8JgQAmH8f07jcQmsaOdPVctHMk=",
+    "latex" : "yumKOkYA44Mnfm7giSDWKFEGSmP8/1xVbcSQCfc5uBA=",
+    "linux" : "Az39kpxJ1pG0T+3KUwx217+f+L8FQEWzwvRFSty8cJU="
+}
diff --git a/pkgs/icons/default.nix b/pkgs/static/icons/default.nix
index 3f1f3bf..a98aee9 100644
--- a/pkgs/icons/default.nix
+++ b/pkgs/static/icons/default.nix
@@ -1,14 +1,14 @@
 { fetchurl }:
 {
-	netflixIcon = fetchurl {
+	netflix = fetchurl {
 		url = "https://www.vectorlogo.zone/logos/netflix/netflix-icon.svg";
 		sha256 = "0b4gqhw9y62fm72x61q03yzbllgfxpkjbbsdvj7d5wg3jshjkgdb";
 	};
-	mubiIcon = fetchurl {
+	mubi = fetchurl {
 		url = "https://mubi.com/logo";
 		sha256 = "1h6qi579dcmd7l9mmwq2c4y67lbpkfjwq19kivfnfxwr38f769h4";
 	};
-	deezerIcon = fetchurl {
+	deezer = fetchurl {
 		url = "https://raw.githubusercontent.com/edent/SuperTinyIcons/master/images/svg/deezer.svg";
 		sha256 = "1qcj1gqz8gc9cwlj4cl6yj5ik1vz4ya6qcncr5fbciprzaaf3pg9";
 	};
diff --git a/pkgs/icons/generate-package.sh b/pkgs/static/icons/generate.sh
index bf34c84..b5df4ab 100755
--- a/pkgs/icons/generate-package.sh
+++ b/pkgs/static/icons/generate.sh
@@ -1,4 +1,4 @@
-icons=$(cat icons.txt)
+icons=$(cat urls.txt)
 
 echo '{ fetchurl }:' | tee default.nix
 echo '{' | tee -a default.nix
@@ -6,6 +6,7 @@ while read -r line; do
     name=$(echo $line | cut -f1 -d' ')
     url=$(echo $line | cut -f2 -d' ')
     sha256=$(nix-prefetch-url $url 2>/dev/null)
-    echo -e "\t${name}Icon = fetchurl {\n\t\turl = \"$url\";\n\t\tsha256 = \"$sha256\";\n\t};" | tee -a default.nix
+    echo -e "\t${name} = fetchurl {\n\t\turl = \"$url\";\n\t\tsha256 = \"$sha256\";\n\t};" | tee -a default.nix
 done <<< $icons
 echo '}' | tee -a default.nix
+
diff --git a/pkgs/icons/icons.txt b/pkgs/static/icons/urls.txt
index 388daa2..388daa2 100644
--- a/pkgs/icons/icons.txt
+++ b/pkgs/static/icons/urls.txt
diff --git a/pkgs/mozilla/user-js/arkenfox.nix b/pkgs/static/userjs/arkenfox/default.nix
index c464f34..c464f34 100644
--- a/pkgs/mozilla/user-js/arkenfox.nix
+++ b/pkgs/static/userjs/arkenfox/default.nix
diff --git a/pkgs/mozilla/user-js/thunderbird.nix b/pkgs/static/userjs/thunderbird/default.nix
index 8899d38..8899d38 100644
--- a/pkgs/mozilla/user-js/thunderbird.nix
+++ b/pkgs/static/userjs/thunderbird/default.nix
diff --git a/pkgs/static/wallpapers/default.nix b/pkgs/static/wallpapers/default.nix
new file mode 100644
index 0000000..4abeb38
--- /dev/null
+++ b/pkgs/static/wallpapers/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, imagemagick, lib }:
+
+let
+  fetchWallpaper =
+    { name, url, sha256, resolution ? "1920x1080", offset ? "0x0" }:
+    stdenv.mkDerivation {
+      inherit name;
+      src = fetchurl {
+        inherit url sha256;
+      };
+      buildInputs = [ imagemagick ];
+      phases = [ "unpackPhase" ];
+      unpackPhase = ''
+        convert "$src" -resize "${resolution}^" \
+                       -crop "${resolution}+${offset}" \
+                "$out"
+      '';
+    };
+  sources = lib.importJSON ./sources.json;
+in {
+  fetcher = fetchWallpaper;
+} // builtins.mapAttrs (_: fetchWallpaper) sources
diff --git a/pkgs/static/wallpapers/sources.json b/pkgs/static/wallpapers/sources.json
new file mode 100644
index 0000000..a3c104a
--- /dev/null
+++ b/pkgs/static/wallpapers/sources.json
@@ -0,0 +1,12 @@
+{
+    "artic-1942-51": {
+        "name": "Nighthawks_by_Edward_Hopper_1942.jpg",
+        "url": "https://upload.wikimedia.org/wikipedia/commons/a/a8/Nighthawks_by_Edward_Hopper_1942.jpg",
+        "sha256": "Rzp2AoAvjoB5t2elzSv+Eg6978tzviPyCbxLq2oIU6E="
+    },
+    "nga-1973-68-1": {
+        "name": "La_vallée_de_Riaux_près_de_l'Estaque,_par_Paul_Cézanne,_NGA.jpg",
+        "url": "https://upload.wikimedia.org/wikipedia/commons/8/89/La_vall%C3%A9e_de_Riaux_pr%C3%A8s_de_l%27Estaque%2C_par_Paul_C%C3%A9zanne%2C_NGA.jpg",
+        "sha256": "F3FPz0dmyxMk9BzV9DabGkECLbYBAIH96a5KOivvrak=" 
+    }
+}