chore: update

configs/flix.nix

@@ -88,10 +88,10 @@ in {
     '')
     (pkgs.writers.writeDashBin "flixmenu" ''
       set -efu
-      cd "${flixLocation}"
-
-      cat ${cacheLocation}/${indexFilename} ${cacheLocation}/${indexFilenameNew} \
-        | ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" \
+      (
+        ${pkgs.gnused}/bin/sed 's#^\.#${flixLocation}#' ${cacheLocation}/${indexFilename}
+        ${pkgs.gnused}/bin/sed 's#^\.#${flixLocationNew}#' ${cacheLocation}/${indexFilenameNew}
+      ) | ${pkgs.dmenu}/bin/dmenu -i -p flix -l 5 "$@" \
         | ${pkgs.findutils}/bin/xargs -I '{}' ${pkgs.util-linux}/bin/setsid ${pkgs.xdg-utils}/bin/xdg-open '{}'
     '')
   ];

configs/i3.nix

@@ -216,6 +216,9 @@ in {
         "k" = "resize shrink height 10 px or 5 ppt";
         "l" = "resize grow width 10 px or 5 ppt";
       };
+      extraConfig = ''
+        bindsym --release ${modifier}+Shift+w exec /run/wrappers/bin/slock
+      '';
       keybindings = {
         "${modifier}+Shift+h" = "move left 25 px";
         "${modifier}+Shift+j" = "move down 25 px";
@@ -261,7 +264,6 @@ in {
         "${modifier}+y" = "exec ${(defaultApplications pkgs).browser}";
         "${modifier}+0" = "exec ${niveumPackages.menu-calc}/bin/=";
 
-        "${modifier}+Shift+w" = "exec slock";
         "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec rofi -modi run,ssh,window -show run''}";
         "${modifier}+Shift+d" = "exec ${
           pkgs.writers.writeDash "notemenu" ''

configs/picom.nix

@@ -8,14 +8,18 @@
     shadow = true;
     menuOpacity = 0.9;
     shadowOpacity = 0.3;
+    fadeExclude = [
+      "class_g = 'slock'" # don't want a transparent lock screen!
+      "name *?= 'slock'"
+      "focused = 1"
+    ];
     opacityRules = [
       # opacity-rule overrides both inactive and active opacity
-      "100:class_g = 'slock'" # don't want a transparent lock screen!
 
       # video in browser tabs
       # substring /regex match of title bar text
-      "100:name *?= 'Youtube'"
-      "100:name *?= 'slock'"
+      "99:name *?= 'Youtube'"
+      "99:WM_CLASS@:s *= 'mpv$'"
     ];
   };
 }

flake.lock

@@ -61,11 +61,11 @@
     },
     "flake-utils": {
       "locked": {
-        "lastModified": 1676283394,
-        "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=",
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "3db36a8b464d0c4532ba1c7dda728f4576d6d073",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
         "type": "github"
       },
       "original": {
@@ -232,11 +232,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1678285456,
-        "narHash": "sha256-2rIk5OFGQmoFX1MWntKGPVCZvy5yQMX3ZCYz7i8+yb0=",
+        "lastModified": 1679067101,
+        "narHash": "sha256-tMI1inGT9u4KWQml0w30dhWqQPlth1e9K/68sfDkEQA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "b0be47978de5cfd729a79c3f57ace4c86364ff45",
+        "rev": "9154cd519a8942728038819682d6b3ff33f321bb",
         "type": "github"
       },
       "original": {
@@ -425,11 +425,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1678230755,
-        "narHash": "sha256-SFAXgNjNTXzcAideXcP0takfUGVft/VR5CACmYHg+Fc=",
+        "lastModified": 1679318992,
+        "narHash": "sha256-uoj5Oy6hruIHuxzfQZtcalObe5kPrX9v+ClUMFEOzmE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a7cc81913bb3cd1ef05ed0ece048b773e1839e51",
+        "rev": "e2c97799da5f5cd87adfa5017fba971771e123ef",
         "type": "github"
       },
       "original": {
@@ -519,11 +519,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1678473259,
-        "narHash": "sha256-1qi+GOyblUszMVMVFrfH0F8ChfIgYpPguo0XrZ6fX4A=",
+        "lastModified": 1679463968,
+        "narHash": "sha256-SBNgZb/Gc/9RbEvxz+jQ2o6nWNt1gzTwAw16lShT/ho=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "7a77655138a8dd524979f77db094f405b2310576",
+        "rev": "52e6a7748992cde538e52f3fa4737f64b5bec03d",
         "type": "github"
       },
       "original": {
@@ -554,11 +554,11 @@
     },
     "retiolum": {
       "locked": {
-        "lastModified": 1678431618,
-        "narHash": "sha256-iylig3FvzfAVls7MVQDJK2Ay1aOfQSGr6TUKvdlKTGQ=",
+        "lastModified": 1678773616,
+        "narHash": "sha256-POr8rTMNmcnwe2tnWxhXG7T3W4wQp8cjN+TFpwsiLrs=",
         "ref": "refs/heads/master",
-        "rev": "ed80287b055aa4144dba42aac16fb7d010e59be5",
-        "revCount": 287,
+        "rev": "5492459f4516b89686e1d8086c9b46db39b6902b",
+        "revCount": 289,
         "type": "git",
         "url": "https://git.thalheim.io/Mic92/retiolum"
       },
@@ -793,11 +793,11 @@
     "voidrice": {
       "flake": false,
       "locked": {
-        "lastModified": 1677695902,
-        "narHash": "sha256-VqfXArpVFfdNQm3/SQwrX79BRQ0fJUAjSwvgz1LcWTc=",
+        "lastModified": 1679320229,
+        "narHash": "sha256-M4D8bR9PJnvBfx4EN06bj4Fr0yXSi9po09aT9v3D7QQ=",
         "owner": "Lukesmithxyz",
         "repo": "voidrice",
-        "rev": "37930fdf573c4834e080c4a2ea94706c5465071c",
+        "rev": "0e2cd987dc2659c5c08a834a7cb4c2478b49cf31",
         "type": "github"
       },
       "original": {

lib/default.nix

@@ -72,7 +72,7 @@ rec {
     sshKeys = pkgs:
       pkgs.lib.strings.splitString "\n" (pkgs.lib.strings.fileContents (pkgs.fetchurl {
         url = "https://github.com/kmein.keys";
-        sha256 = "09c6ny0rmpid1m0pc1wsmb3wyy9g721lf4kv55i4lrp42b3i2d5b";
+        hash = "sha256-TvvPwplrH9cw7NE4GKqbE5ga+oBHM+TkjxYQ3b1fpLI=";
       }));
   };
 

systems/ful/configuration.nix

@@ -11,6 +11,7 @@ in {
     ./matomo.nix
     ./radio.nix
     ../../configs/monitoring.nix
+    ../../configs/tor.nix
     ../../configs/save-space.nix
     ../../configs/spacetime.nix
     ../../configs/retiolum.nix

systems/ful/radio.nix

@@ -72,11 +72,11 @@
 in {
   # https://github.com/savonet/liquidsoap/issues/1043#issuecomment-593354427
   services.liquidsoap.streams.radio = pkgs.writeText "lyrikline.liq" ''
-    set("protocol.external.curl","${pkgs.curl}/bin/curl")
+    set("protocol.external.curl","${pkgs.torsocks}/bin/torsocks ${pkgs.curl}/bin/curl")
 
     def random_url(script) =
       mksafe(audio_to_stereo(request.dynamic.list(
-        fun () -> list.map(request.create, get_process_lines(script))
+        fun () -> list.map(request.create, process.read.lines(script))
       )))
     end