From 301a38202122431f738c4f5b31757d910a1e6491 Mon Sep 17 00:00:00 2001 From: noe Date: Wed, 24 Apr 2024 22:50:18 -0400 Subject: [PATCH] minimalize --- .envrc | 1 - .gitattributes | 2 -- README.md | 14 -------------- flake.nix | 27 +++++++++++++-------------- packages.nix | 14 -------------- utils.nix | 14 -------------- volpeon/blobfox.nix | 12 ------------ volpeon/neocat.nix | 9 --------- 8 files changed, 13 insertions(+), 80 deletions(-) delete mode 100644 .envrc delete mode 100644 .gitattributes delete mode 100644 packages.nix delete mode 100644 utils.nix delete mode 100644 volpeon/blobfox.nix delete mode 100644 volpeon/neocat.nix diff --git a/.envrc b/.envrc deleted file mode 100644 index 35e79a4..0000000 --- a/.envrc +++ /dev/null @@ -1 +0,0 @@ -use flake; \ No newline at end of file diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index 6db5372..0000000 --- a/.gitattributes +++ /dev/null @@ -1,2 +0,0 @@ -*.png !text !filter !merge !diff -*.gif !text !filter !merge !diff diff --git a/README.md b/README.md index 86a5fc4..197eeeb 100644 --- a/README.md +++ b/README.md @@ -33,17 +33,3 @@ We have a module to automatically import and configure derivations as Akkoma emo ``` This module will place these packages/derivations in `services.akkoma.extraStatic."emoji/${package.name}"`, and map these prefixes to picker tabs via `services.akkoma.config.":pleroma".":emoji".groups`. - -## Emote Packs - -### Lightrunner Custom - -_Used by https://sapphic.engineer and https://porcelain.doll.repair, among others._ - -- **Hearts** - `lightrunner-custom.hearts` - Hearts, Noegrams, and other personal bits and bobs. -- **Anime** - `lightrunner-custom.anime` - A pack of cute anime emotes - -### Volpeon - -- **Blobfox** - `volpeon.blobfox` - Blobfoxes -- **Neocat** - `volpeon.neocat` - Neocats diff --git a/flake.nix b/flake.nix index 56f905f..b5a4473 100644 --- a/flake.nix +++ b/flake.nix @@ -11,21 +11,20 @@ akkoma = import ./akkoma.nix; }; - packages = forAllSystems (system: let - pkgs = nixpkgs.legacyPackages.${system}; - in import ./packages.nix { - inherit pkgs inputs; - utils = import ./utils.nix { inherit pkgs; }; - }); - - devShells = forAllSystems (system: let - pkgs = nixpkgs.legacyPackages.${system}; + packages = forAllSystems (system: let + pkgs = nixpkgs.legacyPackages.${system}; in { - default = pkgs.mkShell { - buildInputs = with pkgs; [ - bun - just - ]; + mkEmotePack = { + src, + name, + version ? "v0.0.1", + convertSVGs ? false + }: pkgs.stdenvNoCC.mkDerivation { + inherit src name version; + + buildPhase = '' + cp -r $src/ $out/ + ''; }; }); }; diff --git a/packages.nix b/packages.nix deleted file mode 100644 index 1b90901..0000000 --- a/packages.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, utils, inputs, ... }: let - specialArgs = { inherit pkgs utils inputs; }; -in { - # These are specific to the Lightrunner System instances. - lightrunner-custom = { - anime = import ./custom/anime.nix specialArgs; - hearts = import ./custom/hearts.nix specialArgs; - }; - - volpeon = { - blobfox = import ./volpeon/blobfox.nix specialArgs; - neocat = import ./volpeon/neocat.nix specialArgs; - }; -} \ No newline at end of file diff --git a/utils.nix b/utils.nix deleted file mode 100644 index 8b1d83f..0000000 --- a/utils.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ pkgs, ... }: { - mkEmotePack = { - src, - name, - version ? "v0.0.1", - convertSVGs ? false - }: pkgs.stdenvNoCC.mkDerivation { - inherit src name version; - - buildPhase = '' - cp -r $src/ $out/ - ''; - }; -} \ No newline at end of file diff --git a/volpeon/blobfox.nix b/volpeon/blobfox.nix deleted file mode 100644 index 5a0f8cc..0000000 --- a/volpeon/blobfox.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ utils, pkgs, ... }: let - rev = "6d3bb625c795ac1bd1484d37b1e1ceb5015d624e"; -in utils.mkEmotePack { - name = "volpeon-blobfox"; - version = rev; - convertSVGs = true; - src = pkgs.fetchgit { - url = "https://git.vulpes.one/git/blobfox-emojis.git"; - rev = rev; - hash = "sha256-IMXC4WfAIGs3Ljc+GM3/YyfE0jOyxsoRvF4LwA4AYrw="; - }; -} \ No newline at end of file diff --git a/volpeon/neocat.nix b/volpeon/neocat.nix deleted file mode 100644 index 281bde5..0000000 --- a/volpeon/neocat.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ utils, pkgs, ... }: utils.mkEmotePack { - name = "volpeon-neocat"; - version = "1.1"; - unzip = true; - src = pkgs.fetchurl { - url = "https://volpeon.ink/emojis/neocat/neocat.zip"; - hash = "sha256-DZDuk0Djlax504flNWdpqAw+ROLOOVGj0ZvJLyouo7A="; - }; -} \ No newline at end of file