mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

modules: fix some bugs

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/home-manager/configs/window-manager/xmonad/xmonad_config.hs
View file

@ -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

21
modules/home-manager/programs/aerc.nix
View file

@ -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" = "<C-x>";
"<C-k>" = exec "prev-field";
"<C-j>" = exec "next-field";
"<tab>" = exec "next-field";
}
];
compose = {
"$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";

36
modules/nixos/programs/browsers/default.nix
View file

@ -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; };