global pkgs

radish/home/common/default.nix

@@ -1,7 +1,6 @@
-{ config, lib, pkgs, inputs, ... }:
+{ config, lib, pkgs, ... }:
 {
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ (import ../custom-pkgs { inherit lib inputs; }) ];
   imports = [ ../gnome ../custom-programs ./neovim ];
 
   # This value determines the Home Manager release that your configuration is

radish/home/custom-pkgs/commander-nvim/default.nix

@@ -1 +0,0 @@
-{ util, inputs, ... }: util.vimPlugin { name = "commander.nvim"; source = inputs.commander-nvim; }

radish/home/custom-pkgs/crystal/default.nix

@@ -1 +0,0 @@
-{ util, ... }: util.package

radish/home/custom-pkgs/crystal/package.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-let
-  inherit (pkgs) crystal libffi;
-in
-crystal.overrideAttrs (oldAttrs:
-  {
-    makeFlags = oldAttrs.makeFlags ++ [
-      "interpreter=1"
-    ];
-    buildInputs = oldAttrs.buildInputs ++ [
-      libffi
-    ];
-    FLAGS = ["--single-module"];
-    doCheck = false;
-  }
-)

radish/home/custom-pkgs/default.nix

@@ -1,9 +0,0 @@
-{ lib, inputs, ... }:
-let
-  inherit (builtins) attrNames filter readDir;
-  dirs =
-    let files = readDir ./.;
-    in filter (name: files."${name}" == "directory") (attrNames files);
-  util = import ./util.nix;
-in
-lib.composeManyExtensions (map (dir: import ./${dir} { util = util dir; inherit inputs; }) dirs)

radish/home/custom-pkgs/fb-client/default.nix

@@ -1 +0,0 @@
-{ util, ... }: util.package

radish/home/custom-pkgs/fb-client/package.nix

@@ -1,22 +0,0 @@
-{ lib, stdenv, fetchurl, python3, ... }:
-stdenv.mkDerivation rec {
-  pname = "fb-client";
-  version = "2.3.0";
-
-  src = fetchurl {
-    url = "https://paste.xinu.at/data/client/fb-${version}.tar.gz";
-    sha256 = "sha256-EWTsoG7qy0IQ1GLEuvHEAEJyphl9hz1hFm53k1OdGYM=";
-  };
-
-  buildInputs =
-    [ (python3.withPackages (pyPkgs: with pyPkgs; [ pycurl pyxdg ])) ];
-
-  makeFlags = [ "PREFIX=$(out)" ];
-
-  meta = with lib; {
-    mainProgram = "fb";
-    description = "Client for paste.xinu.at";
-    homepage = "https://paste.xinu.at";
-    license = licenses.gpl3Only;
-  };
-}

radish/home/custom-pkgs/flameshot/default.nix

@@ -1 +0,0 @@
-{ util, ... }: util.package

radish/home/custom-pkgs/flameshot/package.nix

@@ -1,6 +0,0 @@
-{ pkgs, ... }:
-pkgs.writeShellScriptBin "flameshot" ''
-  export XDG_SESSION_TYPE= QT_QPA_PLATFORM=wayland
-  nohup ${pkgs.flameshot}/bin/flameshot >& /dev/null &
-  ${pkgs.flameshot}/bin/flameshot "$@"
-''

radish/home/custom-pkgs/gen-nvim/default.nix

@@ -1 +0,0 @@
-{ inputs, util, ... }: util.vimPlugin { name = "gen.nvim"; source = inputs.gen-nvim; }

radish/home/custom-pkgs/otp/default.nix

@@ -1 +0,0 @@
-{ util, ... }: util.package

radish/home/custom-pkgs/otp/package.nix

@@ -1,17 +0,0 @@
-{ pkgs }:
-let
-  ykman = "${pkgs.yubikey-manager}/bin/ykman";
-  sk = "${pkgs.skim}/bin/sk";
-  wl-copy = "${pkgs.wl-clipboard}/bin/wl-copy";
-in
-pkgs.writeShellScriptBin "otp" ''
-  skim_command=("${sk}")
-
-  if [ -n "$*" ]; then
-    skim_command+=(-q "$*")
-  fi
-
-  account=$(${ykman} oath accounts list | "''${skim_command[@]}")
-  [ -z "$account" ] && exit 1
-  ${ykman} oath accounts code -s "$account" | ${wl-copy} -n
-''

radish/home/custom-pkgs/util.nix

@@ -1,16 +0,0 @@
-dir:
-{
-  vimPlugin = { name, source }:
-    final: prev: {
-      vimPlugins = prev.vimPlugins // {
-        "${dir}" = prev.vimUtils.buildVimPlugin {
-          pname = name;
-          version = source.lastModifiedDate;
-          src = source;
-          doCheck = false;
-        };
-      };
-    };
-
-  package = final: prev: { "${dir}" = final.callPackage ./${dir}/package.nix { pkgs = prev; }; };
-}

radish/home/custom-pkgs/vimpeccable/default.nix

@@ -1 +0,0 @@
-{ inputs, util, ... }: util.vimPlugin { name = "vimpeccable"; source = inputs.vimpeccable; }

radish/home/custom-pkgs/windline-nvim/default.nix

@@ -1 +0,0 @@
-{ inputs, util, ... }: util.vimPlugin { name = "windline.nvim"; source = inputs.windline-nvim; }

radish/home/custom-pkgs/wl-copy-both/default.nix

@@ -1 +0,0 @@
-{ util, ... }: util.package

radish/home/custom-pkgs/wl-copy-both/package.nix

@@ -1,14 +0,0 @@
-{ pkgs }:
-pkgs.writeShellScriptBin "wl-copy" ''
-  set -euo pipefail
-  copy="${pkgs.wl-clipboard}/bin/wl-copy"
-  paste="${pkgs.wl-clipboard}/bin/wl-paste"
-
-  "$copy" "$@"
-  args="$*"
-  if [[ "$args" =~ /(^| )(-p|--primary)($| )/ ]]; then
-    exit
-  fi
-
-  "$paste" -n | "$copy" -p "$@"
-''

radish/home/default.nix

@@ -1,5 +1,12 @@
-{ config, pkgs, ksoloti-pr, inputs, ... }:
+{ ksoloti-pr, inputs, ... }:
 {
-  home-manager.users.jokke = import ./jokke { inherit pkgs ksoloti-pr inputs; };
-  home-manager.users.moco = import ./moco { inherit config pkgs inputs; };
+  home-manager = {
+    users = {
+      jokke = import ./jokke;
+      moco = import ./moco;
+    };
+    extraSpecialArgs = { inherit ksoloti-pr inputs; };
+    useUserPackages = true;
+    useGlobalPkgs = true;
+  };
 }