Private profile setup and a deploy bugfix

This commit is contained in:
kat witch 2021-03-14 02:47:55 +00:00
parent 0c10f2f26e
commit dca0ac1e57
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
5 changed files with 11 additions and 6 deletions

View file

@ -6,5 +6,9 @@ let
};
in {
imports = lib.attrValues homeModules ++ [ ../modules/home ];
imports = lib.attrValues homeModules ++ [
../modules/home
./private/profile/home
];
}

View file

@ -10,7 +10,7 @@
./torrenting.nix
];
deploy.profiles = [ "gui" "sway" "kat" ];
deploy.profiles = [ "gui" "sway" "kat" "private" ];
deploy.ssh.host = "192.168.1.135";
# graphics tablet

View file

@ -3,7 +3,7 @@
{
imports = [ ./hardware.nix ../../services/zfs.nix ];
deploy.profiles = [ "gui" "sway" "kat" "laptop" ];
deploy.profiles = [ "gui" "sway" "kat" "laptop" "private" ];
deploy.ssh.host = "192.168.1.92";
boot.loader.systemd-boot.enable = true;

View file

@ -7,7 +7,7 @@ let
};
in {
imports = lib.attrValues nixosModules;
imports = lib.attrValues nixosModules ++ [ ./private/profile/nixos ];
options.home-manager.users = lib.mkOption {
type = lib.types.attrsOf (lib.types.submoduleWith {

View file

@ -8,10 +8,11 @@ let
ssh $NIX_SSHOPTS root@${cfg.ssh.host} "mkdir -p ${toString file.out.dir}
cat > ${file.path}
chmod ${file.mode} ${file.path}
chown ${file.owner}:${file.group} ${file.path}" << 'EOF'
chown ${file.owner}:${file.group} ${file.path}"'' + (if file.source != null then "< ${toString file.source}\n" else ''
<<'EOF'
${file.text}
EOF
'') (attrValues config.secrets.files);
'')) (attrValues config.secrets.files);
in {
options = {
deploy = {