diff --git a/ansible/tasks/global/global.yml b/ansible/tasks/global/global.yml index 61f8043..f7ebf9e 100644 --- a/ansible/tasks/global/global.yml +++ b/ansible/tasks/global/global.yml @@ -1,21 +1,9 @@ --- -- name: Include global symlinks tasks - ansible.builtin.import_tasks: tasks/global/symlinks.yml - - name: Gather package facts ansible.builtin.package_facts: manager: auto become: true -- name: Debug ansible_facts for troubleshooting - ansible.builtin.debug: - msg: | - OS Family: {{ ansible_facts['os_family'] }} - Distribution: {{ ansible_facts['distribution'] }} - Package Manager: {{ ansible_pkg_mgr }} - Kernel: {{ ansible_kernel }} - tags: debug - - name: Include Tailscale tasks ansible.builtin.import_tasks: tasks/global/tailscale.yml become: true @@ -131,7 +119,7 @@ ansible.builtin.replace: path: /etc/sudoers regexp: '^Defaults\s+env_reset(?!.*pwfeedback)' - replace: 'Defaults env_reset,pwfeedback' - validate: 'visudo -cf %s' + replace: "Defaults env_reset,pwfeedback" + validate: "visudo -cf %s" become: true tags: sudoers diff --git a/bin/actions/update.py b/bin/actions/update.py index efc0bec..af7ff30 100755 --- a/bin/actions/update.py +++ b/bin/actions/update.py @@ -247,7 +247,7 @@ def main(): "--ansible", "-A", action="store_true", help="Upgrade Ansible packages" ) parser.add_argument( - "--ansible-verbose", + "--ansible-verbose", action="store_true", help="Upgrade Ansible packages with verbose output", ) @@ -402,7 +402,7 @@ def main(): ansible_cmd.append("-vvv") # Debug: Show the command being executed - printfe("yellow", f"Debug: Executing command: {' '.join(ansible_cmd)}") + printfe("cyan", f"Executing command: {' '.join(ansible_cmd)}") # Execute the Ansible command, passing password via stdin if available if sudo_password: diff --git a/config/git.nix b/config/git.nix index 3142578..0da77bb 100644 --- a/config/git.nix +++ b/config/git.nix @@ -7,6 +7,7 @@ # Basic configuration userName = "Menno van Leeuwen"; userEmail = "menno@vleeuwen.me"; + signingKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr"; # Git settings extraConfig = { @@ -79,7 +80,14 @@ # Security gpg = { - program = "${pkgs.gnupg}/bin/gpg"; + format = "ssh"; + ssh = { + program = "/opt/1Password/op-ssh-sign"; + }; + }; + + commit = { + gpgsign = true; }; # Performance