From e2835dacb00467aa9ed55c382a963e5f77869d76 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Sun, 15 Dec 2019 17:44:42 +0100 Subject: [PATCH 01/38] Feat: add ln command for vifm --- files/dotfiles/vifm/vifmrc | 1 + 1 file changed, 1 insertion(+) diff --git a/files/dotfiles/vifm/vifmrc b/files/dotfiles/vifm/vifmrc index 876395b..5c75089 100644 --- a/files/dotfiles/vifm/vifmrc +++ b/files/dotfiles/vifm/vifmrc @@ -143,6 +143,7 @@ command! make !!make %a command! mkcd :mkdir %a | cd %a command! vgrep vim "+grep %a" command! reload :write | restart +command ln ln -s %f:p %D " ------------------------------------------------------------------------------ From 6b66630afd3f2c45ada88ee6623d04730560e74a Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Wed, 1 Jan 2020 11:32:54 +0100 Subject: [PATCH 02/38] Feat: ready to fire Poivre? --- Poivre.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Poivre.yml b/Poivre.yml index d0fbf97..3fc6f14 100644 --- a/Poivre.yml +++ b/Poivre.yml @@ -15,7 +15,7 @@ #- include: tasks/dd_backup.yml - include: tasks/prompt.yml - include: tasks/users.yml - # - include: tasks/ssh.yml + - include: tasks/ssh.yml - include: tasks/arch_programming.yml - include: tasks/arch_teacher.yml - include: tasks/arch_gnome.yml @@ -25,7 +25,7 @@ - include: tasks/home_autofs.yml - include: tasks/laptop.yml # - include: tasks/nfs_share.yml - #- include: tasks/wine.yml + # - include: tasks/wine.yml # - include: tasks/arch_virtualbox.yml handlers: From 7a4a402a0b04c901af06b92d01feabbba0574920 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Wed, 1 Jan 2020 12:02:48 +0100 Subject: [PATCH 03/38] Feat: create user before activating sudo --- Poivre.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Poivre.yml b/Poivre.yml index 3fc6f14..3c9313c 100644 --- a/Poivre.yml +++ b/Poivre.yml @@ -10,11 +10,11 @@ tasks: - include: tasks/ansible.yml - include: tasks/arch_CLI_packages.yml + - include: tasks/users.yml - include: tasks/sudo.yml - include: tasks/arch_aur.yml #- include: tasks/dd_backup.yml - include: tasks/prompt.yml - - include: tasks/users.yml - include: tasks/ssh.yml - include: tasks/arch_programming.yml - include: tasks/arch_teacher.yml From 8e6a55c2a283335c9469296f1ed0f91ed5603b59 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Wed, 1 Jan 2020 12:04:38 +0100 Subject: [PATCH 04/38] Feat: remove explicit add deploy_users to sudo --- tasks/sudo.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tasks/sudo.yml b/tasks/sudo.yml index e589ef5..646fe4b 100644 --- a/tasks/sudo.yml +++ b/tasks/sudo.yml @@ -13,12 +13,3 @@ state: present tags: - first_deployement - -- name: Add deploy user to sudo group - user: - name: "{{ item.username }}" - groups: sudo - append: yes - with_items: '{{ deploy_users }}' - tags: - - first_deployement From e75d3336b4fa4ffaa37f1f69779dbc69071381d2 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Wed, 1 Jan 2020 12:06:30 +0100 Subject: [PATCH 05/38] Feat: forgot to add users to Poivre --- Poivre.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Poivre.yml b/Poivre.yml index 3c9313c..f1ef480 100644 --- a/Poivre.yml +++ b/Poivre.yml @@ -5,6 +5,7 @@ vars_files: - vars/common.yml - vars/home.yml + - vars/users.yml - vars/Combava.yml tasks: From 092f0628855d092d54f528165baf310f2d9bf44e Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Wed, 1 Jan 2020 12:07:48 +0100 Subject: [PATCH 06/38] Feat: move users back --- Poivre.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Poivre.yml b/Poivre.yml index f1ef480..150dd49 100644 --- a/Poivre.yml +++ b/Poivre.yml @@ -11,11 +11,11 @@ tasks: - include: tasks/ansible.yml - include: tasks/arch_CLI_packages.yml - - include: tasks/users.yml - include: tasks/sudo.yml - include: tasks/arch_aur.yml #- include: tasks/dd_backup.yml - include: tasks/prompt.yml + - include: tasks/users.yml - include: tasks/ssh.yml - include: tasks/arch_programming.yml - include: tasks/arch_teacher.yml From 78b55a493cd1121d4f0fd0f80b0c3298ef7f8458 Mon Sep 17 00:00:00 2001 From: Benjamin Bertrand Date: Wed, 1 Jan 2020 19:26:04 +0000 Subject: [PATCH 07/38] =?UTF-8?q?D=C3=A9activation=20de=20la=20cr=C3=A9ati?= =?UTF-8?q?on=20des=20users?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Poivre.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Poivre.yml b/Poivre.yml index 150dd49..790dbbb 100644 --- a/Poivre.yml +++ b/Poivre.yml @@ -15,7 +15,7 @@ - include: tasks/arch_aur.yml #- include: tasks/dd_backup.yml - include: tasks/prompt.yml - - include: tasks/users.yml + #- include: tasks/users.yml - include: tasks/ssh.yml - include: tasks/arch_programming.yml - include: tasks/arch_teacher.yml From 270471ae92019aa6da076151920a9ee6f0443168 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 07:49:14 +0100 Subject: [PATCH 08/38] Feat: ignore if can't disable dhcpcd --- tasks/arch_gnome.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 35d9365..c70c9e5 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -31,6 +31,7 @@ enabled: no with_items: - dhcpcd + ignore_errors: yes - name: enable service NetworkManager systemd: From c04d20c87f977b2810a34904fba45ad02350abdb Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 07:53:36 +0100 Subject: [PATCH 09/38] Feat: remove roboto for powerline --- tasks/arch_graphicals.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/arch_graphicals.yml b/tasks/arch_graphicals.yml index 1809429..8b4aad3 100644 --- a/tasks/arch_graphicals.yml +++ b/tasks/arch_graphicals.yml @@ -73,7 +73,6 @@ skip_installed: true with_items: - ttf-ubuntu-mono-derivative-powerline-git - - ttf-roboto-mono-powerline-git - ttf-inconsolata-lgc-for-powerline - ttf-droid-sans-mono-slashed-powerline-git - ttf-literation-mono-powerline-git From cdf95639e3456980b6cb4ea3b52423bf8c92d009 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 07:59:40 +0100 Subject: [PATCH 10/38] Feat: install nfs in home_autofs --- tasks/home_autofs.yml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tasks/home_autofs.yml b/tasks/home_autofs.yml index a789aac..348aa9d 100644 --- a/tasks/home_autofs.yml +++ b/tasks/home_autofs.yml @@ -4,6 +4,20 @@ name: autofs state: present +- name: install nfs + apt: + pkg: nfs-kernel-server + state: present + when: ansible_distribution == 'Debian' + notify: restart nfs + +- name: install nfs + pacman: + pkg: nfs-utils + state: present + when: ansible_distribution != 'Debian' + notify: restart nfs + - name: Create NAS share directory file: path: "/media/{{ item.host }}" @@ -22,6 +36,12 @@ dest: "/etc/autofs/auto.{{ item.host }}" with_items: "{{ autofs }}" +- name: Enable nfs daemon + service: + name: nfs + state: started + enabled: yes + - name: Enable autofs daemon service: name: autofs From 514ff3c4f4ac4e95da400ea4d1aebfa1d9355bae Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 08:14:31 +0100 Subject: [PATCH 11/38] Feat: remove songe in sshconfig --- files/dotfiles/sshconfig | 9 --------- 1 file changed, 9 deletions(-) diff --git a/files/dotfiles/sshconfig b/files/dotfiles/sshconfig index 07b785c..1e89cf9 100755 --- a/files/dotfiles/sshconfig +++ b/files/dotfiles/sshconfig @@ -28,15 +28,6 @@ Host github PubkeyAcceptedKeyTypes * identityfile ~/.ssh/id_dsa_noPass -Host Songe - HostName songe - User waha - Port 22 - ForwardAgent yes - PubkeyAcceptedKeyTypes * - identityfile ~/.ssh/id_rsa_songe - IdentitiesOnly yes - Host Choux HostName Choux User lafrite From ee24be95d23b3e48f815bee83ed2ba68dacef18a Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 12:39:11 +0100 Subject: [PATCH 12/38] Feat: nfs to nfs-client --- tasks/home_autofs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/home_autofs.yml b/tasks/home_autofs.yml index 348aa9d..1d612e7 100644 --- a/tasks/home_autofs.yml +++ b/tasks/home_autofs.yml @@ -38,7 +38,7 @@ - name: Enable nfs daemon service: - name: nfs + name: nfs-client state: started enabled: yes From a577d152cdf10b3f4bf29349b2a0bbc61065823c Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:04:36 +0100 Subject: [PATCH 13/38] =?UTF-8?q?Feat:=20D=C3=A9ploiement=20d'un=20serveur?= =?UTF-8?q?=20cache=20pour=20Pacman?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- files/nginx.conf | 51 +++++++++++++++++++++++++++++++++++ tasks/pacman_cache_server.yml | 25 +++++++++++++++++ 2 files changed, 76 insertions(+) create mode 100644 files/nginx.conf create mode 100644 tasks/pacman_cache_server.yml diff --git a/files/nginx.conf b/files/nginx.conf new file mode 100644 index 0000000..e3ff10a --- /dev/null +++ b/files/nginx.conf @@ -0,0 +1,51 @@ +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + # Use a custom log format that will show response times and cache status + log_format archmirror '$remote_addr - $upstream_cache_status [$time_local] $request_method $host$request_uri $server_protocol $status $body_bytes_sent $request_time $upstream_response_time'; + + # Configure the cache directory, size and keys + proxy_cache_path /srv/http/pacman-cache + levels=1:2 keys_zone=archmirror:60m + inactive=365d use_temp_path=off max_size=3g; + + server { + listen 8080; + server_name cache.local; + + access_log /var/log/nginx/archmirror.access.log archmirror; + error_log /var/log/nginx/archmirror.error.log; + + # Force proxy to use TLS for upstream server requests + proxy_ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + # Use previously negotiated connection parameters + proxy_ssl_session_reuse on; + # Enables revalidation of expired cache items using conditional requests with the "If-Modified-Since" and "If-None-Match" header fields. + proxy_cache_revalidate on; + # Only one request at a time will be allowed to populate a new cache element + proxy_cache_lock on; + # Cache any responses for 1 minute by default, can be overridden by more specific response codes + proxy_cache_valid any 1m; + + # Keep connections to upstream server open + proxy_http_version 1.1; + proxy_set_header Connection ""; + proxy_read_timeout 300; + proxy_connect_timeout 300; + + location / { + proxy_pass http://mirror.archlinux.ikoula.com; + proxy_cache archmirror; # This directive should match the keys_zone option + proxy_cache_valid 200 5m; + proxy_cache_use_stale error timeout invalid_header updating http_500 http_502 http_503 http_504; + + # Add some cache status headers for debugging purposes, you can remove these lines if you want + add_header X-Upstream-Status $upstream_status; + add_header X-Cache-Status $upstream_cache_status; + } + } +} diff --git a/tasks/pacman_cache_server.yml b/tasks/pacman_cache_server.yml new file mode 100644 index 0000000..9513496 --- /dev/null +++ b/tasks/pacman_cache_server.yml @@ -0,0 +1,25 @@ +--- +- name: Install nginx + pacman: + name: nginx + state: present + +- name: create cache directy + file: + path: /srv/http/pacman-cache + state: directory + owner: http + group: http + +- name: copy nginx config + template: + src: files/nginx.conf + dest: /etc/nginx/nginx.conf + owner: root + group: root + +- name: Enable nginx daemon + service: + name: nginx + state: started + enabled: yes From 656f1686b56d4131e4be5d2e02be13da5a06c874 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:05:21 +0100 Subject: [PATCH 14/38] =?UTF-8?q?Feat:=20Choux=20joue=20le=20r=C3=B4le=20d?= =?UTF-8?q?e=20proxy=20pour=20pacman?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Choux.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Choux.yml b/Choux.yml index c00c242..1cd3542 100644 --- a/Choux.yml +++ b/Choux.yml @@ -12,6 +12,7 @@ # - include: tasks/test.yml - include: tasks/ansible.yml - include: tasks/arch_aur.yml + - include: tasks/pacman_cache_server.yml - include: tasks/arch_CLI_packages.yml - include: tasks/prompt.yml - include: tasks/users.yml From 9a2baf807bb0a6276a4be9279e236f3d83f0d057 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:08:39 +0100 Subject: [PATCH 15/38] Feat: remove users task in choux --- Choux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Choux.yml b/Choux.yml index 1cd3542..9d48b59 100644 --- a/Choux.yml +++ b/Choux.yml @@ -15,7 +15,7 @@ - include: tasks/pacman_cache_server.yml - include: tasks/arch_CLI_packages.yml - include: tasks/prompt.yml - - include: tasks/users.yml + # - include: tasks/users.yml - include: tasks/sudo.yml - include: tasks/ssh.yml - include: tasks/arch_programming.yml From 0b02860899e151f96d47809c30912135a3597862 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:13:11 +0100 Subject: [PATCH 16/38] Feat: ??? --- Choux.yml | 10 +++++++++- tasks/home_autofs.yml | 14 +++++++------- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Choux.yml b/Choux.yml index 9d48b59..ce768d5 100644 --- a/Choux.yml +++ b/Choux.yml @@ -36,7 +36,15 @@ service: name: sshd state: restarted - - name: restart nfs + - name: restart nfs-server service: name: nfs-server state: restarted + - name: restart nfs-client + service: + name: nfs-client + state: restarted + - name: restart autofs + service: + name: autofs + state: restarted diff --git a/tasks/home_autofs.yml b/tasks/home_autofs.yml index 1d612e7..e621bb4 100644 --- a/tasks/home_autofs.yml +++ b/tasks/home_autofs.yml @@ -4,19 +4,19 @@ name: autofs state: present -- name: install nfs - apt: - pkg: nfs-kernel-server - state: present - when: ansible_distribution == 'Debian' - notify: restart nfs + #- name: install nfs + # apt: + # pkg: nfs-kernel-server + # state: present + # when: ansible_distribution == 'Debian' + # notify: restart nfs-server - name: install nfs pacman: pkg: nfs-utils state: present when: ansible_distribution != 'Debian' - notify: restart nfs + notify: restart nfs-client - name: Create NAS share directory file: From b1666b639665a87765e566b4389d7e887cfb4812 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:15:52 +0100 Subject: [PATCH 17/38] Feat: remove nfs-client enable (why??) --- tasks/home_autofs.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tasks/home_autofs.yml b/tasks/home_autofs.yml index e621bb4..034e3d9 100644 --- a/tasks/home_autofs.yml +++ b/tasks/home_autofs.yml @@ -36,12 +36,6 @@ dest: "/etc/autofs/auto.{{ item.host }}" with_items: "{{ autofs }}" -- name: Enable nfs daemon - service: - name: nfs-client - state: started - enabled: yes - - name: Enable autofs daemon service: name: autofs From c59f5b5cac6df90cfd2a720f20fcdfec7235a569 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:16:25 +0100 Subject: [PATCH 18/38] FEat: add note about pacman and ansible bug --- README.md | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index e42693a..6564696 100644 --- a/README.md +++ b/README.md @@ -16,22 +16,10 @@ Installing Choux git clone https://github.com/kewlfft/ansible-aur.git ~/.ansible/plugins/modules/aur ansible-pull -U https://git.opytex.org/lafrite/Ansible_workstation.git Choux.yml -Installing Songe +Depuis peu, il y a un bug entre pacman et ansible: - ansible-pull -U https://git.opytex.org/lafrite/Ansible_workstation.git Songe.yml + LC_ALL=C ansible-pull -U https://git.opytex.org/lafrite/Ansible_workstation.git --vault-id @prompt Choux.yml -Installing Bilimbi - - ansible-pull -U https://git.opytex.org/lafrite/Ansible_workstation.git Bilimbi.yml - -Installing Manioc - - ansible-pull -U https://git.opytex.org/lafrite/Ansible_workstation.git Manioc.yml - - -After running the script, there is a bug with $TERM which makes BACKSPACE and TAB to have strange behavior. To solve it, from an other computer run: - - infocmp -x | ssh -t root@remote-host 'cat > "$TERM.info" && tic -x "$TERM.info"' ## By hand for Choux From cd7fcb8d0f774fd2b89f9a4f827e19c25ff2527e Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:19:17 +0100 Subject: [PATCH 19/38] Feat: remove comment in wine install --- tasks/wine.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tasks/wine.yml b/tasks/wine.yml index 50f50ac..9c057b6 100644 --- a/tasks/wine.yml +++ b/tasks/wine.yml @@ -27,7 +27,6 @@ - winetricks - wine_gecko - wine-mono - # Audio - lib32-alsa-plugins - lib32-libpulse - lib32-openal From f33c9ca9c35f48eb5f1c902ebc554607135a21b1 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:48:15 +0100 Subject: [PATCH 20/38] Feat: personnal look&feel for gnome --- tasks/arch_gnome.yml | 48 ++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index c70c9e5..e30cae3 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -62,12 +62,52 @@ use: makepkg skip_installed: true with_items: + - plata-theme - gnome-colors-icon-theme - - ubo-icons - - shadow-icon-theme - - vertex-themes - - vertex-icons-git - numix-icon-theme-git - numix-circle-icon-theme-git + - tela-icon-theme-git become: yes become_user: aur_builder + +- name: to fire a terminal - binding + dconf: + key: "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" + value: "'Return'" + state: present + become_user: me + +- name: to fire a terminal - command + dconf: + key: "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" + value: "'st'" + state: present + become_user: me + +- name: to fire a terminal - name + dconf: + key: "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" + value: "'Terminal'" + state: present + become_user: me + +- name: Shell theme + dconf: + key: "org/gnome/shell/extensions/user-theme/name" + value: "'Plata-Noir-Compact'" + state: present + become_user: me + +- name: Gtk theme + dconf: + key: "org/gnome/desktop/interface/get-theme" + value: "'plata-Noir-Compact'" + state: present + become_user: me + +- name: Icon theme + dconf: + key: "org/gnome/desktop/interface/get-theme" + value: "'Tela-orange-dark'" + state: present + become_user: me From 87641451182c2679eccb04e4de680953b804889a Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:54:08 +0100 Subject: [PATCH 21/38] Fix: forgot / at begining fo dconf key --- tasks/arch_gnome.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index e30cae3..59b762c 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -72,42 +72,42 @@ - name: to fire a terminal - binding dconf: - key: "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" + key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" value: "'Return'" state: present become_user: me - name: to fire a terminal - command dconf: - key: "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" + key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" value: "'st'" state: present become_user: me - name: to fire a terminal - name dconf: - key: "org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" + key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" value: "'Terminal'" state: present become_user: me - name: Shell theme dconf: - key: "org/gnome/shell/extensions/user-theme/name" + key: "/org/gnome/shell/extensions/user-theme/name" value: "'Plata-Noir-Compact'" state: present become_user: me - name: Gtk theme dconf: - key: "org/gnome/desktop/interface/get-theme" + key: "/org/gnome/desktop/interface/get-theme" value: "'plata-Noir-Compact'" state: present become_user: me - name: Icon theme dconf: - key: "org/gnome/desktop/interface/get-theme" + key: "/org/gnome/desktop/interface/get-theme" value: "'Tela-orange-dark'" state: present become_user: me From ede86442f12af49f3ce5f1a82f632608207bca01 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:58:03 +0100 Subject: [PATCH 22/38] Feat: replace me by me.username --- tasks/arch_gnome.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 59b762c..1fc9c8e 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -75,39 +75,39 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" value: "'Return'" state: present - become_user: me + become_user: "{{ me.username }}' - name: to fire a terminal - command dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" value: "'st'" state: present - become_user: me + become_user: "{{ me.username }}' - name: to fire a terminal - name dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" value: "'Terminal'" state: present - become_user: me + become_user: "{{ me.username }}' - name: Shell theme dconf: key: "/org/gnome/shell/extensions/user-theme/name" value: "'Plata-Noir-Compact'" state: present - become_user: me + become_user: "{{ me.username }}' - name: Gtk theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'plata-Noir-Compact'" state: present - become_user: me + become_user: "{{ me.username }}' - name: Icon theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'Tela-orange-dark'" state: present - become_user: me + become_user: "{{ me.username }}' From 80e5f2b6a1d2975faacf6b971abde8ac4fb4f1a3 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 19:58:39 +0100 Subject: [PATCH 23/38] Fix: quote history --- tasks/arch_gnome.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 1fc9c8e..d77bf6b 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -75,39 +75,39 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" value: "'Return'" state: present - become_user: "{{ me.username }}' + become_user: "{{ me.username }}" - name: to fire a terminal - command dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" value: "'st'" state: present - become_user: "{{ me.username }}' + become_user: "{{ me.username }}" - name: to fire a terminal - name dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" value: "'Terminal'" state: present - become_user: "{{ me.username }}' + become_user: "{{ me.username }}" - name: Shell theme dconf: key: "/org/gnome/shell/extensions/user-theme/name" value: "'Plata-Noir-Compact'" state: present - become_user: "{{ me.username }}' + become_user: "{{ me.username }}" - name: Gtk theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'plata-Noir-Compact'" state: present - become_user: "{{ me.username }}' + become_user: "{{ me.username }}" - name: Icon theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'Tela-orange-dark'" state: present - become_user: "{{ me.username }}' + become_user: "{{ me.username }}" From 3754090ee44cfe0d1f80b5c9ae307e77944437fe Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 20:00:23 +0100 Subject: [PATCH 24/38] Feat: rename docker to deb_docker --- tasks/{docker.yml => deb_docker.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename tasks/{docker.yml => deb_docker.yml} (100%) diff --git a/tasks/docker.yml b/tasks/deb_docker.yml similarity index 100% rename from tasks/docker.yml rename to tasks/deb_docker.yml From b13274e4a6abd34ef65b3ec622294e48adc5c232 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 20:01:00 +0100 Subject: [PATCH 25/38] Feat: adapt servers to it --- Bilimbi.yml | 2 +- Manioc.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Bilimbi.yml b/Bilimbi.yml index d0a3e51..f2759f2 100644 --- a/Bilimbi.yml +++ b/Bilimbi.yml @@ -14,7 +14,7 @@ - include: tasks/sudo.yml - include: tasks/ssh.yml - include: tasks/dotfiles.yml - - include: tasks/docker.yml + - include: tasks/deb_docker.yml handlers: - name: restart sshd diff --git a/Manioc.yml b/Manioc.yml index d73a3fb..d93581c 100644 --- a/Manioc.yml +++ b/Manioc.yml @@ -15,7 +15,7 @@ - include: tasks/sudo.yml - include: tasks/ssh.yml - include: tasks/dotfiles.yml - - include: tasks/docker.yml + - include: tasks/deb_docker.yml handlers: - name: restart sshd From 93b8c7fe6ffff6510f3839ad1614ff00edab3b2b Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 20:01:55 +0100 Subject: [PATCH 26/38] Feat: me -> me[0] --- tasks/arch_gnome.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index d77bf6b..44ff115 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -75,39 +75,39 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" value: "'Return'" state: present - become_user: "{{ me.username }}" + become_user: "{{ me[0].username }}" - name: to fire a terminal - command dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" value: "'st'" state: present - become_user: "{{ me.username }}" + become_user: "{{ me[0].username }}" - name: to fire a terminal - name dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" value: "'Terminal'" state: present - become_user: "{{ me.username }}" + become_user: "{{ me[0].username }}" - name: Shell theme dconf: key: "/org/gnome/shell/extensions/user-theme/name" value: "'Plata-Noir-Compact'" state: present - become_user: "{{ me.username }}" + become_user: "{{ me[0].username }}" - name: Gtk theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'plata-Noir-Compact'" state: present - become_user: "{{ me.username }}" + become_user: "{{ me[0].username }}" - name: Icon theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'Tela-orange-dark'" state: present - become_user: "{{ me.username }}" + become_user: "{{ me[0].username }}" From 1af1aae772fdef60db245319d9f63894447f59fb Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 20:06:29 +0100 Subject: [PATCH 27/38] Fix: try to loop over me --- tasks/arch_gnome.yml | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 44ff115..5e1447c 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -75,39 +75,45 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" value: "'Return'" state: present - become_user: "{{ me[0].username }}" + become_user: "{{ item.username }}" + with_items: "{{ me }}" - name: to fire a terminal - command dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" value: "'st'" state: present - become_user: "{{ me[0].username }}" + become_user: "{{ item.username }}" + with_items: "{{ me }}" - name: to fire a terminal - name dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" value: "'Terminal'" state: present - become_user: "{{ me[0].username }}" + become_user: "{{ item.username }}" + with_items: "{{ me }}" - name: Shell theme dconf: key: "/org/gnome/shell/extensions/user-theme/name" value: "'Plata-Noir-Compact'" state: present - become_user: "{{ me[0].username }}" + become_user: "{{ item.username }}" + with_items: "{{ me }}" - name: Gtk theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'plata-Noir-Compact'" state: present - become_user: "{{ me[0].username }}" + become_user: "{{ item.username }}" + with_items: "{{ me }}" - name: Icon theme dconf: key: "/org/gnome/desktop/interface/get-theme" value: "'Tela-orange-dark'" state: present - become_user: "{{ me[0].username }}" + become_user: "{{ item.username }}" + with_items: "{{ me }}" From 319ed79bfc6c9c8adb3cca72ef6a8e7618059338 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Thu, 2 Jan 2020 20:09:34 +0100 Subject: [PATCH 28/38] Fix: add become:true --- tasks/arch_gnome.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 5e1447c..40d386d 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -75,6 +75,7 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" value: "'Return'" state: present + become: true become_user: "{{ item.username }}" with_items: "{{ me }}" @@ -83,6 +84,7 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/command" value: "'st'" state: present + become: true become_user: "{{ item.username }}" with_items: "{{ me }}" @@ -91,6 +93,7 @@ key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/name" value: "'Terminal'" state: present + become: true become_user: "{{ item.username }}" with_items: "{{ me }}" @@ -99,6 +102,7 @@ key: "/org/gnome/shell/extensions/user-theme/name" value: "'Plata-Noir-Compact'" state: present + become: true become_user: "{{ item.username }}" with_items: "{{ me }}" @@ -107,6 +111,7 @@ key: "/org/gnome/desktop/interface/get-theme" value: "'plata-Noir-Compact'" state: present + become: true become_user: "{{ item.username }}" with_items: "{{ me }}" @@ -115,5 +120,6 @@ key: "/org/gnome/desktop/interface/get-theme" value: "'Tela-orange-dark'" state: present + become: true become_user: "{{ item.username }}" with_items: "{{ me }}" From 4b6521e984c10e443e90eb81129a9314dd02f676 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Fri, 3 Jan 2020 07:56:07 +0100 Subject: [PATCH 29/38] Fix: dconf better keys --- tasks/arch_gnome.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 40d386d..e01e3b1 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -108,7 +108,7 @@ - name: Gtk theme dconf: - key: "/org/gnome/desktop/interface/get-theme" + key: "/org/gnome/desktop/interface/gkt-theme" value: "'plata-Noir-Compact'" state: present become: true @@ -117,7 +117,7 @@ - name: Icon theme dconf: - key: "/org/gnome/desktop/interface/get-theme" + key: "/org/gnome/desktop/interface/icon-theme" value: "'Tela-orange-dark'" state: present become: true From fd88131cc01b006a3c3005953af3906c8a120aba Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Fri, 3 Jan 2020 07:59:07 +0100 Subject: [PATCH 30/38] Fix: gkt theme name --- tasks/arch_gnome.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index e01e3b1..ba1d109 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -109,7 +109,7 @@ - name: Gtk theme dconf: key: "/org/gnome/desktop/interface/gkt-theme" - value: "'plata-Noir-Compact'" + value: "'Plata-Noir-Compact'" state: present become: true become_user: "{{ item.username }}" From e17a4ce33f1576d5d6029ef37ecf235a404dedcc Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Fri, 3 Jan 2020 08:03:19 +0100 Subject: [PATCH 31/38] Feat: add super + q for closing window --- tasks/arch_gnome.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index ba1d109..4a93037 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -70,6 +70,16 @@ become: yes become_user: aur_builder +- name: to close window + dconf: + key: "/org/gnome/desktop/wm/keybindings/close" + value: "'q'" + state: present + become: true + become_user: "{{ item.username }}" + with_items: "{{ me }}" + + - name: to fire a terminal - binding dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" From f0cce713b3e095183b9d8e9cc5d6be7fb501affb Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Fri, 3 Jan 2020 08:36:35 +0100 Subject: [PATCH 32/38] Feat: move enseignement tmuxp start_directory --- files/dotfiles/tmuxp/enseignement.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/dotfiles/tmuxp/enseignement.yml b/files/dotfiles/tmuxp/enseignement.yml index d517587..fef89d0 100644 --- a/files/dotfiles/tmuxp/enseignement.yml +++ b/files/dotfiles/tmuxp/enseignement.yml @@ -1,5 +1,5 @@ session_name: enseignement -start_directory: /media/documents/Cours/Prof/Enseignements/2019-2020/ +start_directory: ~/Cours/Prof/Enseignements/2019-2020/ shell_command_before: source config.fish windows: From 121761b04368e8cfe9ae788d12a8b28dcb8f7f4d Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Fri, 3 Jan 2020 09:00:51 +0100 Subject: [PATCH 33/38] Fix: close shortcut --- tasks/arch_gnome.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 4a93037..3811473 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -79,11 +79,10 @@ become_user: "{{ item.username }}" with_items: "{{ me }}" - - name: to fire a terminal - binding dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" - value: "'Return'" + value: "['Return']" state: present become: true become_user: "{{ item.username }}" From e8b57bba5b5b82ee8ed91dc6201bdd8a652fd8ca Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Sat, 4 Jan 2020 07:08:30 +0100 Subject: [PATCH 34/38] Fix: shortcuts for gnome --- tasks/arch_gnome.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/arch_gnome.yml b/tasks/arch_gnome.yml index 3811473..7163548 100644 --- a/tasks/arch_gnome.yml +++ b/tasks/arch_gnome.yml @@ -73,7 +73,7 @@ - name: to close window dconf: key: "/org/gnome/desktop/wm/keybindings/close" - value: "'q'" + value: "['q']" state: present become: true become_user: "{{ item.username }}" @@ -82,7 +82,7 @@ - name: to fire a terminal - binding dconf: key: "/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/binding" - value: "['Return']" + value: "'Return'" state: present become: true become_user: "{{ item.username }}" From f07acd215dbc85b8c38dbbf5b274437012c9a741 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Sat, 4 Jan 2020 07:08:45 +0100 Subject: [PATCH 35/38] feat: Add docker to Poivre --- Poivre.yml | 1 + tasks/arch_docker.yml | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/Poivre.yml b/Poivre.yml index 790dbbb..02a8297 100644 --- a/Poivre.yml +++ b/Poivre.yml @@ -25,6 +25,7 @@ - include: tasks/dotfiles_desktop.yml - include: tasks/home_autofs.yml - include: tasks/laptop.yml + - include: tasks/arch_docker.yml # - include: tasks/nfs_share.yml # - include: tasks/wine.yml # - include: tasks/arch_virtualbox.yml diff --git a/tasks/arch_docker.yml b/tasks/arch_docker.yml index 6776fb5..0fc33ee 100644 --- a/tasks/arch_docker.yml +++ b/tasks/arch_docker.yml @@ -5,3 +5,8 @@ - docker state: present +- name: Enable docker daemon + service: + name: docker + state: started + enabled: yes From 7947167cc594c32ef2dbb10cf694b1bfd96c3918 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Mon, 27 Jan 2020 15:20:02 +0100 Subject: [PATCH 36/38] FEat: remove comment!?!? --- tasks/wine.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasks/wine.yml b/tasks/wine.yml index 9c057b6..82eb604 100644 --- a/tasks/wine.yml +++ b/tasks/wine.yml @@ -19,10 +19,10 @@ pacman: update_cache: yes -- name: Install WINE - pacman: +- name: Install gnome packages + pacman: name: - - lib32-libglvnd # wine has multiple fulfilments for lib32-libgl + - lib32-libglvnd - wine - winetricks - wine_gecko From b450056811acbb76129d0a93caca791744bea877 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Mon, 27 Jan 2020 15:36:12 +0100 Subject: [PATCH 37/38] Fix: looking for the error in Wine --- tasks/wine.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/tasks/wine.yml b/tasks/wine.yml index 82eb604..6824680 100644 --- a/tasks/wine.yml +++ b/tasks/wine.yml @@ -15,11 +15,7 @@ insertafter: "^\\[multilib\\]" regexp: "Include = /etc/pacman.d/mirrorlist" -- name: Update pacman cache - pacman: - update_cache: yes - -- name: Install gnome packages +- name: Install WINE packages pacman: name: - lib32-libglvnd @@ -31,3 +27,4 @@ - lib32-libpulse - lib32-openal state: present + update-cache: yes From 76e20fd50599df95e7b35a14589982d8cb679e39 Mon Sep 17 00:00:00 2001 From: Bertrand Benjamin Date: Wed, 29 Jan 2020 17:55:24 +0100 Subject: [PATCH 38/38] Fix: disable users task for Combava --- Combava.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Combava.yml b/Combava.yml index 281da53..ec741bf 100644 --- a/Combava.yml +++ b/Combava.yml @@ -14,7 +14,7 @@ - include: tasks/arch_CLI_packages.yml - include: tasks/dd_backup.yml - include: tasks/prompt.yml - - include: tasks/users.yml + # - include: tasks/users.yml - include: tasks/sudo.yml # - include: tasks/ssh.yml - include: tasks/arch_programming.yml