diff --git a/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs b/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs index 526dba6..5fe4993 100644 --- a/modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs +++ b/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 "cont-librewolf"), - ("M-S-t", spawn "cont-tor-browser"), + ("M-S-b", spawn "librewolf"), + ("M-S-t", spawn "tor-browser"), -- launch 'dmenu_run' to choose applications ("M-r", spawn "dmenu_run"), -- launch 'rofi-pass' to use password manager diff --git a/modules/home-manager/programs/aerc.nix b/modules/home-manager/programs/aerc.nix index 6f5dc5a..a9cfc8f 100644 --- a/modules/home-manager/programs/aerc.nix +++ b/modules/home-manager/programs/aerc.nix @@ -128,10 +128,6 @@ 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"; } ]; @@ -157,15 +153,14 @@ in } ]; - compose = lib.mkMerge [ - globalBinds - { - "$ex" = ""; - "" = exec "prev-field"; - "" = exec "next-field"; - "" = exec "next-field"; - } - ]; + compose = { + "$ex" = ""; + "" = exec "prev-field"; + "" = exec "next-field"; + "" = exec "next-field"; + "" = exec "next-tab"; + "" = exec "prev-tab"; + }; "compose::editor" = { "$noinherit" = "true"; diff --git a/modules/nixos/programs/browsers/default.nix b/modules/nixos/programs/browsers/default.nix index 4e42d3e..0960baa 100644 --- a/modules/nixos/programs/browsers/default.nix +++ b/modules/nixos/programs/browsers/default.nix @@ -6,22 +6,29 @@ let hostAddress = "192.168.7.10"; localAddress = "192.168.7.11"; - hostRunBrowser = pkgs.writeScript "run-browser" '' - host=browsers.containers - if [ -z "$(ssh-keygen -F $host)" ]; then - ssh-keyscan -H $host >> ~/.ssh/known_hosts - fi - ssh -o PubkeyAuthentication=no kira@$host $@ - ''; - contPackages = 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: - pkgs.writeScriptBin "cont-${p.meta.mainProgram}" '' - ${hostRunBrowser} ${p.meta.mainProgram} + let + hostRunBrowser = pkgs.writeScript "cont-run-browser" '' + host=browsers.containers + if [ -z "$(ssh-keygen -F $host)" ]; then + ssh-keyscan -H $host >> ~/.ssh/known_hosts + fi + ssh -o PubkeyAuthentication=no kira@$host $@ + ''; + + hostBrowserScript = pkgs.writeScriptBin "${p.meta.mainProgram}" '' + ${hostRunBrowser} ${p.meta.mainProgram} $@ + ''; + in + pkgs.runCommand "${p.meta.mainProgram}" { } '' + mkdir $out + cp -r ${hostBrowserScript}/bin $out/bin + cp -r ${p}/share $out/share '' ); @@ -51,6 +58,10 @@ in networking = { firewall = { allowedTCPPorts = [ 4713 ]; + allowedTCPPortRanges = [ + { from = 3000; to = 3999; } + { from = 32000; to = 33999; } + ]; trustedInterfaces = [ "ve-*" ]; }; nat = { @@ -91,7 +102,10 @@ in system.stateVersion = "23.11"; # Inherit configs from host - networking.hosts = config.networking.hosts; + networking.hosts = lib.mkMerge [ + config.networking.hosts + { "${hostAddress}" = [ "host" ]; } + ]; fonts = { inherit (config.fonts) enableDefaultPackages packages; fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; };