Merge remote-tracking branch 'lass/master'

2022-09-29 11:08:22 +02:00 · 2022-09-29 11:08:22 +02:00 · 0f24348d8b
parent 809a10fccb 8f929b04b3
commit 0f24348d8b
19 changed files with 84 additions and 29 deletions
--- a/krebs/2configs/news.nix
+++ b/krebs/2configs/news.nix
@ -44,7 +44,7 @@
    path = [
      pkgs.graphviz
      pkgs.jq
-      pkgs.inotifyTools
+      pkgs.inotify-tools
    ];
    serviceConfig = {
      ExecStart = pkgs.writers.writeDash "brockman-graph" ''
--- a/krebs/2configs/reaktor2.nix
+++ b/krebs/2configs/reaktor2.nix
@ -52,7 +52,7 @@ let
              PATH = makeBinPath [
                pkgs.coreutils # XXX env, touch
                pkgs.jq # XXX sed
-                pkgs.utillinux # XXX flock
+                pkgs.util-linux # XXX flock
              ];
              state_file = "${stateDir}/tell.json";
            };
@ -107,7 +107,7 @@ let
              PATH = makeBinPath [
                pkgs.coreutils # XXX date, env
                pkgs.jq # XXX sed
-                pkgs.utillinux # XXX flock
+                pkgs.util-linux # XXX flock
              ];
              state_file = "${stateDir}/tell.txt";
            };
--- a/krebs/3modules/backup.nix
+++ b/krebs/3modules/backup.nix
@ -82,7 +82,7 @@ let
          gnused
          openssh
          rsync
-          utillinux
+          util-linux
        ];
        restartIfChanged = false;
        serviceConfig = rec {
--- a/krebs/3modules/external/default.nix
+++ b/krebs/3modules/external/default.nix
@ -112,6 +112,33 @@ in {
        };
      };
    };
+
+    porree = {
+      owner = config.krebs.users.pinpox;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.100.101";
+          aliases = [ "porree.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIICCgKCAgEAvUeG5/8O8ZyDulpvdKNcA20aZIUv3YdUe9XJ0lNUgMCg6YdWTmba
+            03wfm/SPoUM4ZOb6/QyEmdNWxQbeKVPZ8cNs/uDLMmpEoSaSKWsp7ZqtrxxincUY
+            AGhyrU0h59lIZXZtmIp1Uc3Y7GYdX9MM2RsOs+0dYwCzZlHjarmNjxLRBcEbugMR
+            +86zrwtcLGKBmMMhRbMQ/y07zwxb5wFSF7nSgFD0yzFjmaBLU6mYtzRR0hb17n34
+            xmB7Lpj7ROtbB20btTmdyXHuE8P+5mohJavqAnpKiLNFLt9tNk1Vc4qAxlDkubZW
+            SoHuPNyE/563jooL1DHDQ2EZ4lDweTYlT0gAOYGCcNVoCFCs/rbFK4u2p5FCVAfE
+            bhc0Fm3fKNk6An1wIsSEg7UcYeTbaFBHbqr+7TiLyS2aehkgy4FF4n6ACDeF9cHM
+            80OHh+N1wz7uL7BHcniTws7VWyloPOoEUJlZEDzHF/p1nfpDULsqNM0o8QGNmOeT
+            4J2Sp+jJLin/8g2tPH+zMSge5rnFlPuBaRVZ5dwajdyq3USNgtVH1lZFx8sTLsAC
+            JEW9Jn3xPDCaLGWp2fFzsg0hPxOG0SYD75coZcfikJ6MedvHFHAmf9KBYJxFWcXa
+            JGky/WwdAF2f34e2vk/mWrjfgBIDzXU01Opm99lgWuMr5HMkCzH1kssCAwEAAQ==
+            -----END RSA PUBLIC KEY-----
+          '';
+          tinc.pubkey_ed25519 = "pXVWAPo/1JWhRs/0ip4Hz0bOSHTJa7FfaI74elU8XsL";
+        };
+      };
+    };
+
    qubasa = {
      owner = config.krebs.users.qubasa;
      nets = {
@ -137,6 +164,31 @@ in {
        };
      };
    };
