feat: add nixpkgs-mozilla via krops

.gitignore

@@ -3,3 +3,4 @@ result
 .envrc
 .history
 .todo
+node_modules

.versions/home-manager.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/nix-community/home-manager.git",
-  "rev": "49706878e1580d796cc99b63574310405935113f",
-  "date": "2021-05-29T20:24:38+02:00",
-  "path": "/nix/store/ylzkcgmc7237gd3kngyx3l7zzlcsys4x-home-manager",
-  "sha256": "07f903ij0czyhly8kvwjazvz3s6kflxzh5fs6j8781lkxsy47i9f",
+  "rev": "ab64dc32493996c24607eab2cae6663466ddfb8a",
+  "date": "2021-05-29T20:22:40+02:00",
+  "path": "/nix/store/y4fsirhpgf73ngglbskkbfk26hjjssw8-home-manager",
+  "sha256": "1w7qxjibrjlqi7l293pnxxww1wxsq46wf3xbcpibys6g165s05f4",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nixpkgs-mozilla.json

@@ -0,0 +1,10 @@
+{
+  "url": "https://github.com/mozilla/nixpkgs-mozilla",
+  "rev": "ad227c55c34124cde17b30c9bb28be6cd3c70815",
+  "date": "2021-06-01T15:52:18+02:00",
+  "path": "/nix/store/3ylxhj1n5jzl7c6ifxbgcx48pp2xg9f0-nixpkgs-mozilla",
+  "sha256": "1g33k5da71b11bkia7gjfv70d3bpd0vafidgf9qjrgvld0s2n9r9",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

.versions/nixpkgs-unstable.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "f35c86dc1d00187129937bbc28f88cee42aa8991",
-  "date": "2021-05-29T14:15:32-07:00",
-  "path": "/nix/store/869jh3548f6fka8gpg8fn3zpfkdyn3fp-nixpkgs",
-  "sha256": "11ci8ag4yb2l2vig16w26lnkcl8fk36ydx3lcdjgk1pcymm40avl",
+  "rev": "1508c220f98d3166c8b4fda94a409e1c3a11cf79",
+  "date": "2021-06-01T12:42:21-04:00",
+  "path": "/nix/store/3jkhbpszr4jcapqmhprdaxv11dcvix0n-nixpkgs",
+  "sha256": "1gl1gdsw0i24dpkddgwqjg0almrv9ynqwy26jdy5wbzz00gld4a1",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nixpkgs.json

@@ -1,9 +1,9 @@
 {
   "url": "https://github.com/NixOS/nixpkgs.git",
-  "rev": "85960bea533dc2d89dff8836d8a0a1239ddd5c9c",
-  "date": "2021-05-28T12:26:32+02:00",
-  "path": "/nix/store/lhifphbq1hd4ny7qpg11qdyd9h0ckbrx-nixpkgs",
-  "sha256": "0r1h3mh1nrca7wldlx64bdcxdzxz6hw9w7rzg9p6xk83zbmsyb9i",
+  "rev": "d25ea6a0d2a847fb52131da546f2a866656fbafa",
+  "date": "2021-05-31T10:23:40+02:00",
+  "path": "/nix/store/36s35zrv4c51mzlizlnbfhlpw8n4qs0g-nixpkgs",
+  "sha256": "0y2h71pvzrhc2svib4lwjl04hrzy8901ravvlyxlqdbal8hy3838",
   "fetchSubmodules": false,
   "deepClone": false,
   "leaveDotGit": false

.versions/nur.json

@@ -0,0 +1,10 @@
+{
+  "url": "https://github.com/nix-community/NUR",
+  "rev": "57e32d3d8923ade143426ccf1bfbcf4f52f34975",
+  "date": "2021-06-02T04:12:55+00:00",
+  "path": "/nix/store/aqzka9m16d5zkxk8jqa31b40gfmq6a8d-NUR",
+  "sha256": "0y8y28w7g091h4h85prbzvrggdag3nan27563wi00805zyr9wslj",
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

configs/alacritty.nix

@@ -25,7 +25,7 @@
       };
       key_bindings = [
         {
-          key = "Add";
+          key = "Plus";
           mods = "Control";
           action = "IncreaseFontSize";
         }

configs/bluetooth.nix

@@ -1,7 +1,7 @@
 { pkgs, lib, ... }: {
   hardware.bluetooth = {
     enable = true;
-    config.General.Enable =
+    settings.General.Enable =
       lib.concatStringsSep "," [ "Source" "Sink" "Media" "Socket" ];
   };
 

configs/default.nix

@@ -21,10 +21,7 @@ in {
         config = {
           allowUnfree = true;
           packageOverrides = pkgs: {
-            nur = import (builtins.fetchTarball
-              "https://github.com/nix-community/NUR/archive/222ea29ec4afb09c5565a7e5dda14bfd65a4a9f6.tar.gz") {
-                inherit pkgs;
-              };
+            nur = import <nur> { inherit pkgs; };
             writeDashBin = pkgs.writers.writeDashBin;
             writeDash = pkgs.writers.writeDash;
             gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
@@ -45,7 +42,6 @@ in {
     {
       boot.cleanTmpDir = true;
       boot.loader.timeout = 1;
-      boot.extraModulePackages = [ config.boot.kernelPackages.exfat-nofuse ];
     }
     {
       home-manager.users.me = {
@@ -184,7 +180,7 @@ in {
       services.atd.enable = true;
     }
     {
-      services.mingetty = {
+      services.getty = {
         greetingLine = lib.mkForce "";
         helpLine = lib.mkForce "";
       };
@@ -227,7 +223,7 @@ in {
     ./neovim.nix
     ./nix.nix
     ./newsboat.nix
-    ./flameshot-once.nix
+    # ./flameshot-once.nix
     ./packages
     ./power-action.nix
     ./printing.nix
@@ -245,7 +241,7 @@ in {
     ./theming.nix
     ./tmux.nix
     ./tor.nix
-    ./traadfri.nix
+    # ./traadfri.nix
     ./unclutter.nix
     ./version.nix
     ./vscode.nix

configs/fonts.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }: {
+  nixpkgs.config.joypixels.acceptLicense = true;
+
   fonts = {
     enableDefaultFonts = true;
-    enableFontDir = true;
+    fontDir.enable = true;
     fonts = with pkgs; [
       corefonts
       eb-garamond

configs/htop.nix

@@ -2,45 +2,28 @@
   home-manager.users.me = {
     programs.htop = {
       enable = true;
-      colorScheme = 0;
-      accountGuestInCpuMeter = true;
-      cpuCountFromZero = false;
-      delay = 15;
-      detailedCpuTime = false;
-      headerMargin = true;
-      hideKernelThreads = true;
-      hideThreads = true;
-      hideUserlandThreads = true;
-      highlightBaseName = true;
-      highlightMegabytes = true;
-      highlightThreads = true;
-      shadowOtherUsers = true;
-      showProgramPath = false;
-      showThreadNames = false;
-      sortDescending = true;
-      sortKey = "PERCENT_CPU";
-      treeView = true;
-      updateProcessNames = false;
-      meters = {
-        left = [
-          {
-            kind = "LeftCPUs2";
-            mode = 1;
-          }
-          {
-            kind = "RightCPUs2";
-            mode = 1;
-          }
-          {
-            kind = "Memory";
-            mode = 1;
-          }
-          {
-            kind = "Swap";
-            mode = 1;
-          }
-        ];
-        right = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
+      settings = {
+        color_scheme = 0;
+        account_guest_in_cpu_meter = true;
+        cpu_count_from_zero = false;
+        delay = 15;
+        detailed_cpu_time = false;
+        header_margin = true;
+        hide_kernel_threads = true;
+        hide_threads = true;
+        hide_userland_threads = true;
+        highlight_base_name = true;
+        highlight_megabytes = true;
+        highlight_threads = true;
+        shadow_other_users = true;
+        show_program_path = false;
+        show_thread_names = false;
+        sort_descending = true;
+        sort_key = "PERCENT_CPU";
+        tree_view = true;
+        update_process_names = false;
+        right_meters = [ "Uptime" "Tasks" "LoadAverage" "Battery" ];
+        left_meters = [ "LeftCPUs2" "RightCPUs2" "Memory" "Swap" ];
       };
     };
   };

configs/i3.nix

@@ -67,7 +67,7 @@ in {
   home-manager.users.me.xsession.windowManager.i3 = {
     enable = true;
     config = rec {
-      fonts = [ "Sans 10" ];
+      fonts = {names = ["Sans"]; size = 10.0;};
       modifier = "Mod4";
       window = {
         titlebar = false;
@@ -129,7 +129,7 @@ in {
       };
       bars = [{
         workspaceButtons = false;
-        fonts = [ "Sans 8" ];
+        fonts = {names = ["Sans"]; size = 8.0;};
         mode = "hide"; # "dock"
         position = "bottom";
         colors = rec {

configs/packages/default.nix

@@ -93,6 +93,7 @@ in {
     posix_man_pages
     # moreutils # for parallel, sponge, combine
     tree
+    fuse_exfat # to mount windows drives
     parallel # for parallel, since moreutils shadows task spooler
     ripgrep # better grep
     rlwrap

configs/packages/haskell/packages.nix

@@ -87,7 +87,6 @@ with haskellPackages; [
   time
   transformers
   turtle
-  type-unary
   unix-time
   unordered-containers
   vector

configs/packages/writing.nix

@@ -1,7 +1,5 @@
 { pkgs, lib, config, ... }:
 let
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
-
   zoteroStyle = { name, sha256 }: {
     name = "${name}.csl";
     path = pkgs.fetchurl {
@@ -64,14 +62,14 @@ in {
     texlive.combined.scheme-full
     latexrun
     (aspellWithDicts (dict: [ dict.de dict.en dict.en-computers ]))
-    haskellPackages.pandoc-citeproc
+    # haskellPackages.pandoc-citeproc
     nur.repos.kmein.text2pdf
     lowdown
     glow # markdown to term
     libreoffice
     # gnumeric
     dia
-    nixpkgs-unstable.pandoc
+    pandoc
     # proselint
     asciidoctor
     wordnet

configs/radio.nix

@@ -1,7 +1,6 @@
 { lib, pkgs, config, ... }:
 let
   inherit (import <niveum/lib>) tmpfilesConfig;
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
 
   radioStore = "/var/lib/radio";
   htgenPort = 8080;
@@ -98,7 +97,7 @@ in
           ${pkgs.youtube-dl}/bin/youtube-dl -j "https://www.youtube.com/watch?v=$video_id" \
             | ${pkgs.jq}/bin/jq -r '"% [\(.title)](\(.webpage_url))\n\n\(.description)"' \
             | sed 's/$/  /g' \
-            | ${nixpkgs-unstable.pandoc}/bin/pandoc -s
+            | ${pandoc}/bin/pandoc -s
 
           exit
         ;;

configs/urlwatch.nix

@@ -109,6 +109,7 @@ in
   users.extraUsers.urlwatch = {
     home = urlwatchDir;
     createHome = true;
+    isSystemUser = true;
   };
 
   systemd.services.urlwatch = {

configs/wallpaper.nix

@@ -1,49 +1,16 @@
 { pkgs, lib, ... }:
-let
-  /* elementary-wallpapers = pkgs.fetchFromGitHub {
-       owner = "elementary";
-       repo = "wallpapers";
-       rev = "6c81141e33ef69702a3f48e7181cb979a680190d"; # tag: 5.4
-       sha256 = "1ihvv9v8m5f2n2v3bgg769l52wbg241zgp3d45q6phk7p8s1gz3s";
-     };
-     elementary-wallpapers-jpg = pkgs.runCommand "wallpapers" {} ''
-       mkdir $out
-       cp ${elementary-wallpapers}/*.jpg $out/
-     '';
-     luke-smith-wallpapers = pkgs.fetchFromGitHub {
-       owner = "LukeSmithxyz";
-       repo = "wallpapers";
-       rev = "33cad3099919366cea2627f930da9b47609e8554";
-       sha256 = "1li6rrn016fpgvmnijqhvkp07kj83cjwcjx2l2b3asb99d51814i";
-     };
-  kmein-wallpapers = pkgs.fetchFromGitHub {
-    owner = "kmein";
-    repo = "wallpapers";
-    rev = "7c553bc6bd78afa6dbf2824691466bbad0d8e6e9";
-    sha256 = "1zik5z1cq1084j1hdwm204afz89f5hpg21z0vvcbppzkmldfxnnq";
-  };
-  */
-in {
+{
   imports = [ <stockholm/krebs/3modules/fetchWallpaper.nix> ];
 
   krebs.fetchWallpaper = {
     enable = true;
-    # unitConfig.ConditionPathExists = "!/var/run/ppp0.pid";
-    url = "http://prism.r/realwallpaper-krebs-stars.png"; # http://prism.r/realwallpaper-krebs.png"; # "http://prism.r/realwallpaper-krebs-stars.png";
+    url = "http://prism.r/realwallpaper-krebs-stars-berlin.png";
   };
 
+  users.users.fetchWallpaper.isSystemUser = true;
+
   services.xserver = {
     display = lib.mkForce 0; # needed for fetchWallpaper to find the X display
     displayManager.sessionCommands = "${pkgs.xorg.xhost}/bin/xhost +LOCAL:";
   };
-
-  /*
-  home-manager.users.me = {
-    services.random-background = {
-      enable = true;
-      imageDirectory = "${kmein-wallpapers}/meteora";
-      interval = "1h";
-    };
-  };
-  */
 }

configs/weechat.nix

@@ -1,7 +1,6 @@
 { lib, pkgs, ... }:
 let
   inherit (import <niveum/lib>) kieran;
-  nixpkgs-unstable = import <nixpkgs-unstable> {};
   relayPassword = lib.fileContents <system-secrets/weechat/relay>;
 in {
   systemd.services.weechat =
@@ -24,7 +23,7 @@ in {
     '';
     weechat = pkgs.weechat.override {
       configure = { ... }: {
-        scripts = [ pkgs.weechatScripts.weechat-autosort nixpkgs-unstable.weechatScripts.colorize_nicks ];
+        scripts = [ pkgs.weechatScripts.weechat-autosort pkgs.weechatScripts.colorize_nicks ];
         init = let
           coolColors = lib.lists.subtractLists (lib.range 52 69 ++ lib.range 231 248) (lib.range 31 254);
           nick = "kmein";
@@ -65,7 +64,7 @@ in {
           /set logger.level.irc.news.#all 0
 
           /filter addreplace corona irc.news.* * [kc]orona|[kc]ovid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]tion|in[cz]iden[cz]|sars-cov
-          /filter addreplace joinquit * irc_join,irc_part,irc_quit *
+          /filter addreplace joinquit * irc_join,irc_part,irc_quit,irc_nick *
           /filter addreplace playlist_topic irc.*.#the_playlist irc_topic *
 
           /set irc.look.server_buffer independent

deploy.nix

@@ -23,6 +23,8 @@ let
       home-manager.git = gitFromJson .versions/home-manager.json;
       stockholm.git = gitFromJson .versions/stockholm.json;
       retiolum.git = gitFromJson .versions/retiolum.json;
+      nur.git = gitFromJson .versions/nur.json;
+      nixpkgs-mozilla.git = gitFromJson .versions/nixpkgs-mozilla.json;
       system-secrets.pass = {
         dir = toString ~/.password-store;
         name = "systems/${name}";

lib/i3status-rust.nix

@@ -51,6 +51,7 @@ in {
       bat_three_quarters = " ";
       cogs = "🚦 ";
       cpu = "🖥 ";
+      disk_drive = "💽";
       mail = "📧 ";
       memory_mem = "🧠 ";
       music = "🎵";
@@ -71,11 +72,11 @@ in {
       volume_full = "🔊 ";
       volume_half = "🔉 ";
       volume_muted = "🔇";
-      weather_sun = "🌣";
       weather_clouds = "🌥";
+      weather_default = "🌡";
       weather_rain = "🌧";
       weather_snow = "🌨";
-      weather_default = "🌡";
+      weather_sun = "🌣";
       weather_thunder = "🌩";
     };
   };
@@ -83,7 +84,7 @@ in {
     {
       block = "weather";
       autolocate = true;
-      format = "{location}: {temp}°C";
+      format = "{location}: {temp}C";
       service = {
         name = "openweathermap";
         api_key = lib.strings.fileContents <secrets/openweathermap.key>;
@@ -121,10 +122,7 @@ in {
     {
       block = "net";
       device = wirelessInterface;
-      speed_up = false;
-      speed_down = false;
-      signal_strength = true;
-      ssid = true;
+      format = "{ssid} {signal_strength}";
     }
     {
       block = "battery";
@@ -136,12 +134,12 @@ in {
     }
     {
       block = "disk_space";
-      alias = "💽";
+      format = "{icon} {available}";
     }
     {
       block = "memory";
       display_type = "memory";
-      format_mem = "{Mug}G";
+      format_mem = "{mem_used;G}";
       clickable = false;
     }
     { block = "load"; }

overlays/rust.nix

@@ -1,2 +1 @@
-import (builtins.fetchTarball
-  "https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz")
+import <nixpkgs-mozilla>

packages/devanagari/default.nix

@@ -0,0 +1,7 @@
+{ yarn2nix-moretea }:
+yarn2nix-moretea.mkYarnPackage {
+  name = "devanagari";
+  src = ./.;
+  packageJson = ./package.json;
+  yarnLock = ./yarn.lock;
+}

packages/devanagari/devanagari.js

@@ -0,0 +1,13 @@
+#!/usr/bin/env node
+const { createInterface } = require("readline");
+const Sanscript = require("@sanskrit-coders/sanscript");
+
+const rl = createInterface({
+  input: process.stdin,
+  output: process.stdout,
+  terminal: false,
+});
+
+rl.on("line", (line) => {
+  console.log(Sanscript.t(line, "hk", "devanagari"));
+});

packages/devanagari/package.json

@@ -0,0 +1,10 @@
+{
+  "name": "devanagari",
+  "version": "1.0.0",
+  "description": "Transliterates stdin from HK to devanagari",
+  "bin": "devanagari.js",
+  "author": "kmein",
+  "devDependencies": {
+    "@sanskrit-coders/sanscript": "^1.1.5"
+  }
+}

packages/devanagari/yarn.lock

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@sanskrit-coders/sanscript@^1.1.5":
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/@sanskrit-coders/sanscript/-/sanscript-1.1.5.tgz#a22222cf7a5d55f7b19e210242c59f6f819fd643"
+  integrity sha512-YA7MchP2CD2JnAOkj+ORDUFrISiPqx3muvhKvRO3KFOx9UfvpIdEUORoKWJ88lr1uH9T32jDxjns/MSclmDczA==

packages/devanagari/yarn.nix

@@ -0,0 +1,13 @@
+{ fetchurl, fetchgit, linkFarm, runCommandNoCC, gnutar }: rec {
+  offline_cache = linkFarm "offline" packages;
+  packages = [
+    {
+      name = "_sanskrit_coders_sanscript___sanscript_1.1.5.tgz";
+      path = fetchurl {
+        name = "_sanskrit_coders_sanscript___sanscript_1.1.5.tgz";
+        url  = "https://registry.yarnpkg.com/@sanskrit-coders/sanscript/-/sanscript-1.1.5.tgz";
+        sha1 = "a22222cf7a5d55f7b19e210242c59f6f819fd643";
+      };
+    }
+  ];
+}

packages/iolanguage.nix

@@ -1,4 +1,4 @@
-{ stdenv, cmake, python3, fetchFromGitHub }:
+{ lib, stdenv, cmake, python3, fetchFromGitHub }:
 stdenv.mkDerivation rec {
   version = "2017.09.06";
   name = "iolanguage-${version}";
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     cmake -DCMAKE_INSTALL_PREFIX=$out/ ..
     make all
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://iolanguage.org/";
     description =
       "Io programming language. Inspired by Self, Smalltalk and LISP.";

packages/libcoap.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation {
   preConfigure = "./autogen.sh";
   configureFlags = [ "--disable-documentation" "--disable-shared" ]
     ++ lib.optional tls "--enable-dtls";
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/obgm/libcoap";
     description = "A CoAP (RFC 7252) implementation in C";
     platforms = platforms.linux;

packages/scripts/daybook.nix

@@ -1,4 +1,4 @@
-{ stdenv, makeWrapper, pandoc, fetchFromGitHub }:
+{ lib, stdenv, makeWrapper, pandoc, fetchFromGitHub }:
 stdenv.mkDerivation {
   name = "daybook";
   src = fetchFromGitHub {
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     install daybook $out/bin
     wrapProgram $out/bin/daybook --prefix PATH ":" ${pandoc}/bin ;
   '';
-  meta = with stdenv.lib; {
+  meta = with lib; {
     homepage = "https://github.com/kmein/daybook";
     description = "A diary writing utility in sh";
     license = licenses.mit;

packages/scripts/default.nix

@@ -251,20 +251,7 @@ in rec {
     sys.stdout.write(betacode.conv.beta_to_uni(sys.stdin.read()))
   '';
 
-  devanagari = pkgs.writers.writePython3Bin "devanagari" {
-    libraries = [ pkgs.nur.repos.kmein.python3Packages.indic-transliteration ];
-  } ''
-    from indic_transliteration import sanscript
-    from indic_transliteration.sanscript import transliterate
-    import sys
-
-    # Harvard Kyoto -> Devanagari
-    sys.stdout.write(transliterate(
-      sys.stdin.read(),
-      sanscript.HK,
-      sanscript.DEVANAGARI
-    ))
-  '';
+  devanagari = pkgs.callPackage ../devanagari {};
 
   manual-sort = pkgs.writers.writeHaskellBin "manual-sort" {} ''
     {-# LANGUAGE LambdaCase #-}

packages/scripts/meteo.sh

@@ -24,7 +24,7 @@ case ${1-} in
     mkdir -p "$(dirname "$STATIONS_FILE")"
     exec >"$STATIONS_FILE"
 
-    curl -fsS http://wetterstationen.meteomedia.de/ |
+    curl -fsSL http://wetterstationen.meteomedia.de/ |
     jq -Rrs '
       def decodeHTML:
         gsub("ä";"ä") |
@@ -65,7 +65,7 @@ station=$(jq -e -n \
   end
 ')
 cache="/tmp/${LOGNAME}_wetter_$station.png"
-curl -sS \
+curl -sSL \
     "http://wetterstationen.meteomedia.de/messnetz/vorhersagegrafik/$station.png" \
     -o "$cache"
 

packages/scripts/nav.nix

@@ -1,4 +1,4 @@
-{ fetchFromGitHub, stdenv, fzf }:
+{ lib, fetchFromGitHub, stdenv, fzf }:
 stdenv.mkDerivation rec {
   name = "nav";
   version = "8da22b1";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   '';
   propagatedBuildInputs = [ fzf ];
   meta = {
-    maintainer = [ stdenv.lib.maintainers.kmein ];
+    maintainer = [ lib.maintainers.kmein ];
     description = "JSON data structure navigator";
     homepage = "https://github.com/huntrar/nav";
   };

packages/scripts/pls.nix

@@ -16,7 +16,7 @@ let
     ${pkgs.nur.repos.mic92.untilport}/bin/untilport ${irc.host} ${toString irc.port} && \
     ${pkgs.nur.repos.mic92.irc-announce}/bin/irc-announce \
       ${irc.host} ${toString irc.port} ${irc.nick} ${lib.escapeShellArg irc.channel} ${toString (if irc.tls then 1 else 0)} \
-      "$*"
+      "$*" 2>&1 >/dev/null
   '';
 
   messages.good = [
@@ -45,16 +45,18 @@ let
 in
 pkgs.writers.writeDashBin "pls" ''
   case "$1" in
-    good|like|cool|nice|noice|top|yass|yes|+)
-      # ${sendIRC} "$(echo "${lib.concatStringsSep "\n" messages.good}" | shuf -n1)" &
+    good|like|cool|nice|noice|top|yup|yass|yes|+)
+      ${sendIRC} "$(echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.good)} | shuf -n1)" &
       ${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/good"
     ;;
     skip|next|bad|sucks|no|nope|flop|-)
-      # ${sendIRC} "$(echo "${lib.concatStringsSep "\n" messages.bad}" | shuf -n1)" &
+      ${sendIRC} "$(echo ${lib.escapeShellArg (lib.concatStringsSep "\n" messages.bad)} | shuf -n1)" &
       ${pkgs.curl}/bin/curl -sS -XPOST "${playlistAPI}/skip"
     ;;
     *)
-      ${pkgs.curl}/bin/curl -sS -XGET "${playlistAPI}/current" | ${pkgs.jq}/bin/jq
+      ${pkgs.curl}/bin/curl -sS -XGET "${playlistAPI}/current" \
+        | ${pkgs.miller}/bin/mlr --ijson --oxtab cat \
+        | ${pkgs.gnused}/bin/sed -n '/artist\|title\|youtube/p'
     ;;
   esac
   wait

shell.nix

@@ -1,5 +1,5 @@
 { pkgs ? import <nixpkgs> { }
-, release ? "20.09"
+, release ? "21.05"
 }:
 let
   inherit (pkgs) lib;
@@ -35,6 +35,16 @@ let
       url = "https://github.com/krebs/retiolum";
       path = toString .versions/retiolum.json;
     };
+    nur = {
+      ref = "refs/heads/master";
+      url = "https://github.com/nix-community/NUR";
+      path = toString .versions/nur.json;
+    };
+    nixpkgs-mozilla = {
+      ref = "refs/heads/master";
+      url = "https://github.com/mozilla/nixpkgs-mozilla";
+      path = toString .versions/nixpkgs-mozilla.json;
+    };
   };
 in pkgs.mkShell {
   buildInputs = [

systems/toum/configuration.nix

@@ -13,7 +13,7 @@ in {
     <niveum/configs/wifi.nix>
     <niveum/configs/tmux.nix>
     <niveum/configs/version.nix>
-    <niveum/configs/traadfri.nix>
+    # <niveum/configs/traadfri.nix>
     <niveum/modules/retiolum.nix>
   ];
 
@@ -28,7 +28,7 @@ in {
 
   environment.systemPackages = with pkgs; [
     git vim htop wget reptyr
-    raspberrypi-tools
+    libraspberrypi
   ];
 
   users.mutableUsers = false;

systems/wilde/configuration.nix

@@ -7,7 +7,7 @@ in
     <niveum/configs/default.nix>
     <niveum/configs/battery.nix>
     ./hardware-configuration.nix
-    <stockholm/krebs/2configs/hw/x220.nix>
+    # <stockholm/krebs/2configs/hw/x220.nix>
   ];
 
   niveum = {