diff --git a/flake.lock b/flake.lock
index 9cbc08d..2d489fe 100644
--- a/flake.lock
+++ b/flake.lock
@@ -119,11 +119,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1733793776,
-        "narHash": "sha256-IKVxMIwXNzaij8oZVoVmcR2QX5nCnh7SnVFJ5pujtXs=",
+        "lastModified": 1733764513,
+        "narHash": "sha256-anfaPURDUUuPMIybnQ2nQJ/gXxqkl8b1Ha/ehq2LeyM=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "c4de2fd2fe16d3cfff15d2db0e2b684972a82012",
+        "rev": "4f8045e953c68f261e2b870507f2a9e6c35a5629",
         "type": "github"
       },
       "original": {
@@ -485,11 +485,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1733769654,
-        "narHash": "sha256-aVvYDt8eitZVF6fdOrSoIzYRkQ5Gh6kfRvqkiaDRLL0=",
+        "lastModified": 1733754861,
+        "narHash": "sha256-3JKzIou54yjiMVmvgdJwopekEvZxX3JDT8DpKZs4oXY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e952e94955dcc6fa2120c1430789fc41363f5237",
+        "rev": "9ebaa80a227eaca9c87c53ed515ade013bc2bca9",
         "type": "github"
       },
       "original": {
@@ -996,11 +996,11 @@
     },
     "nixpkgs_7": {
       "locked": {
-        "lastModified": 1733759999,
-        "narHash": "sha256-463SNPWmz46iLzJKRzO3Q2b0Aurff3U1n0nYItxq7jU=",
+        "lastModified": 1733581040,
+        "narHash": "sha256-Qn3nPMSopRQJgmvHzVqPcE3I03zJyl8cSbgnnltfFDY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a73246e2eef4c6ed172979932bc80e1404ba2d56",
+        "rev": "22c3f2cf41a0e70184334a958e6b124fb0ce3e01",
         "type": "github"
       },
       "original": {
diff --git a/hmModules/emacs/init.el b/hmModules/emacs/init.el
index 77c9157..11b765b 100644
--- a/hmModules/emacs/init.el
+++ b/hmModules/emacs/init.el
@@ -882,7 +882,7 @@ This is meant to be an helper to be called from the window manager."
   (gptel-api-key (lambda () (require 'f) (f-read-text (getenv "OPENAI_API_KEY_PATH"))))
   (gptel-model 'gpt-4o)
   (gptel-default-mode 'org-mode)
-  (gptel-org-branching-context nil) ;; this is cool but I don't feel comfortable with it
+  (gptel-org-branching-context 't)
   :config
   (require 'gptel-curl)
 
diff --git a/hmModules/git/default.nix b/hmModules/git/default.nix
index 4f1cb71..8b1dfd4 100644
--- a/hmModules/git/default.nix
+++ b/hmModules/git/default.nix
@@ -14,9 +14,6 @@ in
     ../gitui
     ../lazygit
   ];
-
-  home.packages = [ pkgs.git-credential-manager ];
-
   programs.git = {
     enable = true;
     package = pkgs.gitAndTools.gitFull;
@@ -30,9 +27,6 @@ in
       user.signingKey = "/home/${username}/.ssh/id_rsa";
       gpg.format = "ssh";
       commit.gpgsign = true;
-
-      credential.helper = "manager";
-      credential.credentialStore = "cache";
     };
 
     userName = config.name;
diff --git a/hosts/picard/default.nix b/hosts/picard/default.nix
index 53278b2..c2cf5b9 100644
--- a/hosts/picard/default.nix
+++ b/hosts/picard/default.nix
@@ -172,6 +172,4 @@
     enable = true;
     policy = [ "magic" ];
   };
-
-  hardware.hackrf.enable = true;
 }
diff --git a/hosts/tpol/default.nix b/hosts/tpol/default.nix
index d73b62b..7793f66 100644
--- a/hosts/tpol/default.nix
+++ b/hosts/tpol/default.nix
@@ -75,7 +75,7 @@
     wantedBy = [ "multi-user.target" ];
     serviceConfig = {
       ExecStart = ''
-        ${lib.getExe' pkgs.rtl-sdr "rtl_tcp"} -a ${vpn.${config.networking.hostName}.ip}
+        ${lib.getExe' pkgs.rtl-sdr "rtl_tcp"} -a ${vpn.${config.networking.hostName}}
       '';
     };
   };
@@ -86,7 +86,7 @@
     serviceConfig = {
       ExecStart = ''
         ${lib.getExe' pkgs.sdrangel "sdrangelsrv"} --remote-tcp-hwtype RTLSDR --remote-tcp-port 1234 --remote-tcp-address ${
-          vpn.${config.networking.hostName}.ip
+          vpn.${config.networking.hostName}
         } --remote-tcp
       '';
     };
diff --git a/modules/home-assistant/default.nix b/modules/home-assistant/default.nix
index 9da252d..b0e4a63 100644
--- a/modules/home-assistant/default.nix
+++ b/modules/home-assistant/default.nix
@@ -50,7 +50,6 @@ in
       "wyoming"
       "wake_on_lan"
       "prometheus"
-      "openai_conversation"
     ];
     customComponents = with pkgs.home-assistant-custom-components; [
       tuya_local