modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs

@@ -278,8 +278,8 @@ myKeys conf =
         -- launch a 'flameshot' to screenshot
         ("M-S-s", safeSpawn "flameshot" ["gui"]),
         -- launch browsers
-        ("M-S-b", spawn "librewolf"),
+        ("M-S-b", spawn "cont-librewolf"),
-        ("M-S-t", spawn "tor-browser"),
+        ("M-S-t", spawn "cont-tor-browser"),
         -- launch 'dmenu_run' to choose applications
         ("M-r", spawn "dmenu_run"),
         -- launch 'rofi-pass' to use password manager

modules/home-manager/programs/aerc.nix

@@ -128,6 +128,10 @@ in
             "\\" = fill "filter";
             "n" = exec "next-result";
             "N" = exec "prev-result";
+            #"D" = exec "modify-labels +deleted -inbox";
+            #"A" = exec "modify-labels -inbox";
+            #"ms" = exec "modify-labels +spam -inbox";
+            #"mS" = exec "modify-labels -spam +inbox";
           }
         ];
 
@@ -153,14 +157,15 @@ in
           }
         ];
 
-        compose = {
+        compose = lib.mkMerge [
+          globalBinds
+          {
             "$ex" = "<C-x>";
             "<C-k>" = exec "prev-field";
             "<C-j>" = exec "next-field";
             "<tab>" = exec "next-field";
-          "<C-l>" = exec "next-tab";
+          }
-          "<C-h>" = exec "prev-tab";
+        ];
-        };
 
         "compose::editor" = {
           "$noinherit" = "true";

modules/nixos/programs/browsers/default.nix

@@ -6,14 +6,7 @@ let
   hostAddress = "192.168.7.10";
   localAddress = "192.168.7.11";
 
-  contPackages =
+  hostRunBrowser = pkgs.writeScript "run-browser" ''
-    lib.optional cfg.tor-browser.enable cfg.tor-browser.package
-    ++ lib.optional cfg.librewolf.enable cfg.librewolf.package
-    ++ lib.optional cfg.mullvad-browser.enable cfg.mullvad-browser.package;
-
-  hostPackages = lib.flip map contPackages (p:
-    let
-      hostRunBrowser = pkgs.writeScript "cont-run-browser" ''
     host=browsers.containers
     if [ -z "$(ssh-keygen -F $host)" ]; then
       ssh-keyscan -H $host >> ~/.ssh/known_hosts
@@ -21,14 +14,14 @@ let
     ssh -o PubkeyAuthentication=no kira@$host $@
   '';
 
-      hostBrowserScript = pkgs.writeScriptBin "${p.meta.mainProgram}" ''
+  contPackages =
-        ${hostRunBrowser} ${p.meta.mainProgram} $@
+    lib.optional cfg.tor-browser.enable cfg.tor-browser.package
-      '';
+    ++ lib.optional cfg.librewolf.enable cfg.librewolf.package
-    in
+    ++ lib.optional cfg.mullvad-browser.enable cfg.mullvad-browser.package;
-    pkgs.runCommand "${p.meta.mainProgram}" { } ''
+
-      mkdir $out
+  hostPackages = lib.flip map contPackages (p:
-      cp -r ${hostBrowserScript}/bin $out/bin
+    pkgs.writeScriptBin "cont-${p.meta.mainProgram}" ''
-      cp -r ${p}/share $out/share
+      ${hostRunBrowser} ${p.meta.mainProgram}
     ''
   );
 
@@ -58,10 +51,6 @@ in
     networking = {
       firewall = {
         allowedTCPPorts = [ 4713 ];
-        allowedTCPPortRanges = [
-          { from = 3000; to = 3999; }
-          { from = 32000; to = 33999; }
-        ];
         trustedInterfaces = [ "ve-*" ];
       };
       nat = {
@@ -102,10 +91,7 @@ in
         system.stateVersion = "23.11";
 
         # Inherit configs from host
-        networking.hosts = lib.mkMerge [
+        networking.hosts = config.networking.hosts;
-          config.networking.hosts
-          { "${hostAddress}" = [ "host" ]; }
-        ];
         fonts = {
           inherit (config.fonts) enableDefaultPackages packages;
           fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; };