Compare commits

...

4 commits

Author SHA1 Message Date
Bruno BELANYI 1ac9f0cc8c home: comma: configure custom 'nixpkgs' flake
All checks were successful
continuous-integration/drone/push Build is passing
This makes use of my pinned `pkgs` flake from the registry by default.
2021-05-27 21:50:27 +02:00
Bruno BELANYI 6074958292 home: extract 'comma' into its own module 2021-05-27 21:49:24 +02:00
Bruno BELANYI da21e7a6f2 pkgs: comma: allow override which nixpkgs is used
This is useful for me to use my pinned `pkgs` instead.
2021-05-27 21:42:41 +02:00
Bruno BELANYI 395f15f181 pkgs: add volantes-cursors 2021-05-27 19:57:31 +02:00
6 changed files with 77 additions and 2 deletions

29
home/comma.nix Normal file
View file

@ -0,0 +1,29 @@
{ config, lib, pkgs, ... }:
let
cfg = config.my.home.comma;
in
{
options.my.home.comma = with lib; {
enable = my.mkDisableOption "comma configuration";
pkgsFlake = mkOption {
type = types.str;
default = "pkgs";
example = "nixpkgs";
description = ''
Which flake from the registry should be used with
<command>nix shell</command>.
'';
};
};
config = lib.mkIf cfg.enable {
home.packages = with pkgs; [
ambroisie.comma
];
home.sessionVariables = {
COMMA_PKGS_FLAKE = cfg.pkgsFlake;
};
};
}

View file

@ -3,6 +3,7 @@
imports = [
./bat.nix
./bluetooth.nix
./comma.nix
./direnv.nix
./documentation.nix
./feh.nix

View file

@ -18,7 +18,6 @@ in
};
config.home.packages = with pkgs; lib.mkIf cfg.enable ([
ambroisie.comma
file
gitAndTools.git-absorb
gitAndTools.git-revise

View file

@ -30,4 +30,4 @@ if [ -z "$PROGRAM" ]; then
exit 1
fi
nix shell "nixpkgs#$PROGRAM" -c "$@"
nix shell "${COMMA_PKGS_FLAKE:-nixpkgs}#$PROGRAM" -c "$@"

View file

@ -18,6 +18,8 @@ rec {
vimix-cursors = pkgs.callPackage ./vimix-cursors { };
volantes-cursors = pkgs.callPackage ./volantes-cursors { };
unbound-zones-adblock = pkgs.callPackage ./unbound-zones-adblock {
inherit unified-hosts-lists;
};

View file

@ -0,0 +1,44 @@
{ fetchFromGitHub, inkscape, lib, stdenvNoCC, xcursorgen }:
stdenvNoCC.mkDerivation rec {
pname = "volantes-cursors";
version = "unstable-2020-06-06";
src = fetchFromGitHub {
owner = "varlesh";
repo = pname;
rev = "d1d290ff42cc4fa643716551bd0b02582b90fd2f";
sha256 = "sha256-irMN/enoo90nYLfvSOScZoYdvhZKvqqp+grZB2BQD9o=";
};
nativeBuildInputs = [
inkscape
xcursorgen
];
postPatch = ''
patchShebangs .
# The script tries to build in its source directory...
substituteInPlace build.sh --replace \
': "''${BUILD_DIR:="$SCRIPT_DIR"/build}"' \
"BUILD_DIR=$(pwd)/build"
substituteInPlace build.sh --replace \
': "''${OUT_DIR:="$SCRIPT_DIR"/dist}"' \
"OUT_DIR=$(pwd)/dist"
'';
buildPhase = ''
HOME="$NIX_BUILD_ROOT" ./build.sh
'';
installPhase = ''
make install PREFIX= DESTDIR=$out/
'';
meta = with lib; {
description = "Classic cursor with a flying style";
homepage = "https://github.com/varlesh/volantes-cursors";
license = licenses.gpl2Only;
platforms = platforms.linux;
maintainers = with maintainers; [ ambroisie ];
};
}