diff --git a/group_vars/all.yml b/group_vars/all.yml index 2399efbc..d8582465 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -191,7 +191,7 @@ - vim - rsync - at - - rg + - ripgrep programs_only_physical: - hddtemp - ipmitool diff --git a/host_vars/irantu.grote.lan.yml b/group_vars/laptop.yml similarity index 84% rename from host_vars/irantu.grote.lan.yml rename to group_vars/laptop.yml index 663ceccc..c85ba10c 100644 --- a/host_vars/irantu.grote.lan.yml +++ b/group_vars/laptop.yml @@ -32,9 +32,12 @@ - gnome-tweaks - powertop - caja - - xrandr + - x11-xserver-utils # xrandr - arandr - keepassxc + - feh # i3 wallpaper + - yad # polybar popup-calendar + - xdotool # polybar popup-calendar ### mgrote.apt_manage_sources manage_sources_apt_proxy_url: "" ### mgrote.ntp_chrony_server @@ -43,3 +46,10 @@ - address: pool.ntp.org options: iburst #optionaler parameter ntp_chrony_logging: false # logging an/aus + ### oefenweb.ufw + ufw_rules: + - rule: allow + to_port: 22 + protocol: tcp + comment: 'ssh' + from_ip: 192.168.2.0/24 diff --git a/playbooks/3_service/laptop.yml b/playbooks/3_service/laptop.yml index 87c6d7cf..d8a0b4ce 100644 --- a/playbooks/3_service/laptop.yml +++ b/playbooks/3_service/laptop.yml @@ -6,3 +6,4 @@ - { role: mgrote.deactivate_caps, tags: "caps", become: true } - { role: mgrote.alacritty, tags: "alacritty", become: true } - { role: mgrote.vivaldi, tags: "vivaldi", become: true } + - { role: mgrote.xnview, tags: "xnview", become: true } diff --git a/playbooks/base/apt_sources.yml b/playbooks/base/apt_sources.yml index 889ae651..36d568e1 100644 --- a/playbooks/base/apt_sources.yml +++ b/playbooks/base/apt_sources.yml @@ -1,4 +1,5 @@ --- - hosts: all roles: - - { role: mgrote.apt_manage_sources, tags: "apt_sources" } + - { role: mgrote.apt_manage_sources, tags: "apt_sources", + when: "not 'laptop' in group_names" } diff --git a/roles/mgrote.alacritty/tasks/main.yml b/roles/mgrote.alacritty/tasks/main.yml index c78538e1..731b1fb4 100644 --- a/roles/mgrote.alacritty/tasks/main.yml +++ b/roles/mgrote.alacritty/tasks/main.yml @@ -1,13 +1,21 @@ --- - name: add ppa - ansible.builtin.apt_repository: - repo: ppa:system76/pop - state: present - filename: alacritty + become: yes + ansible.builtin.shell: add-apt-repository ppa:mmstick76/alacritty -y + args: + creates: "/etc/apt/sources.list.d/mmstick76-alacritty-focal.list" + +# - name: add ppa +# ansible.builtin.apt_repository: +# repo: ppa:aslatter/ppa +# state: present +# filename: alacritty +# update_cache: yes - name: install packages become: yes ansible.builtin.package: name: - alacritty + - xclip state: present diff --git a/roles/mgrote.apt_manage_sources/tasks/mint.yml b/roles/mgrote.apt_manage_sources/tasks/mint.yml index f4b5bc15..9381aa9a 100644 --- a/roles/mgrote.apt_manage_sources/tasks/mint.yml +++ b/roles/mgrote.apt_manage_sources/tasks/mint.yml @@ -3,6 +3,6 @@ become: yes ansible.builtin.template: src: "mint_sources.list" - dest: "/etc/apt/sources.list" + dest: "/etc/apt/sources.list.d/official-package-repositories.list" backup: yes register: copy_src diff --git a/roles/mgrote.polybar/defaults/main.yml b/roles/mgrote.polybar/defaults/main.yml index 466d1d05..7c48ef1b 100644 --- a/roles/mgrote.polybar/defaults/main.yml +++ b/roles/mgrote.polybar/defaults/main.yml @@ -1,3 +1,4 @@ --- polybar_siji_repo: https://github.com/stark/siji polybar_siji_local: /home/mg/siji + polybar_siji_fonts_dir: /home/mg/.fonts diff --git a/roles/mgrote.polybar/tasks/main.yml b/roles/mgrote.polybar/tasks/main.yml index 68b86101..17bdca01 100644 --- a/roles/mgrote.polybar/tasks/main.yml +++ b/roles/mgrote.polybar/tasks/main.yml @@ -5,6 +5,8 @@ name: - polybar - lm-sensors + - brightnessctl + - inotify-tools state: present - name: checkout siji font @@ -14,10 +16,18 @@ dest: "{{ polybar_siji_local }}" register: gitcheckout + - name: create siji dir + become: true + ansible.builtin.file: + path: + - "{{ polybar_siji_fonts_dir }}" + state: directory + - name: install siji-font become: true - ansible.builtin.shell: /home/mg/siji/install.sh -d /home/mg/.fonts + ansible.builtin.shell: "{{ polybar_siji_local }}/install.sh -d {{ polybar_siji_fonts_dir }}" args: + chdir: "{{ polybar_siji_local }}" creates: /home/mg/.fonts when: gitcheckout.changed @@ -39,4 +49,3 @@ ansible.builtin.user: name: polybar group: video - diff --git a/roles/mgrote.tmux/tasks/main.yml b/roles/mgrote.tmux/tasks/main.yml index fd3f674c..ad921be9 100644 --- a/roles/mgrote.tmux/tasks/main.yml +++ b/roles/mgrote.tmux/tasks/main.yml @@ -8,6 +8,7 @@ cache_valid_time: 360 - name: Check if "{{ tmux_bashrc_destination }}" exists + become: yes stat: path: "{{ tmux_bashrc_destination }}" register: stat_result diff --git a/roles/mgrote.vivaldi/README.md b/roles/mgrote.vivaldi/README.md index 1c8d876a..b47b5b29 100644 --- a/roles/mgrote.vivaldi/README.md +++ b/roles/mgrote.vivaldi/README.md @@ -5,4 +5,4 @@ Installiert vivaldi. ### Funktioniert auf - [x] Ubuntu (>=18.04) -- [x]Linux Mint +- [x] Linux Mint diff --git a/roles/mgrote.vivaldi/tasks/main.yml b/roles/mgrote.vivaldi/tasks/main.yml index fc264c78..fb6c36b9 100644 --- a/roles/mgrote.vivaldi/tasks/main.yml +++ b/roles/mgrote.vivaldi/tasks/main.yml @@ -1,13 +1,25 @@ --- - - name: add repo - ansible.builtin.apt_repository: - repo: deb https://repo.vivaldi.com/archive/deb/ stable main - state: present - filename: vivaldi +# - name: add repo +# ansible.builtin.apt_repository: +# repo: deb https://repo.vivaldi.com/archive/deb/ stable main +# state: present +# filename: vivaldi - - name: install packages - become: yes - ansible.builtin.package: - name: - - vivaldi-stable - state: present +# - name: add ppa +# become: yes +# ansible.builtin.shell: add-apt-repository deb https://repo.vivaldi.com/archive/deb/ stable main -y + #args: + # creates: "/etc/apt/sources.list.d/mmstick76-alacritty-focal.list" + +# - name: install packages +# become: yes +# ansible.builtin.package: +# name: +# - vivaldi-stable +# state: present + + + - name: download and install vivaldi + become: true + apt: + deb: https://downloads.vivaldi.com/stable/vivaldi-stable_4.0.2312.33-1_amd64.deb diff --git a/roles/mgrote.xnview/README.md b/roles/mgrote.xnview/README.md new file mode 100644 index 00000000..fec6774d --- /dev/null +++ b/roles/mgrote.xnview/README.md @@ -0,0 +1,8 @@ +## mgrote.xnview +### Beschreibung +Installiert xnview. + + +### Funktioniert auf +- [x] Ubuntu (>=18.04) +- [x] Linux Mint diff --git a/roles/mgrote.xnview/tasks/main.yml b/roles/mgrote.xnview/tasks/main.yml new file mode 100644 index 00000000..a3d6cefe --- /dev/null +++ b/roles/mgrote.xnview/tasks/main.yml @@ -0,0 +1,25 @@ +--- +# - name: add repo +# ansible.builtin.apt_repository: +# repo: deb https://repo.vivaldi.com/archive/deb/ stable main +# state: present +# filename: vivaldi + +# - name: add ppa +# become: yes +# ansible.builtin.shell: add-apt-repository deb https://repo.vivaldi.com/archive/deb/ stable main -y + #args: + # creates: "/etc/apt/sources.list.d/mmstick76-alacritty-focal.list" + +# - name: install packages +# become: yes +# ansible.builtin.package: +# name: +# - vivaldi-stable +# state: present + + + - name: download and install xnview + become: true + apt: + deb: https://download.xnview.com/XnViewMP-linux-x64.deb