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/1systems/xu/config.nix | 4 +++- tv/5pkgs/simple/fzmenu/default.nix | 47 +++++++++++++++++++------------------- 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 05c5c11..8a86e20 100644 --- a/tv/1systems/xu/config.nix +++ b/tv/1systems/xu/config.nix @@ -45,7 +45,9 @@ with import ; netcup nmap p7zip - pass-otp + (pkgs.pass.withExtensions (ext: [ + ext.pass-otp + ])) q qrencode texlive.combined.scheme-full 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.2.3 From 6e07fe90b1263e5c940f24c353ebe62016b44185 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:28:17 +0200 Subject: tv: manpages -> man-pages --- tv/1systems/mu/config.nix | 2 +- tv/2configs/man.nix | 8 ++++---- tv/2configs/xserver/default.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 7c3f8cf..00b1779 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -97,7 +97,7 @@ with import ; ]; fonts.fonts = [ - pkgs.xlibs.fontschumachermisc + pkgs.xorg.fontschumachermisc ]; services.xserver.enable = true; diff --git a/tv/2configs/man.nix b/tv/2configs/man.nix index 0a72dce..c723138 100644 --- a/tv/2configs/man.nix +++ b/tv/2configs/man.nix @@ -5,9 +5,9 @@ # s:^NROFF\t.*:& -Wbreak: # ' #''; - environment.systemPackages = with pkgs; [ - manpages - posix_man_pages - xorg.xorgdocs + environment.systemPackages = [ + pkgs.man-pages + pkgs.posix_man_pages + pkgs.xorg.xorgdocs ]; } diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index be155af..5019d80 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -38,7 +38,7 @@ in { ]; fonts.fonts = [ - pkgs.xlibs.fontschumachermisc + pkgs.xorg.fontschumachermisc ]; services.xserver = { -- cgit v1.2.3 From 38675517a76a64b2abf93d5f48e53bf8c98d3ee9 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:30:58 +0200 Subject: tv: iana_etc -> iana-etc --- tv/2configs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8add07f..62566c3 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -46,7 +46,7 @@ with import ; { # TODO check if both are required: - nix.sandboxPaths = [ "/etc/protocols" pkgs.iana_etc.outPath ]; + nix.sandboxPaths = [ "/etc/protocols" pkgs.iana-etc.outPath ]; nix.requireSignedBinaryCaches = true; -- cgit v1.2.3 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(-) 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.2.3 From 6880bdae903bece62fa459469cb4351f982dbff4 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 20:13:11 +0200 Subject: tv: pulseaudioLight -> pulseaudio --- tv/2configs/pulse.nix | 2 +- tv/2configs/xserver/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index f720ad4..513a0eb 100644 --- a/tv/2configs/pulse.nix +++ b/tv/2configs/pulse.nix @@ -2,7 +2,7 @@ with import ; let - pkg = pkgs.pulseaudioLight; + pkg = pkgs.pulseaudio; runDir = "/run/pulse"; pkgs_i686 = pkgs.pkgsi686Linux; diff --git a/tv/2configs/xserver/default.nix b/tv/2configs/xserver/default.nix index 5019d80..8bedb0e 100644 --- a/tv/2configs/xserver/default.nix +++ b/tv/2configs/xserver/default.nix @@ -128,7 +128,7 @@ in { config.imgur.xdg-open.browser = "/etc/profiles/per-user/tv/bin/cr"; config.timeout = 200; }) - pkgs.pulseaudioLight.out + pkgs.pulseaudio.out pkgs.rxvt_unicode pkgs.xcalib "/run/wrappers" # for su -- cgit v1.2.3 From 11293676574d9f763893bb4b724904fb5bf05d1c Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 19 Jun 2022 12:34:14 +0200 Subject: tv xmonad: add 22.05 compatibility --- tv/5pkgs/haskell/xmonad-tv/src/main.hs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs index cf0c0f5..81373f4 100644 --- a/tv/5pkgs/haskell/xmonad-tv/src/main.hs +++ b/tv/5pkgs/haskell/xmonad-tv/src/main.hs @@ -7,7 +7,7 @@ module Main (main) where import System.Exit (exitFailure) import Control.Exception -import Control.Monad.Extra (ifM, whenJustM) +import Control.Monad.Extra (whenJustM) import qualified Data.List import Graphics.X11.ExtraTypes.XF86 import Text.Read (readEither) @@ -68,7 +68,9 @@ mainNoArgs :: IO () mainNoArgs = do workspaces0 <- getWorkspaces0 handleShutdownEvent <- newShutdownEventHandler - launch + let + config = + id $ withUrgencyHook (SpawnUrgencyHook "echo emit Urgency ") $ def { terminal = {-pkg:rxvt_unicode-}"urxvtc" @@ -100,6 +102,8 @@ mainNoArgs = do , focusedBorderColor = "#f000b0" , handleEventHook = handleShutdownEvent } + directories <- getDirectories + launch config directories getWorkspaces0 :: IO [String] -- cgit v1.2.3 From 80f9a5b95fcb5eedd3ab33bf3547dc50ec9a3110 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 21 Jun 2022 21:25:33 +0200 Subject: tv networkd: disable systemd-networkd-wait-online --- tv/2configs/default.nix | 1 + tv/2configs/networkd.nix | 4 ++++ 2 files changed, 5 insertions(+) create mode 100644 tv/2configs/networkd.nix diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 62566c3..f3ce2da 100644 --- a/tv/2configs/default.nix +++ b/tv/2configs/default.nix @@ -15,6 +15,7 @@ with import ; ./bash ./htop.nix ./nets/hkw.nix + ./networkd.nix ./nginx ./pki ./ssh.nix diff --git a/tv/2configs/networkd.nix b/tv/2configs/networkd.nix new file mode 100644 index 0000000..da0d9ce --- /dev/null +++ b/tv/2configs/networkd.nix @@ -0,0 +1,4 @@ +{ + # often hangs + systemd.services.systemd-networkd-wait-online.enable = false; +} -- cgit v1.2.3 From 4102cf02e5f12f07cb6e00b6a298d7a0d94d21d4 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jul 2022 15:38:17 +0200 Subject: tv pkgs pushBack: fix typo --- tv/5pkgs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 2b9bdee..4f6643c 100644 --- a/tv/5pkgs/default.nix +++ b/tv/5pkgs/default.nix @@ -4,7 +4,7 @@ let if elem x xs then remove x xs ++ [ x ] else - names; + xs; in self: super: -- cgit v1.2.3 From 6c000564dbb241bdf75ae474d132eb4e597a93ea Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jul 2022 15:41:59 +0200 Subject: tv dhcpcd: RIP --- tv/5pkgs/override/dhcpcd.nix | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 tv/5pkgs/override/dhcpcd.nix diff --git a/tv/5pkgs/override/dhcpcd.nix b/tv/5pkgs/override/dhcpcd.nix deleted file mode 100644 index 202b8e5..0000000 --- a/tv/5pkgs/override/dhcpcd.nix +++ /dev/null @@ -1,7 +0,0 @@ -self: super: - -self.lib.overrideDerivation super.dhcpcd (old: { - configureFlags = old.configureFlags ++ [ - "--dbdir=/var/lib/dhcpcd" - ]; -}) -- cgit v1.2.3 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(-) 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.2.3 From 65e764d36024863559866dd0a6586e7dff9f3a0e Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 2 Aug 2022 13:43:30 +0200 Subject: tv: pidgin-with-plugins -> pidgin --- tv/1systems/alnus/config.nix | 4 ++-- tv/1systems/mu/config.nix | 4 ++-- tv/1systems/querel/config.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index c09e7f9..bddd69e 100644 --- a/tv/1systems/alnus/config.nix +++ b/tv/1systems/alnus/config.nix @@ -18,8 +18,8 @@ with import ; environment.systemPackages = [ pkgs.firefox pkgs.networkmanagerapplet - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) ]; diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 21be257..00bd5da 100644 --- a/tv/1systems/mu/config.nix +++ b/tv/1systems/mu/config.nix @@ -63,8 +63,8 @@ with import ; pkgs.iptables pkgs.libreoffice pkgs.plasma-pa - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.skypeforlinux pkgs.slock diff --git a/tv/1systems/querel/config.nix b/tv/1systems/querel/config.nix index ad82915..44c7685 100644 --- a/tv/1systems/querel/config.nix +++ b/tv/1systems/querel/config.nix @@ -26,8 +26,8 @@ with import ; pkgs.gimp pkgs.kate pkgs.libreoffice - (pkgs.pidgin-with-plugins.override { - plugins = [ pkgs.pidginotr ]; + (pkgs.pidgin.override { + plugins = [ pkgs.pidgin-otr ]; }) pkgs.sxiv pkgs.texlive.combined.scheme-full -- cgit v1.2.3