albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Update syncthing and update audio for rdesktop

Browse source
This commit is contained in:
albert 2024-08-14 09:41:20 +09:00
parent 376f15ab73
commit caf53f2735
Signed by: albert
GPG key ID: 3895DD267CA11BA9
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/default.nix
View file

@ -41,7 +41,7 @@
unfree ? false, unfree ? false,
ip ? null, ip ? null,
ephemeral ? false, ephemeral ? false,
deployment_type ? "containers", deployment_type ? "containers", # Currently used to change where secrets are searched for
pkgs ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs, pkgs ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs,
pkgs-unstable ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable, pkgs-unstable ? let packages = (import ./packages.nix { inherit inputs repo system unfree; }); in packages.pkgs-unstable,
}: { }: {

5
nixos/containers/rdesktop/default.nix
View file

@ -1,4 +1,4 @@
{ pkgs, desktop, username, lib, ... }: { { pkgs, desktop, username, ... }: {
imports = [ imports = [
../../users/${username} ../../users/${username}
../../common/desktops/${desktop} ../../common/desktops/${desktop}
@ -7,8 +7,11 @@
../../common/services/gnupg-agent.nix ../../common/services/gnupg-agent.nix
../../common/software/cli/clean-hm.nix ../../common/software/cli/clean-hm.nix
../../common/services/tailscale-autoconnect.nix ../../common/services/tailscale-autoconnect.nix
./syncthing.nix
]; ];
hardware.pulseaudio.extraModules = [ pkgs.pulseaudio-module-xrdp ];
services.xrdp = { services.xrdp = {
enable = true; enable = true;
openFirewall = true; openFirewall = true;

2
nixos/hosts/nixos-desktop/syncthing.nix
View file

@ -17,7 +17,7 @@
"notes" = { "notes" = {
id = "notes"; id = "notes";
path = "/home/${username}/notes"; path = "/home/${username}/notes";
devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; devices = [ "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" ];
}; };
}; };
}; };

4
nixos/hosts/nixos-framework/syncthing.nix
View file

@ -1,4 +1,4 @@
{ pkgs, config, hostname, username, ... }: { { username, ... }: {
imports = [ ../../common/services/syncthing.nix ]; imports = [ ../../common/services/syncthing.nix ];
services.syncthing = { services.syncthing = {
@ -17,7 +17,7 @@
"notes" = { "notes" = {
id = "notes"; id = "notes";
path = "/home/${username}/notes"; path = "/home/${username}/notes";
devices = [ "framework-server" "nixos-desktop" "nixos-framework" ]; devices = [ "framework-server" "nixos-desktop" "nixos-framework" "rdesktop" ];
}; };
}; };
}; };