Commit 4be04c767c33

Vincent Demeester <vincent@sbr.pm>
2026-01-12 14:32:20
refactor(systems): organizational cleanup of configuration files
- Move binfmt.nix to services/ directory (not desktop-specific) - Remove unused system-level syncthing configuration - Remove stale printer config and restic package from kyushu
1 parent 3d5b234
Changed files (6)
systems
systems/aomi/extra.nix
@@ -18,7 +18,7 @@
     ../common/services/containers.nix
     ../common/services/docker.nix
     ../common/services/libvirt.nix
-    ../common/desktop/binfmt.nix # TODO: move to something else than desktop
+    ../common/services/binfmt.nix
     # ../common/services/buildkit.nix # maybe ?
     # ../common/services/oci-image-mirroring.nixi
     # ../common/services/ollama.nix # TODO handle nvidia vs not ?
systems/common/desktop/binfmt.nix → systems/common/services/binfmt.nix
File renamed without changes
systems/common/services/syncthing.nix
@@ -1,27 +0,0 @@
-{
-  globals,
-  hostname,
-  libx,
-  ...
-}:
-{
-  services.syncthing = {
-    enable = true;
-    user = "vincent";
-    # FIXME: change this
-    dataDir = "/home/vincent/.syncthing";
-    configDir = "/home/vincent/.syncthing";
-    guiAddress = libx.syncthingGuiAddress globals.machines."${hostname}";
-    overrideFolders = false; # Just in case, will probably set to true later
-    settings = {
-      # FIXME this doesn't work, I wish it did.
-      # defaults = {
-      #   ignores = { lines = [ "(?d).DS_Store" "**" ]; };
-      # };
-      devices = libx.generateSyncthingDevices hostname globals.machines;
-      folders =
-        libx.generateSyncthingFolders hostname globals.machines."${hostname}" globals.machines
-          globals.syncthingFolders;
-    };
-  };
-}
systems/kerkouane/extra.nix
@@ -101,7 +101,6 @@ in
 {
   imports = [
     ../common/services/prometheus-exporters-node.nix
-    # ../common/services/syncthing.nix
   ];
 
   # Age secrets
systems/kyushu/extra.nix
@@ -81,24 +81,6 @@
     };
   };
 
-  # XXX: it doesn't really work...
-  # hardware.printers = {
-  #   ensurePrinters = [
-  #     {
-  #       name = "Canon_MX530_series";
-  #       location = "Home";
-  #       deviceUri = "dnssd://Canon%20MX530%20series._ipp._tcp.local/?uuid=00000000-0000-1000-8000-D8492F0F31CC";
-  #       model = "gutenprint.5.3://bjc-MX530-series/expert Canon MX530 series - CUPS+Gutenprint v5.3.4";
-  #       # deviceUri = "http://192.168.178.2:631/printers/Dell_1250c";
-  #       # model = "drv:///sample.drv/generic.ppd";
-  #       ppdOptions = {
-  #         PageSize = "A4";
-  #       };
-  #     }
-  #   ];
-  #   ensureDefaultPrinter = "Canon_MX530_series";
-  # };
-
   hardware.keyboard.qmk.enable = true;
 
   services.udev.packages = [ pkgs.sane-airscan ];
@@ -115,7 +97,6 @@
     # go-org-readwise # FIXME: will add it back from its new place.
     battery-monitor
     # backup
-    restic # TODO: will probably move this to it's own configuration some day
     virt-manager
   ];
 
systems/sakhalin/extra.nix
@@ -84,7 +84,7 @@ in
   imports = [
     ../common/services/containers.nix
     ../common/services/docker.nix
-    ../common/desktop/binfmt.nix # TODO: move to something else than desktop
+    ../common/services/binfmt.nix
     ../common/services/prometheus-exporters-node.nix
     ../common/services/prometheus-exporters-postgres.nix
   ];