modules: fix some bugs

This commit is contained in:
Dmitriy Pleshevskiy 2024-08-28 18:06:29 +03:00
parent bd12213e4a
commit e0b7b94270
Signed by: pleshevskiy
GPG key ID: 17041163DA10A9A2
3 changed files with 35 additions and 26 deletions

View file

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

View file

@ -128,10 +128,6 @@ in
"\\" = fill "filter"; "\\" = fill "filter";
"n" = exec "next-result"; "n" = exec "next-result";
"N" = exec "prev-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 [ compose = {
globalBinds
{
"$ex" = "<C-x>"; "$ex" = "<C-x>";
"<C-k>" = exec "prev-field"; "<C-k>" = exec "prev-field";
"<C-j>" = exec "next-field"; "<C-j>" = exec "next-field";
"<tab>" = exec "next-field"; "<tab>" = exec "next-field";
} "<C-l>" = exec "next-tab";
]; "<C-h>" = exec "prev-tab";
};
"compose::editor" = { "compose::editor" = {
"$noinherit" = "true"; "$noinherit" = "true";

View file

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