feat(zaatar): mount restic disk via nixos

configs/backup.nix

@@ -31,7 +31,7 @@ in
       mountdir=$(mktemp -d)
       trap clean EXIT
       clean() {
-        rm "$mountdir"
+        rm -r "$mountdir"
       }
       ${pkgs.restic}/bin/restic -r ${restic.repository} -p ${<secrets/restic/password>} mount "$mountdir"
     '')

configs/default.nix

@@ -20,6 +20,7 @@ in {
         config = {
           allowUnfree = true;
           packageOverrides = pkgs: {
+            dmenu = pkgs.writers.writeDashBin "dmenu" ''exec ${pkgs.rofi}/bin/rofi -dmenu "$@"'';
             gfs-fonts = pkgs.callPackage <niveum/packages/gfs-fonts.nix> {};
             tocharian-font = pkgs.callPackage <niveum/packages/tocharian-font.nix> {};
             iolanguage = pkgs.callPackage <niveum/packages/iolanguage.nix> { };

configs/i3.nix

@@ -205,14 +205,12 @@ in {
         "${modifier}+0" = "exec ${pkgs.scripts.menu-calc}/bin/=";
 
         "${modifier}+Shift+w" = "exec ${pkgs.scripts.k-lock}/bin/k-lock";
-        "${modifier}+a" =
-          "exec --no-startup-id ${pkgs.rofi}/bin/rofi -display-window — -show window";
-        "${modifier}+d" = "exec --no-startup-id ${pkgs.dmenu}/bin/dmenu_run";
+        "${modifier}+d" = "exec ${pkgs.writers.writeDash "run" ''exec ${pkgs.rofi}/bin/rofi -combi-modi run,drun -modi combi,window -show combi''}";
         "${modifier}+Shift+d" = "exec ${
             pkgs.writers.writeDash "notemenu" ''
               set -efu
               PATH=$PATH:${
-                lib.makeBinPath [ pkgs.dmenu pkgs.findutils pkgs.coreutils ]
+                lib.makeBinPath [ pkgs.rofi pkgs.findutils pkgs.coreutils ]
               }
 
               cd ~/notes
@@ -220,7 +218,7 @@ in {
                 echo diary/$(date -I).md
                 echo diary/$(date -I -d yesterday).md
                 find . -type f -printf "%T@ %p\n" | sort --reverse --numeric-sort | cut --delimiter=" " --fields=2
-              } | dmenu -i)
+              } | rofi -dmenu -i -p 'notes')
               if test "$note_file"
               then
                 i3-sensible-terminal -e "$EDITOR" "$note_file"

configs/rofi.nix

@@ -1,9 +1,10 @@
-{ config, ... }:
+{ config, pkgs, ... }:
 let
   inherit (import <niveum/lib>) colours;
 in{
   home-manager.users.me.programs.rofi = {
     enable = true;
     font = "Monospace 10";
+    theme = "${pkgs.rofi}/share/rofi/themes/Arc-Dark.rasi";
   };
 }

lib/streams.nix

@@ -96,6 +96,10 @@ in [
     logo = "http://radio-rb.de/img/site/logo.png";
     desc = "Голос нашего города ...";
   }
+  {
+    stream = "https://drachenhits.stream.laut.fm/drachenhits";
+    station = "Drachenhits";
+  }
 ] ++
 # generated via: curl https://radiorecord.ru/api/stations | jq '.result.stations | sort_by(.sort) | map({station:.title,desc:.tooltip,logo:.icon_fill_colored,stream:.stream_320})' > radiorecord.json
 importJSON ./radiorecord.json

packages/scripts/dmenurandr.sh

@@ -15,7 +15,7 @@ twoscreen() { # If multi-monitor is selected and there are two screens.
   # Mirror displays using native resolution of external display and a scaled
   # version for the internal display
   if [ "$mirror" = "yes" ]; then
-    external=$(echo "$screens" | dmenu -i -p "Optimize resolution for:")
+    external=$(echo "$screens" | dmenu -i -p "Optimize resolution for")
     internal=$(echo "$screens" | grep -v "$external")
 
     res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \
@@ -38,7 +38,7 @@ twoscreen() { # If multi-monitor is selected and there are two screens.
 
   else
 
-    primary=$(echo "$screens" | dmenu -i -p "Select primary display:")
+    primary=$(echo "$screens" | dmenu -i -p "Select primary display")
     secondary=$(echo "$screens" | grep -v "$primary")
     direction=$(query_direction | dmenu -i -p "What side of $primary should $secondary be on?")
     xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction" "$primary" --auto --scale 1.0x1.0

packages/scripts/unicodmenu.nix

@@ -59,7 +59,7 @@ let
 in # ref https://github.com/LukeSmithxyz/voidrice/blob/9fe6802122f6e0392c7fe20eefd30437771d7f8e/.local/bin/dmenuunicode
 writers.writeDashBin "unicodmenu" ''
   PATH=${lib.makeBinPath [ coreutils dmenu gnused libnotify xclip xdotool ]}
-  chosen=$(cat ${kaomoji-file} ${unicode-file} | dmenu -i -l 10 | sed "s/    .*//")
+  chosen=$(cat ${kaomoji-file} ${unicode-file} | dmenu -p unicode -i -l 10 | sed "s/    .*//")
 
   [ "$chosen" != "" ] || exit
 

systems/makanek/weechat.nix

@@ -120,9 +120,9 @@ in {
               tags = "*";
               regex = "[kc]orona|💉|🤒|😷|[kc]ovid|virus|lockdown|va[kc][sc]in|mutante|mutation|impf|pandemi|κορ[ωο]ν[αο]ϊό|корона|expert|infe[ck]t|infizi|in[cz]iden[cz]|sars-cov|drosten|virolog|lauterbach|delta|omi[ck]ron|epidemi|booster|r-wert";
             };
-            joinquit = {
+            smart = {
               buffer = "*";
-              tags = [ "irc_join" "irc_part" "irc_quit" "irc_nick" ];
+              tags = "irc_smart_filter";
               regex = "*";
             };
             playlist_topic = {
@@ -135,6 +135,11 @@ in {
               tags = "irc_notice";
               regex = "*";
             };
+            bots = {
+              buffer = "irc.retiolum.*";
+              tags = [ "nick_gitlab" ];
+              regex = "*";
+            };
           };
         };
         extraCommands = ''/matrix connect nibbana'';

systems/zaatar/backup.nix

@@ -21,6 +21,11 @@ in
     '')
   ];
 
+  fileSystems."/backup" = {
+    device = "/dev/disk/by-id/ata-ST500LM021-1KJ152_W626LS9M";
+    fsType = "ext4";
+  };
+
   networking.firewall =
   let
     dport = restic.port;