From 63ee0f120903f863f78096d70a5964f494c0c4ff Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Wed, 19 Jan 2022 13:07:50 +0100
Subject: [PATCH] `syntching` testing and `qmk`

---
 flake.nix                      |  2 +-
 hosts/hs/configuration.nix     | 13 -------------
 hosts/pbp/configuration.nix    | 19 +------------------
 hosts/pc/configuration.nix     | 19 +------------------
 profiles/syncthing/default.nix |  8 ++++++++
 users/profiles/qmk/default.nix |  5 +++++
 6 files changed, 16 insertions(+), 50 deletions(-)
 create mode 100644 profiles/syncthing/default.nix
 create mode 100644 users/profiles/qmk/default.nix

diff --git a/flake.nix b/flake.nix
index 3cf0044..af949b0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -168,7 +168,7 @@
               gui = [ sway xdg gtk foot bat ];
               browser = [ firefox chromium qutebrowser tor-browser ];
               multimedia = [ mpv zathura ];
-              dev = [ vim emacs vscode lorri direnv ];
+              dev = [ vim emacs vscode lorri direnv qmk ];
               modelling = [ blender cura ];
             };
           };
diff --git a/hosts/hs/configuration.nix b/hosts/hs/configuration.nix
index bc4f7d3..0986de2 100644
--- a/hosts/hs/configuration.nix
+++ b/hosts/hs/configuration.nix
@@ -165,34 +165,21 @@
       guiAddress = "0.0.0.0:8384";
       dataDir = "/mnt/archivio/syncthing";
       user = "ccr";
-      devices = {
-        oneplus5t = {
-          id = "IUETIK2-LBTIIKO-GTZXVMA-LEDFK5I-F2M7JKX-76OUDJL-QRJ62J4-5DYYIAI";
-        };
-        pc = {
-          id = "VI4CPQE-PTRRBQQ-LQVG3SE-7BVHQC2-TT4TIP7-L3OBXQR-AWLZVCO-GVPQUQG";
-        };
-      };
       folders = {
         "/mnt/archivio/syncthing/camera" = {
           id = "camera";
-          devices = [ "oneplus5t" ];
         };
         "/mnt/archivio/syncthing/orgzly" = {
           id = "orgzly";
-          devices = [ "oneplus5t" "pc" ];
         };
         "/mnt/archivio/syncthing/roam" = {
           id = "roam";
-          devices = [ "oneplus5t" "pc" ];
         };
         "/mnt/archivio/syncthing/whatsapp" = {
           id = "whatsapp";
-          devices = [ "oneplus5t" ];
         };
         "/mnt/archivio/syncthing/calls" = {
           id = "calls";
-          devices = [ "oneplus5t" ];
         };
       };
     };
diff --git a/hosts/pbp/configuration.nix b/hosts/pbp/configuration.nix
index 717340e..33fde87 100644
--- a/hosts/pbp/configuration.nix
+++ b/hosts/pbp/configuration.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, profiles, pbpKernelLatest, ... }:
 
 {
-  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg ];
+  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg syncthing ];
 
   boot = {
     initrd.availableKernelModules = [ "usbhid" ];
@@ -56,22 +56,5 @@
     };
   };
 
-  services.syncthing = {
-    enable = true;
-    guiAddress = "127.0.0.1:8384";
-    dataDir = "/home/ccr/syncthing";
-    user = "ccr";
-    folders = {
-      "orgzly" = {
-        id = "orgzly";
-        path = "/home/ccr/orgzly";
-      };
-      "roam" = {
-        id = "roam";
-        path = "/home/ccr/roam";
-      };
-    };
-  };
-
   powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
 }
diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix
index ef2520e..c5a534c 100644
--- a/hosts/pc/configuration.nix
+++ b/hosts/pc/configuration.nix
@@ -1,7 +1,7 @@
 { config, lib, pkgs, profiles, ... }:
 
 {
-  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker adb ];
+  imports = with profiles; [ mount-nas sshd dbus avahi printing xdg docker adb syncthing ];
 
   boot = {
     initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
@@ -51,22 +51,5 @@
     };
   };
 
-  services.syncthing = {
-    enable = true;
-    guiAddress = "127.0.0.1:8384";
-    dataDir = "/home/ccr/syncthing";
-    user = "ccr";
-    folders = {
-      "orgzly" = {
-        id = "orgzly";
-        path = "/home/ccr/orgzly";
-      };
-      "roam" = {
-        id = "roam";
-        path = "/home/ccr/roam";
-      };
-    };
-  };
-
   powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
 }
diff --git a/profiles/syncthing/default.nix b/profiles/syncthing/default.nix
new file mode 100644
index 0000000..7135c21
--- /dev/null
+++ b/profiles/syncthing/default.nix
@@ -0,0 +1,8 @@
+{
+  services.syncthing = {
+    enable = true;
+    guiAddress = "127.0.0.1:8384";
+    dataDir = "/home/ccr/syncthing";
+    user = "ccr";
+  };
+}
diff --git a/users/profiles/qmk/default.nix b/users/profiles/qmk/default.nix
new file mode 100644
index 0000000..887ddbc
--- /dev/null
+++ b/users/profiles/qmk/default.nix
@@ -0,0 +1,5 @@
+{ pkgs, ... }: with pkgs; {
+
+  home.packages = [ qmk ];
+
+}