From 78e8bc018299dcc035f57abe914640b66f675831 Mon Sep 17 00:00:00 2001
From: coolneng <akasroua@gmail.com>
Date: Thu, 10 Sep 2020 14:27:13 +0200
Subject: [PATCH] Revert "Set up cachix as emacs-overlay binary cache"

This reverts commit 12235422265b5cc6e50547fe976fcc8a1296c1f2.
---
 cachix/nix-community.nix |  8 --------
 modules/cachix.nix       | 13 -------------
 modules/software.nix     |  3 +--
 3 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 cachix/nix-community.nix
 delete mode 100644 modules/cachix.nix

diff --git a/cachix/nix-community.nix b/cachix/nix-community.nix
deleted file mode 100644
index b0a63e9..0000000
--- a/cachix/nix-community.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://nix-community.cachix.org" ];
-    binaryCachePublicKeys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}
diff --git a/modules/cachix.nix b/modules/cachix.nix
deleted file mode 100644
index 104ea98..0000000
--- a/modules/cachix.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-# WARN: this file will get overwritten by $ cachix use <name>
-{ pkgs, lib, ... }:
-
-let
-  folder = ../cachix;
-  toImport = name: value: folder + ("/" + name);
-  filterCaches = key: value: value == "regular" && lib.hasSuffix ".nix" key;
-  imports = lib.mapAttrsToList toImport
-    (lib.filterAttrs filterCaches (builtins.readDir folder));
-in {
-  inherit imports;
-  nix.binaryCaches = [ "https://cache.nixos.org/" ];
-}
diff --git a/modules/software.nix b/modules/software.nix
index ff5d9b9..2bac0e4 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -37,6 +37,7 @@
     podman-compose
     shellcheck
     shfmt
+    android-studio
     gnumake
     nodePackages.pyright
     black
@@ -74,8 +75,6 @@
     zip
     unzip
     unrar
-    # Overlays
-    cachix
   ];
 
   # Fonts declaration