remove custom yazi overlay

no longer necessary with current yazi version

flake.lock

@@ -148,24 +148,6 @@
         "type": "github"
       }
     },
-    "flake-utils_3": {
-      "inputs": {
-        "systems": "systems_3"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "helix": {
       "inputs": {
         "nixpkgs": [
@@ -371,7 +353,6 @@
         "nixpkgs-stable": "nixpkgs-stable",
         "nur": "nur",
         "wsl": "wsl",
-        "yazi": "yazi",
         "zellij-switch": "zellij-switch",
         "zenyd-mpv-scripts": "zenyd-mpv-scripts"
       }
@@ -398,27 +379,6 @@
       }
     },
     "rust-overlay_2": {
-      "inputs": {
-        "nixpkgs": [
-          "yazi",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1752633862,
-        "narHash": "sha256-Bj7ozT1+5P7NmvDcuAXJvj56txcXuAhk3Vd9FdWFQzk=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "8668ca94858206ac3db0860a9dec471de0d995f8",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
-    "rust-overlay_3": {
       "inputs": {
         "nixpkgs": "nixpkgs_2"
       },
@@ -481,21 +441,6 @@
         "type": "github"
       }
     },
-    "systems_4": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "wsl": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -517,35 +462,13 @@
         "type": "github"
       }
     },
-    "yazi": {
-      "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "rust-overlay": "rust-overlay_2"
-      },
-      "locked": {
-        "lastModified": 1752820276,
-        "narHash": "sha256-FKRudGztXVOM6B+xnvNr/9HAC3q6u+I9kUayUMRKiH8=",
-        "owner": "sxyazi",
-        "repo": "yazi",
-        "rev": "c28d2e8180b2fe60222414a6aaee76b923e694d0",
-        "type": "github"
-      },
-      "original": {
-        "owner": "sxyazi",
-        "repo": "yazi",
-        "type": "github"
-      }
-    },
     "zellij-switch": {
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_3",
+        "rust-overlay": "rust-overlay_2",
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1742588229,

flake.nix

@@ -76,12 +76,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    # Terminal file manager
-    yazi = {
-      url = "github:sxyazi/yazi";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # # Nextcloud Apps
     # nextcloud-news = {
     #   # https://github.com/nextcloud/news/releases

lib/default.nix

@@ -68,7 +68,6 @@ lib
     inputs.nix2vim.overlay
     inputs.zellij-switch.overlays.default
     inputs.helix.overlays.default
-    inputs.yazi.overlays.default
   ] ++ (importOverlays ../overlays);
 
   # System types to support.

platforms/home-manager/modules/nmasur/presets/programs/aerc.nix

@@ -18,6 +18,7 @@ in
     home.packages = with pkgs; [
       w3m # Render HTML
       dante # Socksify for rendering HTML
+      aba # Address book
     ];
 
     programs.aerc = {
@@ -110,6 +111,7 @@ in
           "<C-j>" = ":next-part<Enter>";
           J = ":next <Enter>";
           K = ":prev<Enter>";
+          aa = ":pipe -m aba parse --all<Enter>";
         };
 
         "view::passthrough" = {
@@ -185,6 +187,7 @@ in
         };
         compose = {
           editor = config.home.sessionVariables.EDITOR;
+          address-book-cmd = "aba ls \"%s\"";
         };
       };
     };

platforms/home-manager/modules/nmasur/presets/programs/feishin.nix

@@ -0,0 +1,19 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.nmasur.presets.programs.feishin;
+in
+
+{
+
+  options.nmasur.presets.programs.feishin.enable = lib.mkEnableOption "Feishin music player";
+
+  config = lib.mkIf cfg.enable {
+    home.packages = [ pkgs.feishin ];
+  };
+}

platforms/home-manager/modules/nmasur/presets/services/i3.nix

@@ -214,7 +214,7 @@ in
               cfg.commands.lockScreen != null
             ) "exec ${cfg.commands.lockScreen}";
             "${modifier}+Mod1+h" =
-              "exec --no-startup-id ${lib.getExe cfg.terminal} --command sh -c '${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
+              ''exec --no-startup-id ${lib.getExe cfg.terminal} --command sh -c "${pkgs.home-manager}/bin/home-manager switch --flake ${config.nmasur.presets.programs.dotfiles.path}#''${hostname} || read" '';
             "${modifier}+Mod1+r" =
               "exec --no-startup-id ${lib.getExe cfg.terminal} --command sh -c 'doas nixos-rebuild switch --flake ${config.nmasur.presets.programs.dotfiles.path} || read'";
 

platforms/home-manager/modules/nmasur/presets/services/polybar.nix

@@ -142,9 +142,9 @@ in
                 if config.nmasur.presets.services.i3.terminal == pkgs.wezterm then
                   "start --class aerc -- aerc"
                 else
-                  "--class=aerc --command=aerc";
+                  "--class=com.noah.aerc --command=aerc";
             in
-            "i3-msg 'exec --no-startup-id ${config.nmasur.presets.services.i3.terminal} ${startupCommand}'; sleep 0.15; i3-msg '[class=aerc] focus'";
+            "i3-msg 'exec --no-startup-id ${lib.getExe config.nmasur.presets.services.i3.terminal} ${startupCommand}'; sleep 0.15; i3-msg '[class=com.noah.aerc] focus'";
         };
         "module/network" = {
           type = "internal/network";
@@ -221,7 +221,7 @@ in
           label = "%date%";
           label-foreground = config.theme.colors.base06;
           # format-background = colors.background;
-          click-right = lib.getExe config.nmasur.presets.services.i3.terminal;
+          click-right = "i3-msg 'exec --no-startup-id ${lib.getExe config.nmasur.presets.services.i3.terminal}'";
         };
         "module/power" = {
           type = "custom/text";

platforms/home-manager/modules/nmasur/profiles/linux-gui.nix

@@ -23,6 +23,7 @@ in
         aerc.enable = lib.mkDefault true;
         discord.enable = lib.mkDefault true;
         dotfiles.enable = lib.mkDefault true;
+        feishin.enable = lib.mkDefault true;
         firefox.enable = lib.mkDefault true;
         ghostty.enable = lib.mkDefault true;
         mpv.enable = lib.mkDefault true;