feat(flake): clean up & simplify config

- remove unused wrappers
- improve packages & overlays setup
- simplify createSystem
This commit is contained in:
Felix Schröter 2023-07-22 20:33:36 +02:00
parent d91a8d24d4
commit ec7c430e11
Signed by: felschr
GPG key ID: 671E39E6744C807D
6 changed files with 47 additions and 89 deletions
pkgs
default.nix
generic-bin-wrapper
mullvad-exclude-wrapper
vim-plugins
default.nix
nvim-kitty-navigator

5
pkgs/default.nix Normal file
View file

@ -0,0 +1,5 @@
{ pkgs, ... }:
{
deconz = pkgs.callPackage ./deconz { };
}

View file

@ -1,32 +0,0 @@
{ stdenv, callPackage }:
{ package # pkg must contain $out/bin with executables within.
, binPath ?
"bin/${package.meta.mainProgram or package.pname}" # path to look for binary
, wrapper # wrapper must contain @EXECUTABLE@ as a placeholder for the binary to run.
}:
# pass through all arguments to wrapped package to allow overriding
# arguments in wrapped package
callPackage (args:
stdenv.mkDerivation {
name = "${package.name}-wrapped";
inherit (package) version;
src = package.override args;
dontUnpack = true;
# inherit passthru
inherit (package) passthru;
installPhase = ''
local executable=$out/${binPath}
install -D ${wrapper} "$executable"
substituteInPlace "$executable" --subst-var-by EXECUTABLE "$f"
# Symlink the share directory so that .desktop files and such continue to work.
if [[ -d $src/share ]]
then
ln -s $src/share $out/share
fi
'';
}) { }

View file

@ -1,7 +0,0 @@
{ writeShellScript, genericBinWrapper, mullvad-vpn }:
args:
let
wrapper = writeShellScript "mullvad-exclude" ''
${mullvad-vpn}/bin/mullvad-exclude "@EXECUTABLE@" "$@"
'';
in genericBinWrapper (args // { inherit wrapper; })

View file

@ -0,0 +1,6 @@
{ inputs, pkgs, ... }:
{
nvim-kitty-navigator =
pkgs.callPackage ./nvim-kitty-navigator { inherit inputs; };
}

View file

@ -0,0 +1,8 @@
{ inputs, pkgs, ... }:
pkgs.vimUtils.buildVimPluginFrom2Nix {
pname = "nvim-kitty-navigator";
version = inputs.nvim-kitty-navigator.rev;
versionSuffix = "-git";
src = inputs.nvim-kitty-navigator;
}