From df761d0085dde1e1c77e24eab031578c5741b8a8 Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine97.martin@gmail.com>
Date: Mon, 15 Mar 2021 23:04:11 +0100
Subject: [PATCH] overlays: use nixpkgs-unstable for few overlays I had

---
 .github/workflows/cachix.yml    | 21 ---------------------
 flake.nix                       | 20 ++++++++++++++------
 overlays/bitwarden_rs-vault.nix | 11 -----------
 overlays/bitwarden_rs.nix       | 23 -----------------------
 overlays/build-me.nix           |  8 --------
 overlays/default.nix            |  8 --------
 6 files changed, 14 insertions(+), 77 deletions(-)
 delete mode 100644 .github/workflows/cachix.yml
 delete mode 100644 overlays/bitwarden_rs-vault.nix
 delete mode 100644 overlays/bitwarden_rs.nix
 delete mode 100644 overlays/build-me.nix
 delete mode 100644 overlays/default.nix

diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml
deleted file mode 100644
index f919db6..0000000
--- a/.github/workflows/cachix.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-name: "Build everything and push to cachix"
-on:
-  workflow_dispatch:
-  schedule:
-    - cron: '0 */4 * * *'
-  push:
-    branches:
-      - main
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - uses: cachix/install-nix-action@v12
-      with:
-        nix_path: nixpkgs=channel:nixos-20.09-small
-    - uses: cachix/cachix-action@v8
-      with:
-        name: alarsyo
-        authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-    - run: nix-build ./overlays/build-me.nix
diff --git a/flake.nix b/flake.nix
index 82ffe4c..5d1a90f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,12 +13,20 @@
           ./poseidon.nix
 
           {
-            nixpkgs.overlays = [
-              # packages accessible through pkgs.unstable.package
-              (final: prev: {
-                unstable = nixpkgs-unstable.legacyPackages.${system};
-              })
-            ] ++ (import ./overlays);
+            nixpkgs.overlays =
+              let
+                pkgsUnstable = nixpkgs-unstable.legacyPackages.${system};
+              in
+                [
+                  # packages accessible through pkgs.unstable.package
+                  (final: prev: {
+                    unstable = pkgsUnstable;
+                  })
+                  (final: prev: {
+                    bitwarden_rs = pkgsUnstable.bitwarden_rs;
+                    bitwarden_rs-vault = pkgsUnstable.bitwarden_rs-vault;
+                  })
+                ];
           }
         ];
     };
diff --git a/overlays/bitwarden_rs-vault.nix b/overlays/bitwarden_rs-vault.nix
deleted file mode 100644
index 47e2cb4..0000000
--- a/overlays/bitwarden_rs-vault.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-final: prev:
-{
-  bitwarden_rs-vault = prev.bitwarden_rs-vault.overrideAttrs (drv: rec {
-    version = "2.17.1";
-
-    src = prev.fetchurl {
-      url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz";
-      sha256 = "1kd21higniszk1na5ag7q4g0l7h6ddl91gpbjbwym28hsbjvxla7";
-    };
-  });
-}
diff --git a/overlays/bitwarden_rs.nix b/overlays/bitwarden_rs.nix
deleted file mode 100644
index fedb87e..0000000
--- a/overlays/bitwarden_rs.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# necessary for now because I need 1.18.0, having migrated from a previous
-# deployment that used an updated Docker image
-final: prev:
-{
-  bitwarden_rs = prev.bitwarden_rs.overrideAttrs (drv: rec {
-    version = "1.18.0";
-    pname = "bitwarden_rs";
-    name = "${pname}-${version}";
-
-    src = prev.fetchFromGitHub {
-      owner = "dani-garcia";
-      repo = pname;
-      rev = version;
-      sha256 = "sha256-iK0Yf5Hu76b4FXPTQsKIsyH69CQuLA9E/SoTaxC1U90=";
-    };
-
-    cargoDeps = drv.cargoDeps.overrideAttrs (prev.lib.const {
-      inherit src;
-      name = "${name}-vendor.tar.gz";
-      outputHash = "sha256-LKLjZ4tti/MtloVQJ1C593FAcp0DDskIl5famT8wGuI=";
-    });
-  });
-}
diff --git a/overlays/build-me.nix b/overlays/build-me.nix
deleted file mode 100644
index eec7bc9..0000000
--- a/overlays/build-me.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-# File used in GitHub workflow to build my overlays
-let
-  pkgs = import <nixpkgs> { overlays = import ./.; };
-in
-with pkgs; [
-  bitwarden_rs-postgresql
-  bitwarden_rs-vault
-]
diff --git a/overlays/default.nix b/overlays/default.nix
deleted file mode 100644
index 8830ee0..0000000
--- a/overlays/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-let
-  bitwarden_rs = import ./bitwarden_rs.nix;
-  bitwarden_rs-vault = import ./bitwarden_rs-vault.nix;
-in
-[
-  bitwarden_rs
-  bitwarden_rs-vault
-]