From 4683993d104b939484ca369a229839016968670f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 6 May 2023 19:14:35 +0100 Subject: [PATCH] From flake to direnv --- .envrc | 2 ++ .gitignore | 1 + flake.lock | 59 ------------------------------------------------------ flake.nix | 47 ------------------------------------------- 4 files changed, 3 insertions(+), 106 deletions(-) create mode 100644 .envrc create mode 100644 .gitignore delete mode 100644 flake.lock delete mode 100644 flake.nix diff --git a/.envrc b/.envrc new file mode 100644 index 0000000..6414c79 --- /dev/null +++ b/.envrc @@ -0,0 +1,2 @@ +source_env .. +use flake work#zua diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..92b2793 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.direnv diff --git a/flake.lock b/flake.lock deleted file mode 100644 index c53cec4..0000000 --- a/flake.lock +++ /dev/null @@ -1,59 +0,0 @@ -{ - "nodes": { - "nimble": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1633263146, - "narHash": "sha256-rbWhymf0OXVla79UE+sx8GKV1aK8QsOL2COwJLsvRZk=", - "owner": "nix-community", - "repo": "flake-nimble", - "rev": "e50410e3e559d4384bd0bbb47280188532d55f63", - "type": "github" - }, - "original": { - "id": "nimble", - "type": "indirect" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1633193040, - "narHash": "sha256-by9sL3A+Bpv84dOcBJ0AJwDF4x+Xt5vSqvpsyG0PPMc=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "2edf68513fcc329d391a6268cebc77043c9f341c", - "type": "github" - }, - "original": { - "id": "nixpkgs", - "type": "indirect" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1638592813, - "narHash": "sha256-842jUCj8fTZKJHygEu75V0mQw/SmxnM9MllSM5xTLm0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "66c4ae20a3b6fffd54fa240701af3f3d8834c7da", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-21.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "nimble": "nimble", - "nixpkgs": "nixpkgs_2" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/flake.nix b/flake.nix deleted file mode 100644 index 69b70e8..0000000 --- a/flake.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ - description = "Zooming User Agent"; - - inputs.nixpkgs.url = "github:nixos/nixpkgs/release-21.11"; - - outputs = { self, nixpkgs, nimble }: - let - systems = [ "aarch64-linux" "x86_64-linux" ]; - forAllSystems = nixpkgs.lib.genAttrs systems; - in { - overlay = final: prev: { - zua = with prev; - - nimPackages.buildNimPackage rec { - pname = "zua"; - version = "unstable"; - - nimBinOnly = true; - - src = self; - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ fontconfig ] ++ (with nimPackages; [ - bumpy - chroma - flatty - nimsimd - pixie - sdl2 - typography - vmath - zippy - ]); - - meta = with lib; { - description = "Simple RSVP speed-reading utility"; - license = licenses.unlicense; - homepage = "https://git.sr.ht/~ehmry/hottext"; - maintainers = with maintainers; [ ehmry ]; - }; - }; - }; - - defaultPackage = forAllSystems (system: - let pkgs = nixpkgs.legacyPackages.${system}.extend self.overlay; - in pkgs.zua); - }; -} -- 2.45.2