Add Pixel 9 phone to Syncthing

pborzenkov · Sep 10, 2024 · f615026 · f615026
1 parent fce41a9
commit f615026
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/nixos/machines/gw/default.nix b/nixos/machines/gw/default.nix
@@ -14,10 +14,6 @@
     (modulesPath + "/profiles/headless.nix")
 
     inputs.nixos-hardware.nixosModules.common-pc-ssd
-
-    inputs.sops-nix.nixosModules.sops
-
-    ../../openssh.nix
   ];
 
   boot = {

diff --git a/nixos/machines/rock/default.nix b/nixos/machines/rock/default.nix
@@ -12,10 +12,6 @@
     inputs.nixos-hardware.nixosModules.common-cpu-amd
     inputs.nixos-hardware.nixosModules.common-pc-ssd
 
-    inputs.sops-nix.nixosModules.sops
-
-    ../../openssh.nix
-
     ./anki.nix
     ./arr.nix
     ./backup.nix

diff --git a/nixos/machines/rock/syncthing.nix b/nixos/machines/rock/syncthing.nix
@@ -41,6 +41,14 @@
             "dynamic"
           ];
         };
+
+        # Pixel 9 Pro
+        pixel9 = {
+          id = "SIAH2E7-VLKE3L7-KGZRZVN-GY2TFI7-3ZOVMPN-Y6UKUGR-F34LKHS-KKT3YAX";
+          addresses = [
+            "dynamic"
+          ];
+        };
       };
 
       folders = {
@@ -56,7 +64,7 @@
 
         "/home/pbor/.local/share/password-store" = {
           id = "password-store";
-          devices = ["jazz" "metal" "phone" "trance"];
+          devices = ["jazz" "metal" "phone" "trance" "pixel9"];
         };
 
         "/home/pbor/.local/share/photos-for-review" = {

diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix
@@ -7,7 +7,7 @@
 in {
   imports = [
     ./nix
-    ./openssh
+    ./ssh
     ./sudo
     ./users
     ./virt

diff --git a/nixos/modules/openssh/default.nix → nixos/modules/ssh/default.nix b/nixos/modules/openssh/default.nix → nixos/modules/ssh/default.nix
@@ -4,10 +4,10 @@
   isDesktop,
   ...
 }: let
-  cfg = config.pbor.openssh;
+  cfg = config.pbor.ssh;
 in {
   options = {
-    pbor.openssh.enable = (lib.mkEnableOption "Enable openssh") // {default = config.pbor.enable && !isDesktop;};
+    pbor.ssh.enable = (lib.mkEnableOption "Enable ssh") // {default = config.pbor.enable && !isDesktop;};
   };
 
   config = lib.mkIf cfg.enable {
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ @@
     in {
       imports = [
         ./nix
-        ./openssh
+        ./ssh
         ./sudo
         ./users
         ./virt
@@ Expand Down @@