Update Ansible inventory and playbook for new workstation; modify Git configuration for rebase settings

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

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']

config/git.nix

@@ -35,12 +35,7 @@
       };
 
       pull = {
-        rebase = true;
+        rebase = false;
-      };
-
-      branch = {
-        autosetupmerge = "always";
-        autosetuprebase = "always";
       };
 
       merge = {
@@ -48,6 +43,10 @@
         conflictstyle = "diff3";
       };
 
+      rebase = {
+        autoStash = true;
+      };
+
       diff = {
         tool = "delta";
       };

flake.lock

@@ -41,11 +41,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1758791193,
+        "lastModified": 1759735786,
-        "narHash": "sha256-F8WmEwFoHsnix7rt290R0rFXNJiMbClMZyIC/e+HYf0=",
+        "narHash": "sha256-a0+h02lyP2KwSNrZz4wLJTu9ikujNsTWIC874Bv7IJ0=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "25e53aa156d47bad5082ff7618f5feb1f5e02d01",
+        "rev": "20c4598c84a671783f741e02bf05cbfaf4907cff",
         "type": "github"
       },
       "original": {