summaryrefslogtreecommitdiffstats
path: root/pkgs/simple
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/simple')
-rw-r--r--pkgs/simple/alacritty-tv.nix4
-rw-r--r--pkgs/simple/bash-fzf-history.nix5
-rw-r--r--pkgs/simple/default.nix6
-rw-r--r--pkgs/simple/pinentry-urxvt/default.nix6
-rw-r--r--pkgs/simple/q/default.nix5
5 files changed, 5 insertions, 21 deletions
diff --git a/pkgs/simple/alacritty-tv.nix b/pkgs/simple/alacritty-tv.nix
index efbcc6e..cb8f960 100644
--- a/pkgs/simple/alacritty-tv.nix
+++ b/pkgs/simple/alacritty-tv.nix
@@ -1,12 +1,10 @@
{ lib
+, mylib
, pkgs
, variant ? "x220"
}:
let
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
font-size = arg: {
program = "${pkgs.font-size-alacritty}/bin/font-size-alacritty";
args = [arg];
diff --git a/pkgs/simple/bash-fzf-history.nix b/pkgs/simple/bash-fzf-history.nix
index f35d5e8..50f102c 100644
--- a/pkgs/simple/bash-fzf-history.nix
+++ b/pkgs/simple/bash-fzf-history.nix
@@ -1,4 +1,5 @@
{ lib
+, mylib
, pkgs
, edit-key ? "ctrl-e"
@@ -15,10 +16,6 @@
, load-keyseq ? start-keyseq
}: let
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
-
script = pkgs.writeBash "bash-fzf-history.sh" ''
if ! command -v fzf >/dev/null; then
# Alternatively rewrite ${pkgs.fzf}/share/fzf/* to use absolute paths.
diff --git a/pkgs/simple/default.nix b/pkgs/simple/default.nix
index 1c4a53b..1e63017 100644
--- a/pkgs/simple/default.nix
+++ b/pkgs/simple/default.nix
@@ -1,11 +1,7 @@
self: super:
let
- inherit (super) lib;
-
- mylib = import ../../lib/pure.nix {
- inherit lib;
- };
+ inherit (super) lib mylib;
# This callPackage will try to detect obsolete overrides.
callPackage = path: args: let
diff --git a/pkgs/simple/pinentry-urxvt/default.nix b/pkgs/simple/pinentry-urxvt/default.nix
index 7363f26..6868207 100644
--- a/pkgs/simple/pinentry-urxvt/default.nix
+++ b/pkgs/simple/pinentry-urxvt/default.nix
@@ -1,10 +1,6 @@
-{ lib, pkgs, ... }@args:
+{ lib, mylib, pkgs, ... }@args:
let
- mylib = import ../../../lib/pure.nix {
- inherit lib;
- };
-
# config cannot be declared in the input attribute set because that would
# cause callPackage to inject the wrong config. Instead, get it from ...
# via args.
diff --git a/pkgs/simple/q/default.nix b/pkgs/simple/q/default.nix
index 03e924e..a1e60e3 100644
--- a/pkgs/simple/q/default.nix
+++ b/pkgs/simple/q/default.nix
@@ -1,11 +1,8 @@
{ lib
+, mylib
, pkgs
}:
let
- mylib = import ../../../lib/pure.nix {
- inherit lib;
- };
-
q-cal = let
# Maximum width of cal's output.