From 0926424da8083dac634001241f1ee570cb784dd8 Mon Sep 17 00:00:00 2001 From: mg Date: Mon, 5 Jul 2021 15:04:33 +0200 Subject: [PATCH] irantu (#142) flameshot dir unattended nach hinten calc docker regel extra programme vivaldi check flameshot Co-authored-by: Michael Grote Reviewed-on: https://git.mgrote.net/mg/ansible/pulls/142 Co-Authored-By: mg Co-Committed-By: mg --- group_vars/docker.yml | 4 ---- group_vars/laptop.yml | 7 +++++++ playbooks/2_all.yml | 2 +- roles/mgrote.i3/tasks/main.yml | 1 + roles/mgrote.vivaldi/tasks/main.yml | 5 +++++ 5 files changed, 14 insertions(+), 5 deletions(-) diff --git a/group_vars/docker.yml b/group_vars/docker.yml index 97abe06c..7215b54b 100644 --- a/group_vars/docker.yml +++ b/group_vars/docker.yml @@ -31,9 +31,5 @@ protocol: tcp comment: 'munin' from_ip: 192.168.0.0/16 - - rule: allow - to_port: 5000 - protocol: tcp - comment: 'rss-feed-changedetection' ### geerlingguy.munin-node munin_node_allowed_cidrs: [192.168.0.0/16] # weil der munin-server aus einem anderen subnet zugreift diff --git a/group_vars/laptop.yml b/group_vars/laptop.yml index 47314ea8..e8f2b159 100644 --- a/group_vars/laptop.yml +++ b/group_vars/laptop.yml @@ -15,6 +15,8 @@ local_path: "/home/mg/.bash_aliases" - repo_path: "{{ dotfiles_repo_path}}/alacritty/alacritty.yml" local_path: "/home/mg/.config/alacritty/alacritty.yml" + - repo_path: "{{ dotfiles_repo_path}}/flameshot/flameshot.ini" + local_path: "/home/mg/.config/flameshot/flameshot.ini" - repo_path: "{{ dotfiles_repo_path}}/.ssh/config" local_path: "/home/mg/.ssh/config" - repo_path: "/home/mg/Nextcloud/Rest/ssh-keys/heimserver/private_key" # smylink in .ssh-dir @@ -24,6 +26,8 @@ - path: /home/mg/.config/polybar - path: /home/mg/.config/alacritty - path: /home/mg/.config/.ssh + - path: /home/mg/.config/flameshot + dotfiles_owner: mg ### mgrote.apt_install_packages programs_extra: @@ -39,6 +43,9 @@ - caja - arandr - keepassxc + - vlc + - libreoffice + - gnome-calculator ### mgrote.apt_manage_sources manage_sources_apt_proxy_url: "" ### mgrote.ntp_chrony_server diff --git a/playbooks/2_all.yml b/playbooks/2_all.yml index ee5532f5..f2f0dc52 100644 --- a/playbooks/2_all.yml +++ b/playbooks/2_all.yml @@ -1,7 +1,6 @@ --- - import_playbook: base/apt_sources.yml - import_playbook: base/install_packages.yml - - import_playbook: base/unattended_upgrades.yml - import_playbook: base/ntp_client.yml - import_playbook: base/restic.yml - import_playbook: base/users.yml @@ -15,3 +14,4 @@ - import_playbook: base/f2b.yml - import_playbook: base/monitoring.yml - import_playbook: base/remove_snapd.yml + - import_playbook: base/unattended_upgrades.yml diff --git a/roles/mgrote.i3/tasks/main.yml b/roles/mgrote.i3/tasks/main.yml index a1529a50..ba8875b6 100644 --- a/roles/mgrote.i3/tasks/main.yml +++ b/roles/mgrote.i3/tasks/main.yml @@ -10,4 +10,5 @@ - feh # wallpaper - rofi - xautolock #bildschirmsperre nach x min + - flameshot #screenshots state: present diff --git a/roles/mgrote.vivaldi/tasks/main.yml b/roles/mgrote.vivaldi/tasks/main.yml index 0720dd4c..f5e3e4be 100644 --- a/roles/mgrote.vivaldi/tasks/main.yml +++ b/roles/mgrote.vivaldi/tasks/main.yml @@ -1,5 +1,10 @@ --- + - name: check if vivaldi is already installed + ansible.builtin.package_facts: + manager: apt + - name: download and install vivaldi become: true apt: deb: "{{ xnview_deb_url }}" + when: "'vivaldi' in ansible_facts.packages"