From 8b355f598038fb01c9f74976bc720453f071efa2 Mon Sep 17 00:00:00 2001 From: Haak Saxberg Date: Mon, 6 Jun 2022 16:06:15 -0700 Subject: [PATCH] if possible, keep syncthing device id stable --- nix/system/configuration.nix | 10 +++++++--- secrets | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nix/system/configuration.nix b/nix/system/configuration.nix index 9df21f0..64b0e0c 100644 --- a/nix/system/configuration.nix +++ b/nix/system/configuration.nix @@ -117,14 +117,16 @@ # Pipewire is now enabled by default (??) we should not enable the default # sound provider. # https://github.com/NixOS/nixpkgs/issues/163066 - # sound.enable = true; - hardware.pulseaudio.enable = false; + sound.enable = true; + # hardware.pulseaudio.enable = false; + # security.rtkit.enable = true; services.pipewire = { - enable = true; + enable = false; alsa.enable = true; jack.enable = true; pulse.enable = true; }; + services.gnome.gnome-remote-desktop.enable = false; # Enable touchpad support. services.xserver.libinput.enable = true; @@ -148,6 +150,8 @@ user = "haak"; dataDir = "/home/haak/synced"; configDir = "/home/haak/synced/.config/syncthing"; + cert = if builtins.pathExists "/home/haak/dotfiles/secrets//syncthing/cert.pem" then "/home/haak/dotfiles/secrets//syncthing/cert.pem" else null; + key = if builtins.pathExists "/home/haak/dotfiles/secrets//syncthing/key.pem" then "/home/haak/dotfiles/secrets//syncthing/key.pem" else null; }; location.provider = "geoclue2"; diff --git a/secrets b/secrets index b6a3a14..58ead7f 160000 --- a/secrets +++ b/secrets @@ -1 +1 @@ -Subproject commit b6a3a147522d60105b98dc8e827e81d89df1e667 +Subproject commit 58ead7f771704ce00444f4db15c0730c9e00fb37