feat: tidy

config/hosts/imxyy-nix-x16/home.nix

@@ -1,5 +1,4 @@
 {
-  lib,
   pkgs,
   username,
   ...
@@ -9,8 +8,6 @@
     home.packages = with pkgs; [
       localsend
 
-      rclone
-
       wpsoffice-cn
       wps-office-fonts
       ttf-wps-fonts
@@ -19,17 +16,11 @@
       anki
 
       ayugram-desktop
-      telegram-desktop
       signal-desktop
-      discord
       qq
       wechat
 
       gnome-clocks
-
-      wineWowPackages.waylandFull
-
-      pwvucontrol
     ];
     programs.zsh = {
       sessionVariables = {
@@ -58,7 +49,6 @@
     cli.all.enable = true;
     coding.all.enable = true;
     desktop.all.enable = true;
-    virt.moonlight.enable = true;
 
     i18n.fcitx5.enable = true;
 
@@ -121,21 +111,16 @@
         ".local/state"
         ".local/share/Anki2"
         ".local/share/shotwell"
-        ".local/share/cheat.sh"
         ".local/share/Kingsoft"
 
         ".local/share/AyuGramDesktop"
-        ".local/share/TelegramDesktop"
         ".config/Signal"
-        ".config/discord"
         ".config/QQ"
         ".xwechat"
 
         ".config/Kingsoft"
         ".config/dconf"
-        ".config/gh"
         ".config/pip"
-        ".config/libreoffice"
         ".config/sunshine"
       ];
     };

config/hosts/imxyy-nix/home.nix

@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   username,
   ...
@@ -10,8 +8,6 @@
     home.packages = with pkgs; [
       localsend
 
-      rclone
-
       wpsoffice-cn
       wps-office-fonts
       ttf-wps-fonts
@@ -20,17 +16,11 @@
       anki
 
       ayugram-desktop
-      telegram-desktop
       signal-desktop
-      discord
       qq
       wechat
 
       gnome-clocks
-
-      wineWowPackages.waylandFull
-
-      pwvucontrol
     ];
     programs.zsh = {
       shellAliases = {
@@ -134,16 +124,6 @@
           "image/png" = imageviewer;
           "image/webp" = imageviewer;
         };
-      extraBookmarks =
-        let
-          homedir = config.my.home.home.homeDirectory;
-        in
-        [
-          "file://${homedir}/Documents/%E7%8F%AD%E7%BA%A7%E4%BA%8B%E5%8A%A1 班级事务"
-          "file://${homedir}/NAS NAS"
-          "file://${homedir}/NAS/imxyy_soope_ NAS imxyy_soope_"
-          "file://${homedir}/NAS/imxyy_soope_/OS NAS OS"
-        ];
     };
     persist = {
       enable = true;
@@ -159,21 +139,16 @@
         ".local/state"
         ".local/share/Anki2"
         ".local/share/shotwell"
-        ".local/share/cheat.sh"
         ".local/share/Kingsoft"
 
         ".local/share/AyuGramDesktop"
-        ".local/share/TelegramDesktop"
         ".config/Signal"
-        ".config/discord"
         ".config/QQ"
         ".xwechat"
 
         ".config/Kingsoft"
         ".config/dconf"
-        ".config/gh"
         ".config/pip"
-        ".config/libreoffice"
         ".config/sunshine"
       ];
     };

modules/audio.nix

@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   username,
   ...
 }:
@@ -20,5 +21,6 @@ lib.my.makeSwitch {
     };
     users.extraUsers.${username}.extraGroups = [ "audio" ];
     my.persist.homeDirs = [ ".local/state/wireplumber" ];
+    my.home.home.packages = [ pkgs.pwvucontrol ];
   };
 }

modules/desktop/wm/niri/waybar/config.nix

@@ -81,25 +81,12 @@ _: {
     tooltip = false;
   };
   wireplumber = {
-    format = "{icon} {volume}%";
+    format = "󰋋 {volume}%";
     tooltip = false;
     format-muted = "󰟎 Muted";
     on-click = "wpctl set-mute @DEFAULT_SINK@ toggle";
     on-click-middle = "pwvucontrol";
     scroll-step = 5;
-    format-icons = {
-      headphone = "󰋋";
-      hands-free = "󰋋";
-      headset = "󰋋";
-      phone = "";
-      portable = "";
-      car = "";
-      default = [
-        ""
-        ""
-        ""
-      ];
-    };
   };
   "wireplumber#source" = {
     node-type = "Audio/Source";