machines/arcadia/default.nix

@@ -8,7 +8,6 @@
   imports = [
     ./hardware.nix
     ./home-julien.nix
-    ./syncthing.nix
   ];
 
   machine.meta = {
@@ -17,7 +16,6 @@
     hm_version = inputs.home-manager-unstable;
     # TODO: Fix colmena deployment
     ips.public.ipv4 = "127.0.0.1";
-    ips.vpn.ipv4 = "100.100.45.12";
 
   };
 
@@ -48,6 +46,9 @@
 
   networking.networkmanager.enable = true;
 
+  networking.networkmanager.dns = "systemd-resolved";
+  services.resolved.enable = true;
+
   services.dbus.enable = true;
 
   programs.dconf.enable = true;
@@ -83,7 +84,6 @@
   programs.ssh.startAgent = true;
 
   services.xserver.desktopManager.gnome.enable = true;
-  services.xserver.displayManager.gdm.enable = true;
 
   services.gnome.gnome-keyring.enable = true;
   system.stateVersion = "25.05";

machines/arcadia/home-julien.nix

@@ -62,40 +62,6 @@
       ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
     fonts.fontconfig.enable = true;
 
-    systemd.user.tmpfiles.rules = [
-      "L /home/julien/.emacs.d - - - - /home/julien/dev/emacs-config"
-    ];
-
-    home.persistence."/persistent/home/julien" = {
-      files = [
-        ".config/gnome-initial-setup-done"
-        ".config/background"
-        ".cert/nm-openvpn/telecom-paris-ca.pem"
-      ];
-      directories = [
-        "Pictures"
-        "Documents"
-        ".ssh"
-        ".mozilla"
-        ".local/share/direnv"
-        ".local/share/atuin"
-        ".local/share/firefoxpwa"
-        ".config/Signal"
-        ".cache/spotify"
-        ".config/spotify"
-        ".config/autostart"
-        ".config/borg"
-        ".config/Element"
-        ".step"
-        ".gnupg"
-        "Zotero"
-        ".config/dconf"
-        ".local/share/keyrings"
-        "Maildir"
-      ];
-      allowOther = true;
-    };
-
     home.keyboard = {
       layout = "fr";
     };

machines/arcadia/syncthing.nix

@@ -1,52 +0,0 @@
-{ config, ... }:
-{
-  services.syncthing = {
-    enable = true;
-    user = "julien";
-    group = "users";
-    overrideDevices = true;
-    overrideFolders = true;
-
-    settings.options = {
-      urAccepted = -1;
-      listenAddresses = [ "tcp://${config.machine.meta.ips.vpn.ipv4}" ];
-    };
-
-    devices = {
-      "gustave" = {
-        id = "6APF3EP-TIV7ZBK-5WB5SA4-Y2K37CR-AMIB2TM-6T2VORK-UYNQO2X-TO6V2QH";
-        addresses = [
-          "tcp://gustave.luj:22000"
-        ];
-      };
-
-      "fischer" = {
-        id = "PLIMD3Z-L4DYKDB-MY4PFTS-3RMQUNF-GFWFOBB-SELW6MB-WIQJ2LM-QAC45QQ";
-        addresses = [
-          "tcp://fischer.luj:22000"
-        ];
-      };
-
-    };
-    folders = {
-      "dev" = {
-        path = "/home/julien/dev";
-        devices = [
-          "gustave"
-          "fischer"
-        ];
-      };
-    };
-  };
-
-  systemd.services.syncthing.serviceConfig.StateDirectory = "syncthing";
-  systemd.services.syncthing.environment.STNODEFAULTFOLDER = "true";
-  environment.persistence."/persistent".directories = [
-    {
-      directory = "/home/julien/dev";
-      user = "julien";
-      group = "users";
-    }
-  ];
-
-}

shell.nix

@@ -37,7 +37,6 @@ in
 pkgs.mkShell {
   nativeBuildInputs = [
     pkgs.colmena
-    pkgs.rbw
     agenix
     bootstrap
     pkgs.statix