From 4c83707a03750be36a34f951b6a075a1fb7a4668 Mon Sep 17 00:00:00 2001
From: Menno van Leeuwen <menno@vleeuwen.me>
Date: Wed, 8 Oct 2025 12:37:59 +0200
Subject: [PATCH] Update Ansible inventory and playbook for new workstation;
 modify Git configuration for rebase settings

---
 ansible/inventory.ini |  1 +
 ansible/playbook.yml  |  2 +-
 config/git.nix        | 11 +++++------
 flake.lock            |  6 +++---
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ansible/inventory.ini b/ansible/inventory.ini
index 2aab060..e17cb42 100644
--- a/ansible/inventory.ini
+++ b/ansible/inventory.ini
@@ -5,3 +5,4 @@ mennos-desktop ansible_connection=local
 [servers]
 mennos-vps ansible_connection=local
 mennos-desktop ansible_connection=local
+mennos-rtlsdr-pc ansible_connection=local
\ No newline at end of file
diff --git a/ansible/playbook.yml b/ansible/playbook.yml
index f09f8b9..2d4c4d4 100644
--- a/ansible/playbook.yml
+++ b/ansible/playbook.yml
@@ -16,4 +16,4 @@
 
     - name: Include server tasks
       ansible.builtin.import_tasks: tasks/servers/server.yml
-      when: inventory_hostname in ['mennos-vps', 'mennos-desktop']
+      when: inventory_hostname in ['mennos-vps', 'mennos-desktop', 'mennos-rtlsdr-pc']
diff --git a/config/git.nix b/config/git.nix
index b721829..46676e9 100644
--- a/config/git.nix
+++ b/config/git.nix
@@ -35,12 +35,7 @@
       };
 
       pull = {
-        rebase = true;
-      };
-
-      branch = {
-        autosetupmerge = "always";
-        autosetuprebase = "always";
+        rebase = false;
       };
 
       merge = {
@@ -48,6 +43,10 @@
         conflictstyle = "diff3";
       };
 
+      rebase = {
+        autoStash = true;
+      };
+
       diff = {
         tool = "delta";
       };
diff --git a/flake.lock b/flake.lock
index e8010d6..8f681e3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -41,11 +41,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758791193,
-        "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=",
+        "lastModified": 1759735786,
+        "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01",
+        "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
         "type": "github"
       },
       "original": {