From 3c220c00630462cb1126c59e8f476f2ac09e4815 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:14:09 +0200 Subject: tv: pass-otp -> pass.withExtensions --- tv/5pkgs/simple/fzmenu/default.nix | 47 +++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 23 deletions(-) (limited to 'tv/5pkgs/simple') diff --git a/tv/5pkgs/simple/fzmenu/default.nix b/tv/5pkgs/simple/fzmenu/default.nix index 1f1b828..634d833 100644 --- a/tv/5pkgs/simple/fzmenu/default.nix +++ b/tv/5pkgs/simple/fzmenu/default.nix @@ -1,37 +1,38 @@ -{ lib, stdenv -, runCommand -, coreutils, dash, gnused, fzf, pass-otp, rxvt_unicode, utillinux, xdotool -}: +{ lib, pkgs, stdenv }: -runCommand "fzmenu" { +pkgs.runCommand "fzmenu" { } /* sh */ '' mkdir $out cp -r ${./bin} $out/bin substituteInPlace $out/bin/otpmenu \ - --replace '#! /bin/sh' '#! ${dash}/bin/dash' \ + --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \ --replace '#PATH=' PATH=${lib.makeBinPath [ - coreutils - dash - fzf - gnused - pass-otp - rxvt_unicode - utillinux - xdotool + pkgs.coreutils + pkgs.dash + pkgs.fzf + pkgs.gnused + (pkgs.pass.withExtensions (ext: [ + ext.pass-otp + ])) + pkgs.rxvt_unicode + pkgs.utillinux + pkgs.xdotool ]} substituteInPlace $out/bin/passmenu \ - --replace '#! /bin/sh' '#! ${dash}/bin/dash' \ + --replace '#! /bin/sh' '#! ${pkgs.dash}/bin/dash' \ --replace '#PATH=' PATH=${lib.makeBinPath [ - coreutils - dash - fzf - gnused - pass-otp - rxvt_unicode - utillinux - xdotool + pkgs.coreutils + pkgs.dash + pkgs.fzf + pkgs.gnused + (pkgs.pass.withExtensions (ext: [ + ext.pass-otp + ])) + pkgs.rxvt_unicode + pkgs.utillinux + pkgs.xdotool ]} '' -- cgit v1.3.1 From 30ff12501e4186009608a0167fdaac97f2598d45 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 20:12:06 +0200 Subject: tv: firefoxWrapper -> firefox --- tv/1systems/alnus/config.nix | 6 +++--- tv/1systems/mu/config.nix | 34 +++++++++++++++++----------------- tv/1systems/querel/config.nix | 20 ++++++++++---------- tv/5pkgs/simple/ff.nix | 2 +- 4 files changed, 31 insertions(+), 31 deletions(-) (limited to 'tv/5pkgs/simple') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 54f845e..c09e7f9 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -15,9 +15,9 @@ with import ; }; }; - environment.systemPackages = with pkgs; [ - firefoxWrapper - networkmanagerapplet + environment.systemPackages = [ + pkgs.firefox + pkgs.networkmanagerapplet (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 00b1779..21be257 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -56,26 +56,26 @@ with import ; ${pkgs.kmod}/bin/modprobe -v iwlwifi ''; - environment.systemPackages = with pkgs; [ - chromium - firefoxWrapper - gimp - iptables - libreoffice - plasma-pa + environment.systemPackages = [ + pkgs.chromium + pkgs.firefox + pkgs.gimp + pkgs.iptables + pkgs.libreoffice + pkgs.plasma-pa (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) - skype - slock - tinc_pre - vim - xsane - - #foomatic_filters - #gutenprint - #cups_pdf_filter - #ghostscript + pkgs.skypeforlinux + pkgs.slock + pkgs.tinc_pre + pkgs.vim + pkgs.xsane + + #pkgs.foomatic_filters + #pkgs.gutenprint + #pkgs.cups_pdf_filter + #pkgs.ghostscript ]; diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index 41253cf..ad82915 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -21,19 +21,19 @@ with import ; systemd-boot.enable = true; }; - environment.systemPackages = with pkgs; [ - firefoxWrapper - gimp - kate - libreoffice + environment.systemPackages = [ + pkgs.firefox + pkgs.gimp + pkgs.kate + pkgs.libreoffice (pkgs.pidgin-with-plugins.override { plugins = [ pkgs.pidginotr ]; }) - sxiv - texlive.combined.scheme-full - vim - xsane - zathura + pkgs.sxiv + pkgs.texlive.combined.scheme-full + pkgs.vim + pkgs.xsane + pkgs.zathura ]; fileSystems = { diff --git a/tv/5pkgs/simple/ff.nix b/tv/5pkgs/simple/ff.nix index ec20c4a..4ce9c3c 100644 --- a/tv/5pkgs/simple/ff.nix +++ b/tv/5pkgs/simple/ff.nix @@ -1,5 +1,5 @@ { pkgs }: pkgs.writeDashBin "ff" '' - exec ${pkgs.firefoxWrapper}/bin/firefox "$@" + exec ${pkgs.firefox}/bin/firefox "$@" '' -- cgit v1.3.1 From 1d9a5335e13aa6ef1ceefc302c9f22651b5e7785 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 2 Aug 2022 13:33:55 +0200 Subject: tv: -> ../..{,/..}/lib --- tv/5pkgs/default.nix | 2 +- tv/5pkgs/override/default.nix | 2 +- tv/5pkgs/simple/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'tv/5pkgs/simple') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 4f6643c..5a018a1 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../lib; let pushBack = x: xs: if elem x xs then diff --git a/tv/5pkgs/override/default.nix b/tv/5pkgs/override/default.nix index 4cc4749..f719a9f 100644 --- a/tv/5pkgs/override/default.nix +++ b/tv/5pkgs/override/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../../lib; self: super: mapNixDir (path: import path self super) ./. diff --git a/tv/5pkgs/simple/default.nix b/tv/5pkgs/simple/default.nix index 6ba4fec..9fb45dd 100644 --- a/tv/5pkgs/simple/default.nix +++ b/tv/5pkgs/simple/default.nix @@ -1,4 +1,4 @@ -with import ; +with import ../../../lib; self: super: -- cgit v1.3.1 [cgit] Unable to lock slot /tmp/cgit/16000000.lock: No such file or directory (2)