diff --git a/ansible/inventory/group_vars/workstation_dev_wsl.yml b/ansible/inventory/group_vars/workstation_dev_wsl.yml index efccd71..ed368ec 100644 --- a/ansible/inventory/group_vars/workstation_dev_wsl.yml +++ b/ansible/inventory/group_vars/workstation_dev_wsl.yml @@ -8,6 +8,7 @@ workstation_dev_wsl_packages: - python3-pip - tmux workstation_dev_wsl_excluded_packages: + - alacritty - pcscd - pinentry-gnome3 - podman @@ -17,9 +18,7 @@ workstation_dev_wsl_excluded_packages: workstation_is_wsl: true workstation_manage_google_chrome: false workstation_removed_snap_packages: [] -workstation_snap_packages: - - name: glab - classic: true +workstation_snap_packages: [] workstation_dev_wsl_python_packages: [] workstation_wsl_systemd_enabled: true workstation_dev_wsl_dotfiles: diff --git a/ansible/inventory/group_vars/workstation_dev_wsl.yml.orig b/ansible/inventory/group_vars/workstation_dev_wsl.yml.orig new file mode 100644 index 0000000..ba7f65f --- /dev/null +++ b/ansible/inventory/group_vars/workstation_dev_wsl.yml.orig @@ -0,0 +1,47 @@ +--- +enabled_services: + - docker + +workstation_dev_wsl_packages: + - lazygit + - pinentry-curses + - python3-pip +workstation_dev_wsl_excluded_packages: + - alacritty + - pcscd + - pinentry-gnome3 + - podman + - podman-compose + - ufw + - yubikey-manager +workstation_is_wsl: true +workstation_manage_google_chrome: false +<<<<<<< HEAD +workstation_removed_snap_packages: [] +workstation_snap_packages: + - name: glab + classic: true +workstation_dev_wsl_python_packages: [] +||||||| parent of cb83ed1 (Update gitconfig on WSL) +workstation_removed_snap_packages: [] +workstation_snap_packages: + - name: glab + classic: true +workstation_dev_wsl_python_packages: + - pypsrp + - pyspnego +======= +workstation_manage_glab: true +workstation_glab_version: "1.103.0" +workstation_removed_snap_packages: + - glab +workstation_snap_packages: [] +workstation_dev_wsl_python_packages: + - pypsrp + - pyspnego +>>>>>>> cb83ed1 (Update gitconfig on WSL) +workstation_wsl_systemd_enabled: true +workstation_dev_wsl_dotfiles: + - src: .gnupg/gpg-agent.conf + dest: .gnupg/gpg-agent.conf + mode: "0600" diff --git a/ansible/roles/packages_ubuntu/tasks/main.yml b/ansible/roles/packages_ubuntu/tasks/main.yml index e1f7d96..3760b04 100644 --- a/ansible/roles/packages_ubuntu/tasks/main.yml +++ b/ansible/roles/packages_ubuntu/tasks/main.yml @@ -52,6 +52,39 @@ - workstation_manage_google_chrome | default(false) - "'google-chrome-stable' not in (ansible_facts.packages | default({}))" +- name: Download glab Debian package + tags: [packages] + ansible.builtin.get_url: + url: >- + https://gitlab.com/gitlab-org/cli/-/releases/v{{ workstation_glab_version }}/downloads/glab_{{ workstation_glab_version }}_linux_{{ + 'amd64' if ansible_facts['architecture'] == 'x86_64' + else 'arm64' if ansible_facts['architecture'] in ['aarch64', 'arm64'] + else ansible_facts['architecture'] + }}.deb + dest: "/tmp/glab_{{ workstation_glab_version }}.deb" + mode: "0644" + when: + - workstation_manage_glab | default(false) + - ansible_facts.packages['glab'] is not defined or ansible_facts.packages['glab'][0].version != workstation_glab_version + +- name: Install glab from downloaded Debian package + tags: [packages] + ansible.builtin.apt: + deb: "/tmp/glab_{{ workstation_glab_version }}.deb" + state: present + when: + - workstation_manage_glab | default(false) + - ansible_facts.packages['glab'] is not defined or ansible_facts.packages['glab'][0].version != workstation_glab_version + +- name: Remove downloaded glab Debian package + tags: [packages] + ansible.builtin.file: + path: "/tmp/glab_{{ workstation_glab_version }}.deb" + state: absent + when: + - workstation_manage_glab | default(false) + - ansible_facts.packages['glab'] is not defined or ansible_facts.packages['glab'][0].version != workstation_glab_version + - name: Ensure Docker apt keyrings directory exists tags: [packages] ansible.builtin.file: diff --git a/ansible/templates/workstation/.gitconfig.j2 b/ansible/templates/workstation/.gitconfig.j2 index a64a27b..a8ac185 100644 --- a/ansible/templates/workstation/.gitconfig.j2 +++ b/ansible/templates/workstation/.gitconfig.j2 @@ -72,12 +72,12 @@ ld = log -p lg = log --graph --abbrev-commit --decorate --date=relative --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(bold yellow)%d%C(reset)%n' --all glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' - onelinegraph = log --oneline --graph --decorate + onelinegraph = log --oneline --graph --decorate undo = reset --soft HEAD~1 stash-all = stash save --include-untracked expireunreachablenow = reflog expire --expire-unreachable=now --all - gcunreachablenow = gc --prune=now - + gcunreachablenow = gc --prune=now + [include] path = ~/.themes.gitignore @@ -87,3 +87,11 @@ colorMoved = default tabs = 4 side-by-side = true + +[http "https://gitlab.ecaas.datacenter.comune.roma"] + sslBackend = gnutls + sslCAInfo = ~/.local/share/certs/ecaas.datacenter.comune.roma.crt + +[credential] + helper = store +