nix: simplify package management

Packages were moved to the system configuration

.config/nixpkgs/overlays/packages/cfn-lint.nix

@@ -1,13 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, pyyaml, requests, aws-sam-translator, jsonpatch, jsonschema, pathlib2
-}:
-buildPythonPackage rec {
-  pname = "cfn-lint";
-  version = "0.14.0";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "03kq92bx94fvqf7rrvaak742s1b0c84fqvdhp41qabc5f8mlg5w7";
-  };
-  doCheck = false; # TODO: why?
-  propagatedBuildInputs = [ pyyaml requests aws-sam-translator jsonpatch jsonschema pathlib2 ];
-}

.config/nixpkgs/overlays/packages/cfn_flip.nix

@@ -1,13 +0,0 @@
-{ lib, buildPythonPackage, fetchPypi
-, pyyaml, tox, six, pytestrunner, click
-}:
-buildPythonPackage rec {
-  pname = "cfn_flip";
-  version = "1.2.0";
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1v31zcdlmlfldlfvp0fagphz1hlgnkylgq284s3b142gkjdg7jbx";
-  };
-  doCheck = false; # TODO: why?
-  propagatedBuildInputs = [ pyyaml tox six pytestrunner click ];
-}

.config/nixpkgs/overlays/packages/chef/default.nix

@@ -1,9 +1,20 @@
-{ buildEnv, bundlerEnv, ruby_2_3 }:
+{ buildEnv, bundlerEnv, ruby_2_5, defaultGemConfig, fetchpatch }:
 let
+  fix-yajl = fetchpatch {
+    url = "https://github.com/chef/ffi-yajl/commit/ba84d91986c2d149f0a05132401e8ad9d17dab6c.diff";
+    sha256 = "0vfmdxgpcd0v2y4r5k27lnydqh3hb0zg8f24hlrddi4p7xi93815";
+  };
+
   gems = bundlerEnv rec {
     name = "chef";
-    ruby = ruby_2_3;
+    ruby = ruby_2_5;
     gemdir = ./.;
+    gemConfig = defaultGemConfig // {
+      ffi-yajl = attrs: {
+        dontBuild = false;
+        patches = (attrs.patches or []) ++ [ fix-yajl ];
+      };
+    };
   };
 in
 

.config/nixpkgs/overlays/packages/eikaiwa-packages.nix

@@ -1,25 +0,0 @@
-{ lib, buildEnv, yarn, overmind, ruby_2_5, nodejs-10_x ? null }:
-
-let
- pkgsNewEnough = (lib.versionAtLeast yarn.version "1.10.0") && (nodejs-10_x != null);
-
- webpkgs = if pkgsNewEnough
-   then { inherit yarn nodejs-10_x; }
-   else builtins.trace "Using <nixpkgs-unstable> channel for web packages"
-        (import <nixpkgs-unstable> {});
-in
-
-let
- nodejs = webpkgs.nodejs-10_x;
- yarn   = webpkgs.yarn.override { inherit nodejs; };
-in
-
-buildEnv {
- name = "eikaiwa-packages";
- paths = [
-   nodejs
-   yarn
-   overmind
-   ruby_2_5
- ];
-}

.config/nixpkgs/overlays/packages/k8s-packages.nix

@@ -1,13 +0,0 @@
-{ buildEnv }:
-
-let
-  pkgs = import <nixpkgs-unstable> {};
-in
-buildEnv {
-  name = "k8s-packages";
-  paths = [
-    pkgs.kubectl
-    pkgs.kubectx
-    pkgs.kops
-  ];
-}

.config/nixpkgs/overlays/packages/wl-clipboard.nix

@@ -1,25 +0,0 @@
-{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig
-, wayland, wayland-protocols }:
-
-stdenv.mkDerivation rec {
-  pname = "wl-clipboard";
-  version = "1.0.0-git";
-
-  src = fetchFromGitHub {
-    owner = "bugaevc";
-    repo = "wl-clipboard";
-    rev = "c010972e6b0d2eb3002c49a6a1b5620ff5f7c910";
-    sha256 = "020l3jy9gsj6gablwdfzp1wfa8yblay3axdjc56i9q8pbhz7g12j";
-  };
-
-  nativeBuildInputs = [ meson ninja pkgconfig wayland-protocols ];
-  buildInputs = [ wayland ];
-
-  meta = with stdenv.lib; {
-    description = "Command-line copy/paste utilities for Wayland";
-    homepage = https://github.com/bugaevc/wl-clipboard;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ dywedir ];
-    platforms = platforms.linux;
-  };
-}

.config/nixpkgs/overlays/userPackages.nix

@@ -1,85 +0,0 @@
-self: super:
-
-let
-  nixpkgs-unstable = import <unstable> {};
-in
-{
-  userPackages = super.userPackages or {
-
-    inherit (self)
-      # cli
-      vimHugeX
-      neovim
-      neovim-remote
-      git
-      git-lfs
-      feh
-      ripgrep
-      jq
-      yq
-      tree
-      fzf
-      dnsutils
-      httpie
-      htop
-      bc
-      pv
-      caddy
-      openssl
-      pwgen
-      gnupg
-      whois
-      traceroute
-      gnumake
-      tig
-      gettext
-      unzip
-      zip
-      shellcheck
-      any-nix-shell
-
-      # apps
-      pcmanfm
-      lxappearance
-      pavucontrol
-      pamixer
-      gnumeric
-      mpv
-
-      # work
-      insomnia
-      awscli
-      docker
-      docker_compose
-      amazon-ecr-credential-helper
-      virtmanager
-      tmux-cssh
-      ;
-
-
-    xrdb = self.xorg.xrdb;
-    qterminal = self.lxqt.qterminal;
-    mps-youtube = self.python36Packages.mps-youtube;
-    keepassxc = nixpkgs-unstable.keepassxc.override { qtbase = self.qt5.qtbase; };
-    op = nixpkgs-unstable._1password;
-    deadbeef = nixpkgs-unstable.deadbeef;
-    cfn-lint = nixpkgs-unstable.python27.pkgs.callPackage ./packages/cfn-lint.nix {};
-    cfn_flip = nixpkgs-unstable.python27.pkgs.callPackage ./packages/cfn_flip.nix {};
-    wl-clipboard = nixpkgs-unstable.callPackage ./packages/wl-clipboard.nix {};
-
-    nix-rebuild = super.writeScriptBin "nix-rebuild" ''
-      #!${super.stdenv.shell}
-      if ! command -v nix-env &>/dev/null; then
-          echo "warning: nix-env was not found in PATH, add nix to userPackages" >&2
-          PATH=${self.nix}/bin:$PATH
-      fi
-      exec nix-env -f '<nixpkgs>' -r -iA userPackages "$@"
-    '';
-
-    cssh = super.writeScriptBin "cssh" ''
-      #!${super.stdenv.shell}
-      exec ${self.tmux-cssh}/bin/tmux-cssh $@
-    '';
-
-  };
-}

.config/nixpkgs/overlays/workPackages.nix

@@ -1,5 +1,3 @@
 self: super: {
-  eikaiwa-packages = super.callPackage ./packages/eikaiwa-packages.nix {};
   chef-packages = super.callPackage ./packages/chef/default.nix {};
-  k8s-packages = super.callPackage ./packages/k8s-packages.nix {};
 }