From 65a7b6bf03c6976060d897c78fcd391d6b689e2f 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(-) (limited to 'tv') diff --git a/tv/1systems/xu/config.nix b/tv/1systems/xu/config.nix index 05c5c11b0..8a86e209b 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 1f1b82848..634d8338b 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 c378ef4a1d7173dd9a0841242bb553e07959279f 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(-) (limited to 'tv') diff --git a/tv/1systems/mu/config.nix b/tv/1systems/mu/config.nix index 7c3f8cfdb..00b177963 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 0a72dce2a..c723138f1 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 be155af53..5019d8002 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 5374e8447da3191f3bbeca0007d1442578c77dac 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(-) (limited to 'tv') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 8add07ff6..62566c386 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 d389189efd7efe36df6a285efdc6a9caea29b1fe 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') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index 54f845ec2..c09e7f9b1 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 00b177963..21be25766 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 41253cfb3..ad82915f4 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 ec20c4a2f..4ce9c3c75 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 f5eefc5cadd503b4dff96e184f53d202e026c16c 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(-) (limited to 'tv') diff --git a/tv/2configs/pulse.nix b/tv/2configs/pulse.nix index f720ad473..513a0eb17 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 5019d8002..8bedb0e81 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 88a2a5fc9d6003722203e234096e1306bc9b01e6 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(-) (limited to 'tv') diff --git a/tv/5pkgs/haskell/xmonad-tv/src/main.hs b/tv/5pkgs/haskell/xmonad-tv/src/main.hs index cf0c0f538..81373f410 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 9f7875c1db21355608d7ee46d3a1d08e38c72cbf 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 (limited to 'tv') diff --git a/tv/2configs/default.nix b/tv/2configs/default.nix index 62566c386..f3ce2da40 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 000000000..da0d9ce43 --- /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 a501cefc19cac105921612f9544f6d0cd137d9b7 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(-) (limited to 'tv') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 2b9bdeeba..4f6643c7e 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 9170f1618efed14db081d1d3c3daa14bf3aabd8f 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 (limited to 'tv') diff --git a/tv/5pkgs/override/dhcpcd.nix b/tv/5pkgs/override/dhcpcd.nix deleted file mode 100644 index 202b8e5da..000000000 --- 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 1c0078af9685997e5adcbc765148e2efd956803c 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') diff --git a/tv/5pkgs/default.nix b/tv/5pkgs/default.nix index 4f6643c7e..5a018a166 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 4cc4749d0..f719a9f69 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 6ba4fec83..9fb45dd1a 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 20ff460cb3626e4dce81c9a4aa8ae2fb4b61d869 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(-) (limited to 'tv') diff --git a/tv/1systems/alnus/config.nix b/tv/1systems/alnus/config.nix index c09e7f9b1..bddd69efa 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 21be25766..00bd5da15 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 ad82915f4..44c7685e8 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