fix: fix some issues causes by latest flake update

home/desktop-river/waybar.nix

@@ -9,17 +9,17 @@
       modules-left = [ "river/tags" ];
       modules-center = [ "river/window" ];
       modules-right = [ "tray" "pulseaudio" "battery" "network" "clock" ];
-      clock.format = ''{: %m/%d <span color="#a89984">|</span>  %H:%M}'';
+      clock.format = ''{:󰃮 %m/%d <span color="#a89984">|</span> 󱑒 %H:%M}'';
       network = {
         format-icons = [
-          ''<span color="#fb4944">直</span>''
+          ''<span color="#fb4944">󰖩 </span>''
-          ''<span color="#fabd2f">直</span>''
+          ''<span color="#fabd2f">󰖩 </span>''
-          ''<span color="#b8bb26">直</span>''
+          ''<span color="#b8bb26">󰖩 </span>''
         ];
         format = "({ifname})";
         format-wifi = "{icon} {signalStrength}";
-        format-disconnected = ''<span color="#a89974">睊</span>'';
+        format-disconnected = ''<span color="#a89974">󰖪 </span>'';
-        format-ethernet = "";
+        format-ethernet = "󰈀";
       };
       battery = {
         states = {
@@ -27,31 +27,35 @@
           warning = 50;
           critical = 20;
         };
+
         format-icons = {
           discharging = [
-            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944">󰁺 </span>''
-            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944">󰁻 </span>''
-            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944">󰁼 </span>''
-            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f">󰁽 </span>''
-            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f">󰁾 </span>''
-            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f">󰁿 </span>''
-            ''<span color="#b8bb26"></span>''
+            ''<span color="#b8bb26">󰂀 </span>''
-            ''<span color="#b8bb26"></span>''
+            ''<span color="#b8bb26">󰂁 </span>''
-            ''<span color="#b8bb26"></span>''
+            ''<span color="#b8bb26">󰂂 </span>''
           ]; # 
           charging = [
-            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944">󰢜 </span>''
-            ''<span color="#fb4944"></span>''
+            ''<span color="#fb4944">󰂆 </span>''
-            ''<span color="#fabd2f"></span>''
+            ''<span color="#fb4944">󰂇 </span>''
-            ''<span color="#fabd2f"></span>''
+            ''<span color="#fabd2f">󰂈 </span>''
-            ''<span color="#b8bb26"></span>''
+            ''<span color="#fabd2f">󰢝 </span>''
-            ''<span color="#b8bb26"></span>''
+            ''<span color="#fabd2f">󰂉 </span>''
+            ''<span color="#b8bb26">󰢞 </span>''
+            ''<span color="#b8bb26">󰂊 </span>''
+            ''<span color="#b8bb26">󰂋 </span>''
           ]; # 
         };
-        format = " {capacity}";
+        format = "󰁹 {capacity}";
-        format-full = "";
+        format-full = "󰁹";
-        format-good-charging = "";
+        format-good-charging = "󰂅 ";
-        format-plugged = "";
+        format-plugged = "󰂄 ";
         format-charging = "{icon} {capacity}";
         format-discharging = "{icon} {capacity} ({time})";
         interval = 5;
@@ -62,13 +66,13 @@
           very_high = 111;
         };
         format-icons = [
-          ''<span color="#a89974">奄</span>''
+          ''<span color="#a89974">󰕿 </span>''
-          ''<span color="#83a587">奔</span>''
+          ''<span color="#83a587">󰖀 </span>''
-          ''<span color="#b8bb26">墳</span>''
+          ''<span color="#b8bb26">󰕾 </span>''
         ];
         format = "{icon} {volume}";
-        format-bluetooth = "{icon} {volume}";
+        format-bluetooth = "󰂯 {icon} {volume}";
-        format-muted = "ﱝ";
+        format-muted = "󰸈 ";
       };
 
       tray.icon-size = 14;

home/nixos-common.nix

@@ -2,18 +2,20 @@
 
 {
 
+  nixpkgs.config = { allowUnfree = true; };
+
   nixpkgs.overlays = [
-    (self: super: {
+    # (self: super: {
-      # use lf fork with support for sixel graphics
+    #   # use lf fork with support for sixel graphics
-      lf = super.lf.overrideAttrs (old: {
+    #   lf = super.lf.overrideAttrs (old: {
-        src = super.fetchFromGitHub {
+    #     src = super.fetchFromGitHub {
-          owner = "horriblename";
+    #       owner = "horriblename";
-          repo = "lf";
+    #       repo = "lf";
-          rev = "8997e5b03772d5628ed6a490777048581d978674";
+    #       rev = "8997e5b03772d5628ed6a490777048581d978674";
-          sha256 = "rJq2Tv3py6HvRI1O2odTdGb1ksdijhO3FcJsPj5dm34=";
+    #       sha256 = "rJq2Tv3py6HvRI1O2odTdGb1ksdijhO3FcJsPj5dm34=";
-        };
+    #     };
-      });
+    #   });
-    })
+    # })
 
     (self: super: {
       # get latest version of kile-wl for compatibility with river's latest version
@@ -181,6 +183,7 @@
     android-tools
     ansible
     bind.dnsutils
+    # pyenv
     docker-compose
     file
     gimp
@@ -199,6 +202,7 @@
     mosh
     mpv
     neofetch
+    pynitrokey
     networkmanagerapplet
     nextcloud-client
     pandoc
@@ -206,10 +210,11 @@
     pv
     ripgrep
     sassc
+    screen
     shellcheck
     signify
-    vagrant
     unzip
+    vagrant
     virt-manager
     virtiofsd
     wget