From 1328a34e51e0a14aae8dbfe6469cc580ee739bce Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 21 Jun 2022 22:56:52 +0200 Subject: [PATCH 01/14] flameshot: make imgur great again --- krebs/5pkgs/override/default.nix | 19 +++-------- ...9.0.patch => flameshot_imgur_0.10.2.patch} | 0 .../flameshot/flameshot_imgur_0.6.0.patch | 34 ------------------- 3 files changed, 4 insertions(+), 49 deletions(-) rename krebs/5pkgs/override/flameshot/{flameshot_imgur_0.9.0.patch => flameshot_imgur_0.10.2.patch} (100%) delete mode 100644 krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch diff --git a/krebs/5pkgs/override/default.nix b/krebs/5pkgs/override/default.nix index 1dd694b70..ae42bc1a3 100644 --- a/krebs/5pkgs/override/default.nix +++ b/krebs/5pkgs/override/default.nix @@ -17,21 +17,10 @@ self: super: { repo = "flameshot"; rev = "v${version}"; sha256 = "sha256-rZUiaS32C77tFJmEkw/9MGbVTVscb6LOCyWaWO5FyR4="; - }; - patches = old.patches or [] ++ { - "0.6.0" = [ - ./flameshot/flameshot_imgur_0.6.0.patch - ]; - "0.9.0" = [ - ./flameshot/flameshot_imgur_0.9.0.patch - ]; - "0.10.1" = [ - ./flameshot/flameshot_imgur_0.9.0.patch - ]; - "0.10.2" = [ - ./flameshot/flameshot_imgur_0.9.0.patch - ]; - }.${old.version} or []; + }; + patches = old.patches or [] ++ [ + ./flameshot/flameshot_imgur_0.10.2.patch + ]; }); # https://github.com/proot-me/PRoot/issues/106 diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch similarity index 100% rename from krebs/5pkgs/override/flameshot/flameshot_imgur_0.9.0.patch rename to krebs/5pkgs/override/flameshot/flameshot_imgur_0.10.2.patch diff --git a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch b/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch deleted file mode 100644 index 92023554a..000000000 --- a/krebs/5pkgs/override/flameshot/flameshot_imgur_0.6.0.patch +++ /dev/null @@ -1,34 +0,0 @@ ---- a/src/tools/imgur/imguruploader.cpp -+++ b/src/tools/imgur/imguruploader.cpp -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - - ImgurUploader::ImgurUploader(const QPixmap &capture, QWidget *parent) : - QWidget(parent), m_pixmap(capture) -@@ -74,7 +75,10 @@ void ImgurUploader::handleReply(QNetworkReply *reply) { - QJsonObject json = response.object(); - QJsonObject data = json["data"].toObject(); - m_imageURL.setUrl(data["link"].toString()); -- m_deleteImageURL.setUrl(QString("https://imgur.com/delete/%1").arg( -+ char *deleteImageURLPattern = secure_getenv("IMGUR_DELETE_URL"); -+ if (deleteImageURLPattern == NULL) -+ deleteImageURLPattern = "https://imgur.com/delete/%1"; -+ m_deleteImageURL.setUrl(QString(deleteImageURLPattern).arg( - data["deletehash"].toString())); - onUploadOk(); - } else { -@@ -105,7 +109,10 @@ void ImgurUploader::upload() { - QString description = FileNameHandler().parsedPattern(); - urlQuery.addQueryItem("description", description); - -- QUrl url("https://api.imgur.com/3/image"); -+ char *createImageURLPattern = secure_getenv("IMGUR_CREATE_URL"); -+ if (createImageURLPattern == NULL) -+ createImageURLPattern = "https://api.imgur.com/3/image"; -+ QUrl url(createImageURLPattern); - url.setQuery(urlQuery); - QNetworkRequest request(url); - request.setHeader(QNetworkRequest::ContentTypeHeader, From ecf4c704f1d0d00d6a8408968ab820fbc422213a Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 28 Jun 2022 09:50:47 +0200 Subject: [PATCH 02/14] cidr2glob: python -> python3 --- krebs/5pkgs/simple/cidr2glob.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/krebs/5pkgs/simple/cidr2glob.nix b/krebs/5pkgs/simple/cidr2glob.nix index 9b0b3f86b..47a75ea41 100644 --- a/krebs/5pkgs/simple/cidr2glob.nix +++ b/krebs/5pkgs/simple/cidr2glob.nix @@ -1,6 +1,7 @@ -{ python, writeScriptBin, ... }: +{ python3, writeScriptBin, ... }: let + python = python3; pythonEnv = python.withPackages (ps: [ ps.netaddr ]); in writeScriptBin "cidr2glob" '' @@ -25,6 +26,6 @@ in if __name__ == "__main__": for cidr in sys.stdin: for glob in cidr2glob(cidr): - print glob + print(glob) '' From a68f4b0c8677406618afcf16e83dfe20224c6941 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 28 Jun 2022 09:51:24 +0200 Subject: [PATCH 03/14] github-known-hosts: update list --- krebs/3modules/github-known-hosts.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/krebs/3modules/github-known-hosts.nix b/krebs/3modules/github-known-hosts.nix index 7bdf5bb7c..eec719f27 100644 --- a/krebs/3modules/github-known-hosts.nix +++ b/krebs/3modules/github-known-hosts.nix @@ -57,6 +57,7 @@ "20.201.28.151" "20.205.243.166" "102.133.202.242" + "20.248.137.48" "18.181.13.223" "54.238.117.237" "54.168.17.15" @@ -70,6 +71,7 @@ "20.201.28.152" "20.205.243.160" "102.133.202.246" + "20.248.137.50" ]; publicKey = "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ=="; }; From bce11dce189b4132d7a2f19f473590dea7508e85 Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 28 Jun 2022 11:22:21 +0200 Subject: [PATCH 04/14] veroroute: init at 2.28 --- krebs/5pkgs/simple/veroroute.nix | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 krebs/5pkgs/simple/veroroute.nix diff --git a/krebs/5pkgs/simple/veroroute.nix b/krebs/5pkgs/simple/veroroute.nix new file mode 100644 index 000000000..e40c98e75 --- /dev/null +++ b/krebs/5pkgs/simple/veroroute.nix @@ -0,0 +1,28 @@ +{ pkgs }: + +pkgs.stdenv.mkDerivation rec { + pname = "veroroute"; + version = "2.28"; + + src = pkgs.fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "04dig0g4v1rz50mjj1k6jk99rqbg24hdx8kzrlwv0dlxm567lvc7"; + }; + + buildInputs = [ + pkgs.qt5.qtbase + ]; + nativeBuildInputs = [ + pkgs.qt5.wrapQtAppsHook + ]; + + buildPhase = '' + qmake Src/veroroute.pro + make + ''; + + installPhase = '' + sed -i 's;/usr;;g' veroroute-install.sh + pkgdir=$out bash ./veroroute-install.sh + ''; +} From 65a7b6bf03c6976060d897c78fcd391d6b689e2f Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:14:09 +0200 Subject: [PATCH 05/14] 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 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 ]} '' From c378ef4a1d7173dd9a0841242bb553e07959279f Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:28:17 +0200 Subject: [PATCH 06/14] 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 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 = { From 5374e8447da3191f3bbeca0007d1442578c77dac Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:30:58 +0200 Subject: [PATCH 07/14] 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 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; From dd7ef4034f228ebab4a05d7b622a0c231af13ada Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 19:32:22 +0200 Subject: [PATCH 08/14] krebs: iana_etc -> iana-etc --- krebs/3modules/iana-etc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/krebs/3modules/iana-etc.nix b/krebs/3modules/iana-etc.nix index e8037128d..9ed5f29c5 100644 --- a/krebs/3modules/iana-etc.nix +++ b/krebs/3modules/iana-etc.nix @@ -34,7 +34,7 @@ with import ; '') (filter (proto: entry.${proto} != null) ["tcp" "udp"])} '') (attrValues config.krebs.iana-etc.services)} - cat ${pkgs.iana_etc}/etc/services + cat ${pkgs.iana-etc}/etc/services } | sort -b -k 2,2 -u > $out ''); From d389189efd7efe36df6a285efdc6a9caea29b1fe Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 20:12:06 +0200 Subject: [PATCH 09/14] tv: firefoxWrapper -> firefox --- tv/1systems/alnus/config.nix | 6 +++--- tv/1systems/mu/config.nix | 32 ++++++++++++++++---------------- tv/1systems/querel/config.nix | 20 ++++++++++---------- tv/5pkgs/simple/ff.nix | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) 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 + pkgs.skypeforlinux + pkgs.slock + pkgs.tinc_pre + pkgs.vim + pkgs.xsane - #foomatic_filters - #gutenprint - #cups_pdf_filter - #ghostscript + #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 "$@" '' From f5eefc5cadd503b4dff96e184f53d202e026c16c Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 31 May 2022 20:13:11 +0200 Subject: [PATCH 10/14] 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 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 From 88a2a5fc9d6003722203e234096e1306bc9b01e6 Mon Sep 17 00:00:00 2001 From: tv Date: Sun, 19 Jun 2022 12:34:14 +0200 Subject: [PATCH 11/14] 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 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] From 9f7875c1db21355608d7ee46d3a1d08e38c72cbf Mon Sep 17 00:00:00 2001 From: tv Date: Tue, 21 Jun 2022 21:25:33 +0200 Subject: [PATCH 12/14] 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 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; +} From a501cefc19cac105921612f9544f6d0cd137d9b7 Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jul 2022 15:38:17 +0200 Subject: [PATCH 13/14] 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 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: From 9170f1618efed14db081d1d3c3daa14bf3aabd8f Mon Sep 17 00:00:00 2001 From: tv Date: Thu, 14 Jul 2022 15:41:59 +0200 Subject: [PATCH 14/14] 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 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" - ]; -})