+    kfbox = {
+      owner = config.krebs.users.pinpox;
+      nets = {
+        retiolum = {
+          ip4.addr = "10.243.100.102";
+          aliases = [ "kfbox.r" ];
+          tinc.pubkey = ''
+            -----BEGIN RSA PUBLIC KEY-----
+            MIICCgKCAgEAis/ORNebUUz/yBTjouXVNoBHTVaEcpZE+cD9EWv975k0evxxb4s5
+            W87fZ6YkQgYtgFScaBMgqDbUdi/zMAkhJb2cn+fOGvuH7QqfiuEdG+lncllN9JlS
+            LpkP11COWmf60ThFieOa39xOT6atZc4cE0MMhw7CJUdIK7Y/EsHH1rVCWFdAKRIw
+            4tM7H2Goi7+Tp2guRVFnM/lzRPnIbGOUQxrkMDB2gmpHdCpYWfAQZGzvxlIqrazC
+            oPcaF0Pk6URkxGWeRUqJnwcGWxxaiA1KW+okma+Mv5k1DMr8pIK0ywWULMkNzjpP
+            IIJybkeKomOaQmzjZ2RKulOS8A4OOxiDw9Y6I4x+1qFa1seAmYWWafnHCRPQb40g
+            q5LCTfJaSvYfEEhs9xfo7vBd4IoYsymIQpLUV4BeNINazpRwNIb2AmHSknMnPZFR
+            Hu8kvN/D6vNlSt7hR+sWU2XgNTJV/MizvG/6N+9wGSPL15dmt8XiSCjSv2mzBSaW
+            7bVFoa57Y0OOwZUeK9SRJKMKPfxcNH9zGTMsb0Qnn0zFwscNnkDyA8Z4zPt4GpCX
+            b3qlAwKFHHVByuDiWrjr6zfSKU/rEU/CRBoWnTcIwSZRhxvAiX82XgUf0qDtFKY9
+            Wh+K8/4tfwX9niGTznIIic6Qmbm1O5MNjaPSPCK2bEgEMhQt9YkA4scCAwEAAQ==
+            -----END RSA PUBLIC KEY-----
+          '';
+          tinc.pubkey_ed25519 = "fXVRppte1zStbyfrbgJwamJXZnHYJkcC15f90u0sUJM";
+        };
+      };
+    };
    keller = {
      owner = config.krebs.users.qubasa;
      nets = {
--- a/krebs/3modules/external/mic92.nix
+++ b/krebs/3modules/external/mic92.nix
@ -891,7 +891,10 @@ in {
        };
        retiolum = {
          via = internet;
-          aliases = [ "jack.r" ];
+          aliases = [
+            "jack.r"
+            "stable-confusion.r"
+          ];
          tinc.pubkey = ''
            -----BEGIN RSA PUBLIC KEY-----
            MIIBCgKCAQEAx5ROeRs0CxD2IPfkrFB4O03/Kf8Ajjmd/J1gpCvHROKL+gDvaCO1
--- a/krebs/3modules/permown.nix
+++ b/krebs/3modules/permown.nix
@ -69,7 +69,7 @@ with import <stockholm/lib>;
        path = [
          pkgs.coreutils
          pkgs.findutils
-          pkgs.inotifyTools
+          pkgs.inotify-tools
        ];
        serviceConfig = {
          ExecStart = pkgs.writeDash "permown" ''
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@ -155,7 +155,7 @@ with import <stockholm/lib>;

        iproutePackage = mkOption {
          type = types.package;
-          default = pkgs.iproute;
+          default = pkgs.iproute2;
          description = "Iproute2 package to use.";
        };

--- a/krebs/5pkgs/simple/K_belwagen.nix
+++ b/krebs/5pkgs/simple/K_belwagen.nix
@ -9,7 +9,7 @@ stdenv.mkDerivation {

  buildInputs = [
    pkgs.jack1
-    pkgs.pkgconfig
+    pkgs.pkg-config
  ];

  patchPhase = ''
--- a/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
+++ b/krebs/5pkgs/simple/Reaktor/scripts/tell-on_join.sh
@ -1,7 +1,7 @@
 #! /bin/sh
 set -euf

-# require flock from util-linux (pkgs.utillinux)
+# require flock from util-linux (pkgs.util-linux)
 if test "${FLOCK-}" != "$state_file"; then
  exec env FLOCK="$state_file" flock "$state_file" "$0" "$@"
 fi
--- a/krebs/5pkgs/simple/cac-api/default.nix
+++ b/krebs/5pkgs/simple/cac-api/default.nix
@ -1,5 +1,5 @@
 { fetchgit, lib, stdenv
-, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotifyTools, jq, ncurses, openssh, sshpass
+, bc, cac-cert, coreutils, curl, dash, gnugrep, gnused, inotify-tools, jq, ncurses, openssh, sshpass
 }:

 stdenv.mkDerivation {
@ -26,7 +26,7 @@ stdenv.mkDerivation {
      curl
      gnugrep
      gnused
-      inotifyTools
+      inotify-tools
      jq
      ncurses
      openssh
--- a/krebs/5pkgs/simple/dic/default.nix
+++ b/krebs/5pkgs/simple/dic/default.nix
@ -1,5 +1,5 @@
 { fetchgit, lib, stdenv
-, coreutils, curl, gnugrep, gnused, utillinux
+, coreutils, curl, gnugrep, gnused, util-linux
 }:

 stdenv.mkDerivation {
@ -23,7 +23,7 @@ stdenv.mkDerivation {
        curl
        gnused
        gnugrep
-        utillinux
+        util-linux
      ];
    in
    ''
--- a/krebs/5pkgs/simple/fzfmenu/default.nix
+++ b/krebs/5pkgs/simple/fzfmenu/default.nix
@ -48,7 +48,7 @@ pkgs.writeDashBin "fzfmenu" ''
    exec 4>&1
    export FZFMENU_INPUT_FD=3
    export FZFMENU_OUTPUT_FD=4
-    exec ${pkgs.rxvt_unicode}/bin/urxvt \
+    exec ${pkgs.rxvt-unicode}/bin/urxvt \
        -name ${cfg.appName} \
        -title ${shell.escape cfg.windowTitle} \
        -e "$0" "$@"
--- a/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
+++ b/krebs/5pkgs/simple/htgen-cyberlocker/default.nix
@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
        pkgs.gnugrep
        pkgs.jq
        pkgs.nix
-        pkgs.utillinux
+        pkgs.util-linux
      ]}
      echo STATEDIR=${shell.escape "\${STATEDIR-$HOME}"}
      cat $src/htgen-cyberlocker
--- a/krebs/5pkgs/simple/htgen-imgur/default.nix
+++ b/krebs/5pkgs/simple/htgen-imgur/default.nix
@ -1,4 +1,4 @@
-{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, stockholm, utillinux, stdenv }:
+{ attr, coreutils, exiv2, findutils, gnugrep, jq, nix, stockholm, util-linux, stdenv }:
 stdenv.mkDerivation rec {
  pname = "htgen-imgur";
  version = "1.0.0";
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
        findutils
        gnugrep
        jq
-        nix utillinux
+        nix util-linux
      ]}
      echo STATEDIR=${stockholm.lib.shell.escape "\${STATEDIR-$HOME}"}
      cat $src/htgen-imgur
--- a/krebs/5pkgs/simple/withGetopt.nix
+++ b/krebs/5pkgs/simple/withGetopt.nix
@ -1,4 +1,4 @@
-{ coreutils, quote, stockholm, utillinux, writeDash }:
+{ coreutils, quote, stockholm, util-linux, writeDash }:
 with stockholm.lib;

 opt-spec: cmd-spec: let
@ -46,7 +46,7 @@ in writeDash wrapper-name ''
  WITHGETOPT_ORIG_ARGS=$(${quote}/bin/quote "$@")
  export WITHGETOPT_ORIG_ARGS

-  args=$(${utillinux}/bin/getopt \
+  args=$(${util-linux}/bin/getopt \
      -l ${shell.escape
            (concatMapStringsSep ","
              (opt: opt.long + optionalString (!opt.switch) ":")
--- a/krebs/nixpkgs-unstable.json
+++ b/krebs/nixpkgs-unstable.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "c97e777ff06fcb8d37dcdf5e21e9eff1f34f0e90",
-  "date": "2022-09-11T12:47:08-03:00",
-  "path": "/nix/store/ixhh3xyag61ps64dgbclgkz80hgv36qv-nixpkgs",
-  "sha256": "1h4g8hf7zi6an5j2lnwf7kbmmbrwp6hhqdf87gd14y24d43sp4x0",
+  "rev": "79d3ca08920364759c63fd3eb562e99c0c17044a",
+  "date": "2022-09-25T12:45:53+01:00",
+  "path": "/nix/store/1rvdfqmxgvd0p2srlav3k7w1d50yvg0m-nixpkgs",
+  "sha256": "1zz72k161yl9dxs5nxgy5p6nh8zsz4fbpclm99r12jw39zrlzhhw",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/krebs/nixpkgs.json
+++ b/krebs/nixpkgs.json
@ -1,9 +1,9 @@
 {
  "url": "https://github.com/NixOS/nixpkgs",
-  "rev": "bf014cad818ecd1b28e68c1e7138fb988f504fdc",
-  "date": "2022-09-12T09:29:23+02:00",
-  "path": "/nix/store/cpp120bajfgdb8sb1nmm316pav16cjk4-nixpkgs",
-  "sha256": "0xdf1xclck8j8zxlnhkjgci4a4405rh9n6wx9c3vmk0dvb31lvi9",
+  "rev": "72783a2d0dbbf030bff1537873dd5b85b3fb332f",
+  "date": "2022-09-25T14:12:58+02:00",
+  "path": "/nix/store/5nbfx7dz3ghxvvc1248vpd1qgan1dhww-nixpkgs",
+  "sha256": "1xggh6cim9kxl7nr6fwmsxzqqlnazyddak30xcd4api3f9g3slnz",
  "fetchLFS": false,
  "fetchSubmodules": false,
  "deepClone": false,
--- a/lass/2configs/network-manager.nix
+++ b/lass/2configs/network-manager.nix
@ -15,7 +15,7 @@
  users.users.mainUser = {
    extraGroups = [ "networkmanager" ];
    packages = with pkgs; [
-      gnome3.gnome-keyring
+      gnome.gnome-keyring
      dconf
    ];
  };
--- a/lass/5pkgs/q/default.nix
+++ b/lass/5pkgs/q/default.nix
@ -204,7 +204,7 @@ let
      ${pkgs.iw}/bin/iw dev \
        | ${pkgs.gnused}/bin/sed -n 's/^\s*Interface\s\+\([0-9a-z]\+\)$/\1/p'
    ); do
-      inet=$(${pkgs.iproute}/bin/ip addr show $dev \
+      inet=$(${pkgs.iproute2}/bin/ip addr show $dev \
        | ${pkgs.gnused}/bin/sed -n '
            s/.*inet \([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/p
          ') \