From c82c06c66b9618eccbb88d458e38c064ed141758 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 22 May 2021 19:12:22 +0200
Subject: [PATCH] Remove stablePkgs.

---
 common-sw.nix | 40 ----------------------------------------
 flake.nix     | 15 ++++++++-------
 large-sw.nix  |  5 ++---
 3 files changed, 10 insertions(+), 50 deletions(-)

diff --git a/common-sw.nix b/common-sw.nix
index 062c033..3bd4d6f 100644
--- a/common-sw.nix
+++ b/common-sw.nix
@@ -89,46 +89,6 @@
     ++ (with gst_all_1; [ gstreamer gstreamer.dev
       gst-plugins-bad gst-plugins-good gst-plugins-base gst-plugins-ugly ]);
 
-  nixpkgs.config.packageOverrides = pkgs: with pkgs; let
-    fetchNixPkgs = { rev, sha256 }:
-    fetchFromGitHub {
-      inherit sha256 rev;
-      owner = "NixOS";
-      repo = "nixpkgs-channels";
-    };
-    stablePkgs = fetchNixPkgs {
-      rev = "bb8f0cc2279934cc2274afb6d0941de30b6187ae";
-      sha256 = "15b4ny9yxk04ml17sflids8sd707yibika1ikz3xi3lf5db0i8gr";
-    };
-  in {
-    # idea-community-eap = pkgs.idea.idea-community.overrideDerivation (oldAttrs: rec {
-    #     name = "idea-community-${version}";
-    #     version = "2017.2.eap";
-    #     src = pkgs.fetchurl {
-    #       url = "https://download.jetbrains.com/idea/ideaIC-172.3544.6-no-jdk.tar.gz";
-    #       sha256 = "72874a0393a6388b04353a359eea1d1242f59d6e7b96a4cf43c793602ac7ccdb";
-    #     };
-    #   });
-    idea-community-eap = pkgs.idea.idea-community;
-
-    # clion-eap = pkgs.idea.clion.overrideDerivation (oldAttrs: rec {
-    #   name = "clion-${version}";
-    #   version = "2017.1.eap";
-    #   src = pkgs.fetchurl {
-    #     url = "http://download.jetbrains.com/cpp/CLion-2017.1-RC.tar.gz";
-    #     sha256 = "1rv9rcjv4kv39l9r4g5kqbd4y175301a6kr3js3szkjmhqd50qq3";
-    #   };
-    # });
-    clion-eap = pkgs.idea.clion;
-
-    # neovim = pkgs.neovim.override {
-    #   extraPythonPackages = [ pkgs.pythonPackages.websocket_client ];
-    # };
-
-    stablePkgs = stablePkgs;
-    stable = import stablePkgs {};
-  };
-
   nixpkgs.config.allowTexliveBuilds = true;
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.android_sdk.accept_license = true;
diff --git a/flake.nix b/flake.nix
index 3eab63d..765fb73 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,13 +6,14 @@
     neovim-flake.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = { self, nixpkgs, neovim-flake, ... }:
-  let
-    neovimOverlay = { pkgs, ... }: { nixpkgs.overlays = [ neovim-flake.overlay ]; };
-  in {
-    nixosConfigurations.petalius = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [ ./petalius.nix neovimOverlay ];
+  outputs = { self, nixpkgs, neovim-flake, ... }: {
+    nixosConfigurations = let
+      neovimOverlay = { pkgs, ... }: { nixpkgs.overlays = [ neovim-flake.overlay ]; };
+    in {
+      petalius = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        modules = [ ./petalius.nix neovimOverlay ];
+      };
     };
   };
 }
diff --git a/large-sw.nix b/large-sw.nix
index 554c6ac..9af16e9 100644
--- a/large-sw.nix
+++ b/large-sw.nix
@@ -2,14 +2,13 @@
 
 {
   environment.systemPackages = with pkgs.haskellPackages; with pkgs; [
-    idea-community-eap
-    # clion-eap
+    idea.idea-community
+    # idea.clion
     texlive.combined.scheme-full biber
     gimp
     inkscape
     # jabref
     libreoffice-fresh
-    stablePkgs
     # calibre
     # goldendict