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

modules: rename user in the containers

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2024-09-30 20:13:34 +03:00
parent f2038504b0
commit 6c0592d39b
Signed by: pleshevskiy
GPG key ID: 17041163DA10A9A2
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,7 +11,7 @@ let
hostPackages = lib.flip map contPackages (p: hostPackages = lib.flip map contPackages (p:
let let
hostRunBrowser = pkgs.writeScript "cont-run-browser" '' hostRunBrowser = pkgs.writeScript "cont-run-browser" ''
sudo nixos-container run browsers -- su -l kira -c "$*" sudo nixos-container run browsers -- su -l jan -c "$*"
''; '';
hostBrowserScript = pkgs.writeScriptBin "${p.meta.mainProgram}" '' hostBrowserScript = pkgs.writeScriptBin "${p.meta.mainProgram}" ''
@ -48,11 +48,7 @@ in
bindMounts = lib.mkMerge [ bindMounts = lib.mkMerge [
{ {
"/tmp/.X11-unix" = { }; "/tmp/.X11-unix" = { };
"/etc/ssh/keys" = { "/home/jan/Downloads" = {
isReadOnly = false;
hostPath = "/persistent/per-machine/browsers/etc/ssh/keys";
};
"/home/kira/Downloads" = {
isReadOnly = false; isReadOnly = false;
hostPath = "/home/jan/downloads/browser"; hostPath = "/home/jan/downloads/browser";
}; };
@ -64,11 +60,14 @@ in
"/run/opengl-driver-32/lib" = { }; "/run/opengl-driver-32/lib" = { };
}) })
(lib.mkIf cfg.librewolf.enable { (lib.mkIf cfg.librewolf.enable {
"/home/kira/.librewolf" = { "/home/jan/.librewolf" = {
isReadOnly = false; isReadOnly = false;
hostPath = "/persistent/per-machine/browsers/home/kira/.librewolf"; hostPath = "/persistent/per-machine/browsers/home/jan/.librewolf";
}; };
}) })
(lib.mkIf config.local.programs.communication.telegram.enable {
"/home/jan/downloads/telegram" = { };
})
]; ];
config = { pkgs, ... }: { config = { pkgs, ... }: {
@ -79,9 +78,9 @@ in
fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; }; fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; };
}; };
users.users.kira = { users.users.jan = {
isNormalUser = true; isNormalUser = true;
home = "/home/kira"; home = "/home/jan";
password = "hello"; password = "hello";
extraGroups = [ "pulse-access" ]; extraGroups = [ "pulse-access" ];
packages = contPackages; packages = contPackages;

7
modules/nixos/programs/communication/skype.nix
View file

@ -5,7 +5,7 @@ let
cfg = config.local.programs.communication.skype; cfg = config.local.programs.communication.skype;
hostRunPackage = pkgs.writeScript "cont-run" '' hostRunPackage = pkgs.writeScript "cont-run" ''
sudo nixos-container run skype -- su -l kira -c "$*" sudo nixos-container run skype -- su -l jan -c "$*"
''; '';
hostPackageScript = pkgs.writeScriptBin "${cfg.package.meta.mainProgram}" '' hostPackageScript = pkgs.writeScriptBin "${cfg.package.meta.mainProgram}" ''
@ -36,6 +36,7 @@ in
bindMounts = lib.mkMerge [ bindMounts = lib.mkMerge [
{ {
"/tmp/.X11-unix" = { }; "/tmp/.X11-unix" = { };
"/home/jan/downloads/skype" = { isReadonly = false; };
} }
(lib.mkIf config.hardware.graphics.enable { (lib.mkIf config.hardware.graphics.enable {
"/run/opengl-driver/lib" = { }; "/run/opengl-driver/lib" = { };
@ -54,9 +55,9 @@ in
fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; }; fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; };
}; };
users.users.kira = { users.users.jan = {
isNormalUser = true; isNormalUser = true;
home = "/home/kira"; home = "/home/jan";
password = "hello"; password = "hello";
extraGroups = [ "pulse-access" ]; extraGroups = [ "pulse-access" ];
packages = [ cfg.package ]; packages = [ cfg.package ];

2
modules/nixos/programs/communication/telegram.nix
View file

@ -59,7 +59,7 @@ in
fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; }; fontconfig = { inherit (config.fonts.fontconfig) defaultFonts; };
}; };
users.users.kira = { users.users.jan = {
isNormalUser = true; isNormalUser = true;
home = "/home/jan"; home = "/home/jan";
password = "hello"; password = "hello";