From 537d0df4fc04ac0ed6c5662cdffbf21bdb091c03 Mon Sep 17 00:00:00 2001 From: Nemo Date: Sun, 11 Oct 2020 13:26:29 +0200 Subject: [PATCH 1/5] Start working on workstation configuration --- .gitignore | 2 + playbook_workstation_configure.yml | 13 ++ roles/workstation_mutt/README.md | 36 +++++ roles/workstation_mutt/defaults/main.yml | 27 ++++ roles/workstation_mutt/meta/main.yml | 19 +++ roles/workstation_mutt/tasks/main.yml | 3 + roles/workstation_mutt/tasks/mutt.yml | 16 ++ roles/workstation_mutt/tasks/package.yml | 5 + roles/workstation_mutt/templates/mailcap.j2 | 4 + roles/workstation_mutt/templates/muttrc.j2 | 153 ++++++++++++++++++++ 10 files changed, 278 insertions(+) create mode 100644 playbook_workstation_configure.yml create mode 100644 roles/workstation_mutt/README.md create mode 100644 roles/workstation_mutt/defaults/main.yml create mode 100644 roles/workstation_mutt/meta/main.yml create mode 100644 roles/workstation_mutt/tasks/main.yml create mode 100644 roles/workstation_mutt/tasks/mutt.yml create mode 100644 roles/workstation_mutt/tasks/package.yml create mode 100644 roles/workstation_mutt/templates/mailcap.j2 create mode 100644 roles/workstation_mutt/templates/muttrc.j2 diff --git a/.gitignore b/.gitignore index ae34bbb..3bbd38b 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ roles/powerdns.* inventory* !inventory_template/inventory.yml !inventory_template* +vars-workstation/vault-workstation.yml +vars-workstation/vars-workstation.yml diff --git a/playbook_workstation_configure.yml b/playbook_workstation_configure.yml new file mode 100644 index 0000000..6d22997 --- /dev/null +++ b/playbook_workstation_configure.yml @@ -0,0 +1,13 @@ +--- + +- hosts: localhost + vars_files: + - vars-workstation/vault-workstation.yml + - vars-workstation/vars-workstation.yml + roles: + - client_resolvers + - client_tools + - client_ntp + - client_iptables + - workstation_mutt + diff --git a/roles/workstation_mutt/README.md b/roles/workstation_mutt/README.md new file mode 100644 index 0000000..c8f7bd6 --- /dev/null +++ b/roles/workstation_mutt/README.md @@ -0,0 +1,36 @@ +Ansible Role: workstation mutt +========= + +This role configure Mutt on a GNU/Linux workstation. + +Requirements +------------ + +Mutt, gpg2 and abook installed. + +Role Variables +-------------- + +All variables and default values are defined in `defaults/main.yml`/ + +Dependencies +------------ + +None. + +Example Playbook +---------------- + + - hosts: localhost + roles: + - workstation_mutt + +License +------- + +BSD + +Author Information +------------------ + +This role was created in 2020 by Nemo. diff --git a/roles/workstation_mutt/defaults/main.yml b/roles/workstation_mutt/defaults/main.yml new file mode 100644 index 0000000..89b478a --- /dev/null +++ b/roles/workstation_mutt/defaults/main.yml @@ -0,0 +1,27 @@ +--- +# defaults file for workstation_mutt + +workstation_mutt_user: john +workstation_mutt_group: john +workstation_mutt_home: /home/john +workstation_mutt_realname: "John DOE" +workstation_mutt_spoolfile: "imaps://example.org:993/INBOX" +workstation_mutt_imap_user: "john" +workstation_mutt_imap_pass: "YOURSMTPPASSWORD" +workstation_mutt_smtp_url: "smtp://example.org:587/" +workstation_mutt_smtp_pass: "YOURSMTPPASSWORD" +workstation_mutt_from: "john@example.org" +workstation_mutt_trash: "imaps://example.org/Trash" +workstation_mutt_record: "+Sent" +workstation_mutt_postponed: "+Drafts" +workstation_mutt_folder: "imaps://example.org:993/" +workstation_mutt_pgp_sign_as: YOURPHPIDKEY +workstation_mutt_packages: + - gnupg + - mutt + - abook + - antiword + - pstotext + - poppler + - links + diff --git a/roles/workstation_mutt/meta/main.yml b/roles/workstation_mutt/meta/main.yml new file mode 100644 index 0000000..56e485d --- /dev/null +++ b/roles/workstation_mutt/meta/main.yml @@ -0,0 +1,19 @@ +galaxy_info: + author: nemo + description: Configure Mutt on a GNU/Linux workstation. + company: Wirebrass + + license: license (BSD) + + min_ansible_version: 2.4 + + platforms: + - name: Gentoo + versions: + - all + + galaxy_tags: + - mutt + - mail + +dependencies: [] diff --git a/roles/workstation_mutt/tasks/main.yml b/roles/workstation_mutt/tasks/main.yml new file mode 100644 index 0000000..ad46ee6 --- /dev/null +++ b/roles/workstation_mutt/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- import_tasks: package.yml +- import_tasks: mutt.yml diff --git a/roles/workstation_mutt/tasks/mutt.yml b/roles/workstation_mutt/tasks/mutt.yml new file mode 100644 index 0000000..b5dd870 --- /dev/null +++ b/roles/workstation_mutt/tasks/mutt.yml @@ -0,0 +1,16 @@ +--- +- name: Mailcap configured + template: + src: mailcap.j2 + dest: "{{ workstation_mutt_home }}/.mailcap" + owner: "{{ workstation_mutt_user }}" + group: "{{ workstation_mutt_group }}" + mode: 0600 + +- name: Mutt configured + template: + src: muttrc.j2 + dest: "{{ workstation_mutt_home }}/.muttrc" + owner: "{{ workstation_mutt_user }}" + group: "{{ workstation_mutt_group }}" + mode: 0600 diff --git a/roles/workstation_mutt/tasks/package.yml b/roles/workstation_mutt/tasks/package.yml new file mode 100644 index 0000000..01c3266 --- /dev/null +++ b/roles/workstation_mutt/tasks/package.yml @@ -0,0 +1,5 @@ +--- +- name: Mutt, abook, antiword, pstotext, gnupg and poppler installed + package: + name: "{{ workstation_mutt_packages }}" + state: present diff --git a/roles/workstation_mutt/templates/mailcap.j2 b/roles/workstation_mutt/templates/mailcap.j2 new file mode 100644 index 0000000..75be92f --- /dev/null +++ b/roles/workstation_mutt/templates/mailcap.j2 @@ -0,0 +1,4 @@ +text/html; links %s; nametemplate=%s.html +text/html; links -dump %s; nametemplate=%s.html; copiousoutput +application/msword; antiword '%s'; copiousoutput; description=Word Document; nametemplate=%s.doc +application/pdf; pdftotext '%s' -; copiousoutput; description=PDF Document; nametemplate=%s.pdf diff --git a/roles/workstation_mutt/templates/muttrc.j2 b/roles/workstation_mutt/templates/muttrc.j2 new file mode 100644 index 0000000..fa5074f --- /dev/null +++ b/roles/workstation_mutt/templates/muttrc.j2 @@ -0,0 +1,153 @@ +# jeu de caractères des messages envoyés +set send_charset="utf-8" +# si aucun jeu de caractères n'est indiqué pour les messages entrant, nous supposons qu'il s'agit de windows +set assumed_charset="iso-8859-1" + +# défiler d'une ligne au lieu d'une page +set menu_scroll=yes + +# créer un motif de recherche par défaut pour chercher dans , To, Cc et Subject +set simple_search="~f %s | ~C %s | ~s %s" + +# configuration de base +set realname="{{ workstation_mutt_realname }}" +set header_cache =~/.mutt/cache/headers +set certificate_file =~/.mutt/certificates +set message_cachedir =~/.mutt/cache/bodies + +# configuration imap +set spoolfile="{{ workstation_mutt_spoolfile }}" +set imap_user="{{ workstation_mutt_imap_user }}" +set imap_pass="{{ workstation_mutt_imap_pass }}" +set imap_passive="no" +set imap_check_subscribed="yes" +set imap_list_subscribed="yes" + +# configuration SMTP +set smtp_url="{{ workstation_mutt_smtp_url }}" +set smtp_pass="{{ workstation_mutt_smtp_pass }}" +set from="{{ workstation_mutt_from }}" +set use_envelope_from=yes # Pour que postfix ou sendmail ne change pas votre from + +# petit plus +set trash="{{ workstation_mutt_trash }}" +set record="{{ workstation_mutt_record }}" +set postponed="{{ workstation_mutt_postponed }}" +set folder="{{ workstation_mutt_folder }}" +set imap_check_subscribed=yes +set mail_check=120 +set timeout=300 +set imap_keepalive=300 +set signature='~/signature.txt' + +# locales FR pour les nom des jours et mois +#set locale="fr_FR" + +# Format de date +set date_format="%A %d %b %Y à %H:%M:%S (%Z)" + +# phrase d'intro pour réponse quotée +set attribution="Le %d, %n a écrit :" +set forward_format="[Fwd: %s]" +set forward_quote + +mailboxes ! +#Editeur +set edit_hdrs +auto_view text/html +set editor="vim -c 'set syntax=mail ft=mail enc=utf-8'" # indiquer ici votre éditeur de texte préféré. + +color attachment magenta default # attachments +color body brightred default "(ftp|http)://[^ ]+" # point out URLs +color body brightcyan default [-a-z_0-9.]+@[-a-z_0-9.]+ # e-mail addresses +color bold brightblue default # boldface text +color error brightwhite red # error messages +color hdrdefault magenta default # default color of message header +color header brightmagenta default ^(From): # From and Subject header +color header brightwhite default ^(Subject): # From and Subject header +color header brightwhite default ^(Date): # Date header +color header white default ^(In-Reply-To): +color indicator brightred default # indicator bar +color markers brightblue default # wrapped line markers (+) +color message brightblack green # status messages +color normal default default # default +color quoted yellow default # quoted text, 1st quote level +color quoted1 green default # quoted text, 2nd quote level +color quoted2 brightblue default # quoted text, 3rd quote level +color quoted3 blue default # quoted text, 4th quoet level +color search black yellow # matched search patterns in pager +color signature red default # the signature (after sigdashes) +color status default blue # status lines +color tilde brightblue default # ``~'' used to pad blank lines +color tree green default # thread tree in the index menu +color underline brightgreen default # underlined text + +set pager_index_lines=7 +set pager_stop +set mask=".*" # the default mask hides dotfiles and maildirs are dotfiles now. + +macro index c "?" "open a different folder" +macro pager c "?" "open a different folder" + +auto_view text/html +bind index G imap-fetch-mail +set timeout=30 + +# ne pas montrer tous les entêtes seulement quelques-uns * +ignore * +unignore From To Cc Bcc Date Subject +# et dans cet ordre +unhdr_order * +hdr_order From: To: Cc: Bcc: Date: Subject: + +# activate TLS if available on the server +set ssl_starttls=yes +# always use SSL when connecting to a server +set ssl_force_tls=yes +# Display download progress every 5K +set net_inc=5 + +# Cancel a message when subject is blank +set abort_nosubject=yes + +auto_view application/msword +auto_view application/pdf + +set query_command= "abook --mutt-query '%s'" +macro index,pager A "abook --add-email-quiet" "Ajouter l'expediteur dans abook" +bind editor complete-query + +# set up the sidebar, default not visible +set sidebar_visible=yes +set sidebar_width=20 +set sidebar_folder_indent=yes +set sidebar_short_path=yes + +bind index \CP sidebar-prev +bind index \CN sidebar-next +bind index \CO sidebar-open +bind pager \CP sidebar-prev +bind pager \CN sidebar-next +bind pager \CO sidebar-open +color sidebar_new yellow default +set mailcap_path=~/.mailcap +set sidebar_sort_method=alpha + +#set beep_new=yes +set crypt_replysign=yes +set crypt_replyencrypt=yes +set crypt_replysignencrypted=yes +set crypt_autosign=yes +set crypt_verify_sig=yes +set pgp_sign_as={{ workstation_mutt_pgp_sign_as }} +set pgp_decode_command="gpg2 %?p?--passphrase- 0? --no-verbose --batch --output - %f" +set pgp_verify_command="gpg2 --no-verbose --batch --output --verify %s %f" +set pgp_decrypt_command="gpg2 --passphrase- 0 --no-verbose --batch --output - %f" +set pgp_sign_command="gpg2 --no-verbose --batch --output --passphrase- 0 --armor --detach-sign --textmode %?a?-u %a? %f" +set pgp_autosign=yes +set pgp_replyencrypt=yes +set pgp_replysign=yes +set pgp_timeout=300 +set pgp_good_sign="^gpg: Signature correcte de " +set pgp_import_command="gpg2 --no-verbose --import %f" + From bbf2460ed147d1453b639c370ffec8835ae9d4d7 Mon Sep 17 00:00:00 2001 From: Nemo Date: Sun, 11 Oct 2020 13:45:13 +0200 Subject: [PATCH 2/5] Move workstation vars --- .gitignore | 4 ++-- playbook_workstation_configure.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3bbd38b..eeda367 100644 --- a/.gitignore +++ b/.gitignore @@ -5,5 +5,5 @@ roles/powerdns.* inventory* !inventory_template/inventory.yml !inventory_template* -vars-workstation/vault-workstation.yml -vars-workstation/vars-workstation.yml +vars_workstation/vault-workstation.yml +vars_workstation/vars-workstation.yml diff --git a/playbook_workstation_configure.yml b/playbook_workstation_configure.yml index 6d22997..774d780 100644 --- a/playbook_workstation_configure.yml +++ b/playbook_workstation_configure.yml @@ -2,8 +2,8 @@ - hosts: localhost vars_files: - - vars-workstation/vault-workstation.yml - - vars-workstation/vars-workstation.yml + - vars_workstation/vault-workstation.yml + - vars_workstation/vars-workstation.yml roles: - client_resolvers - client_tools From 162739b9655f63bf2885bc7088ae4f4435f4fb3f Mon Sep 17 00:00:00 2001 From: Nemo Date: Sun, 11 Oct 2020 13:50:33 +0200 Subject: [PATCH 3/5] Add template inventories --- roles/workstation_mutt/defaults/main.yml | 2 +- .../vars-workstation.template.yml | 47 +++++++++++++++++++ .../vault-workstation.template.yml | 5 ++ 3 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 vars_workstation/vars-workstation.template.yml create mode 100644 vars_workstation/vault-workstation.template.yml diff --git a/roles/workstation_mutt/defaults/main.yml b/roles/workstation_mutt/defaults/main.yml index 89b478a..ba1928f 100644 --- a/roles/workstation_mutt/defaults/main.yml +++ b/roles/workstation_mutt/defaults/main.yml @@ -7,7 +7,7 @@ workstation_mutt_home: /home/john workstation_mutt_realname: "John DOE" workstation_mutt_spoolfile: "imaps://example.org:993/INBOX" workstation_mutt_imap_user: "john" -workstation_mutt_imap_pass: "YOURSMTPPASSWORD" +workstation_mutt_imap_pass: "YOURIMAPPASSWORD" workstation_mutt_smtp_url: "smtp://example.org:587/" workstation_mutt_smtp_pass: "YOURSMTPPASSWORD" workstation_mutt_from: "john@example.org" diff --git a/vars_workstation/vars-workstation.template.yml b/vars_workstation/vars-workstation.template.yml new file mode 100644 index 0000000..bc361ef --- /dev/null +++ b/vars_workstation/vars-workstation.template.yml @@ -0,0 +1,47 @@ +--- +ansible_become_pass: "{{ vault_ansible_become_pass }}" +ansible_become: yes +ansible_python_interpreter: auto_silent + +tools_package: + - app-misc/screen + - bind-tools + - vim + - tcpdump + - gentoolkit + - tmux + - htop + - sudo + - curl + - sed + - awk + - grep + - jq + - mailutils + +resolvers: + - 2001:910:800::40 + - 80.67.169.12 + - 2001:913::8 + - 80.67.188.188 + +tcp_authorized_ports: [] +udp_authorized_ports: [] +ip_authorized: [] + +workstation_mutt_user: john +workstation_mutt_group: john +workstation_mutt_home: /home/john +workstation_mutt_realname: "John DOE" +workstation_mutt_spoolfile: "imaps://example.org:993/INBOX" +workstation_mutt_imap_user: "{{ vault_workstation_mutt_imap_user }}" +workstation_mutt_imap_pass: "{{ vault_workstation_mutt_imap_pass }}" +workstation_mutt_smtp_url: "smtp://john@example.org:587/" +workstation_mutt_smtp_pass: "{{ vault_workstation_mutt_smtp_pass }}" +workstation_mutt_from: "john@example.org" +workstation_mutt_trash: "imaps://example.org/Trash" +workstation_mutt_record: "+Sent" +workstation_mutt_postponed: "+Drafts" +workstation_mutt_folder: "imaps://example.org:993/" +workstation_mutt_pgp_sign_as: "{{ vault_workstation_mutt_pgp_sign_as }}" + diff --git a/vars_workstation/vault-workstation.template.yml b/vars_workstation/vault-workstation.template.yml new file mode 100644 index 0000000..52d7b0a --- /dev/null +++ b/vars_workstation/vault-workstation.template.yml @@ -0,0 +1,5 @@ +vault_ansible_become_pass: YOURLOCALSUDOPASSWORD +vault_workstation_mutt_imap_user: "YOURIMAPUSER" +vault_workstation_mutt_imap_pass: "YOURIMAPPASSWORD" +vault_workstation_mutt_smtp_pass: "YOURSMTPPASSWORD" +vault_workstation_mutt_pgp_sign_as: YOURPGPID From 2635ca69667ed341d360a5483433136a8fff49a1 Mon Sep 17 00:00:00 2001 From: Nemo Date: Sun, 11 Oct 2020 15:34:29 +0200 Subject: [PATCH 4/5] Start working on workstation X environment --- roles/workstation_mutt/README.md | 4 +- roles/workstation_xdesktop/README.md | 36 ++ roles/workstation_xdesktop/defaults/main.yml | 33 + roles/workstation_xdesktop/files/Xdefaults | 164 +++++ roles/workstation_xdesktop/files/Xresources | 3 + .../workstation_xdesktop/files/awesome.rc.lua | 608 ++++++++++++++++++ roles/workstation_xdesktop/files/xinitrc | 4 + roles/workstation_xdesktop/files/xscreensaver | 293 +++++++++ roles/workstation_xdesktop/meta/main.yml | 22 + roles/workstation_xdesktop/tasks/main.yml | 3 + roles/workstation_xdesktop/tasks/package.yml | 5 + roles/workstation_xdesktop/tasks/xdesktop.yml | 58 ++ 12 files changed, 1231 insertions(+), 2 deletions(-) create mode 100644 roles/workstation_xdesktop/README.md create mode 100644 roles/workstation_xdesktop/defaults/main.yml create mode 100644 roles/workstation_xdesktop/files/Xdefaults create mode 100644 roles/workstation_xdesktop/files/Xresources create mode 100644 roles/workstation_xdesktop/files/awesome.rc.lua create mode 100644 roles/workstation_xdesktop/files/xinitrc create mode 100644 roles/workstation_xdesktop/files/xscreensaver create mode 100644 roles/workstation_xdesktop/meta/main.yml create mode 100644 roles/workstation_xdesktop/tasks/main.yml create mode 100644 roles/workstation_xdesktop/tasks/package.yml create mode 100644 roles/workstation_xdesktop/tasks/xdesktop.yml diff --git a/roles/workstation_mutt/README.md b/roles/workstation_mutt/README.md index c8f7bd6..5233c12 100644 --- a/roles/workstation_mutt/README.md +++ b/roles/workstation_mutt/README.md @@ -6,12 +6,12 @@ This role configure Mutt on a GNU/Linux workstation. Requirements ------------ -Mutt, gpg2 and abook installed. +None. Role Variables -------------- -All variables and default values are defined in `defaults/main.yml`/ +All variables and default values are defined in `defaults/main.yml`. Dependencies ------------ diff --git a/roles/workstation_xdesktop/README.md b/roles/workstation_xdesktop/README.md new file mode 100644 index 0000000..7c29d7e --- /dev/null +++ b/roles/workstation_xdesktop/README.md @@ -0,0 +1,36 @@ +Ansible Role: workstation xdesktop +========= + +This role configure X environment on a GNU/Linux workstation. + +Requirements +------------ + +None. + +Role Variables +-------------- + +All variables and default values are defined in `defaults/main.yml`. + +Dependencies +------------ + +None. + +Example Playbook +---------------- + + - hosts: localhost + roles: + - workstation_xdesktop + +License +------- + +BSD + +Author Information +------------------ + +This role was created in 2020 by Nemo. diff --git a/roles/workstation_xdesktop/defaults/main.yml b/roles/workstation_xdesktop/defaults/main.yml new file mode 100644 index 0000000..2603094 --- /dev/null +++ b/roles/workstation_xdesktop/defaults/main.yml @@ -0,0 +1,33 @@ +--- +# defaults file for workstation_xdesktop + +workstation_xdesktop_user: john +workstation_xdesktop_group: john +workstation_xdesktop_home: /home/john +workstation_xdesktop_packages: + - awesome + - xrdb + - xbacklight + - xscreensaver + - xorg-x11 + - eog + - evince + - xournal + - vlc + - pcmanfm + - libreoffice-bin + - firefox-bin + - filezilla + - keepass + - mpv + - qbittorrent + - teams + - smplayer + - texstudio + - volumeicon + - geany + - scrot + - gtk+ + - skypeforlinux + - alsa-utils + diff --git a/roles/workstation_xdesktop/files/Xdefaults b/roles/workstation_xdesktop/files/Xdefaults new file mode 100644 index 0000000..c818fe9 --- /dev/null +++ b/roles/workstation_xdesktop/files/Xdefaults @@ -0,0 +1,164 @@ +XTerm*background:black +XTerm*foreground:white +XTerm*saveLines: 1000 +XTerm*HiForeColor: white +XTerm*HiBackColor: #c06077 +XTerm*faceName: liberation mono:pixelsize=12 + +Xcursor.theme: Vanilla-DMZ +! =============================================== +! URXVT +! =============================================== +#URxvt*termName: xterm +URxvt*geometry: 240x84 +! URxvt*chdir: string +! URxvt*reverseVideo: boolean +URxvt*loginShell: false +! URxvt*jumpScroll: boolean +! URxvt*skipScroll: boolean +! URxvt*pastableTabs: boolean +! URxvt*scrollstyle: mode +URxvt*scrollBar: false +! URxvt*scrollBar_right: boolean +! URxvt*scrollBar_floating: boolean +! URxvt*scrollBar_align: mode +! URxvt*thickness: number +! URxvt*scrollTtyOutput: boolean +! URxvt*scrollTtyKeypress: boolean +! URxvt*scrollWithBuffer: boolean +! URxvt*inheritPixmap: boolean +URxvt*transparent: false +! URxvt*tintColor: color +URxvt*shading: 20 +! URxvt*blurRadius: HxV +URxvt*fading: 40 +URxvt*fadeColor: black +! URxvt*utmpInhibit: boolean +URxvt*urgentOnBell: true +URxvt*visualBell: true +! URxvt*mapAlert: boolean +! URxvt*meta8: boolean +! URxvt*mouseWheelScrollPage: boolean +! URxvt*tripleclickwords: boolean +! URxvt*insecure: boolean +! URxvt*cursorUnderline: boolean +! URxvt*cursorBlink: boolean +URxvt*pointerBlank: true +URxvt*background: #000000 +URxvt*foreground: #B0B0B0 +! URxvt! *colorBD: color +! URxvt! *colorIT: color +URxvt! *colorUL: #75A8F0 +! URxvt! *colorRV: color +! URxvt*underlineColor: color +! URxvt*scrollColor: color +! URxvt*troughColor: color +! URxvt*highlightColor: color +! URxvt*highlightTextColor: color +URxvt*cursorColor: #626262 +URxvt*cursorColor2: #FFFFFF +! URxvt*pointerColor: color +! URxvt*pointerColor2: color +! URxvt*borderColor: color +! URxvt*iconFile: file +URxvt.font: xft:DejaVu Sans Mono:size=9.0 +URxvt.boldFont: xft:DejaVu Sans Mono:bold:size=9.0 +URxvt.italicFont: xft:DejaVu Sans Mono:italic:size=9.0 +URxvt.boldItalicFont: xft:DejaVu Sans Mono:bold:italic:size=9.2 +! URxvt*intensityStyles: boolean +! URxvt*inputMethod: name +! URxvt*preeditType: style +! URxvt*imLocale: string +! URxvt*imFont: fontname +! URxvt*title: string +! URxvt*iconName: string +URxvt*saveLines: 100000 +! URxvt*buffered: boolean +! URxvt*depth: number +! URxvt*visual: number +! URxvt*transient-for: windowid +! URxvt*override-redirect: boolean +! URxvt*hold: boolean +! URxvt*externalBorder: number +! URxvt*internalBorder: number +! URxvt*borderLess: boolean +! URxvt*lineSpace: number +URxvt*letterSpace: -1 +! URxvt*skipBuiltinGlyphs: boolean +! URxvt*pointerBlankDelay: number +! URxvt*backspacekey: string +! URxvt*deletekey: string +! URxvt*print-pipe: string +! URxvt*modifier: modifier +! URxvt*cutchars: string +URxvt*cutchars: │|`"'&()*,;<=>?@[]^{} +! URxvt*answerbackString: string +! URxvt*secondaryScreen: boolean +! URxvt*secondaryScroll: boolean +! URxvt*perl-lib: string +! URxvt*perl-eval: perl-eval +URxvt*perl-ext-common: default,matcher,bell-command,selection +! URxvt*perl-ext: string +URxvt*iso14755: false +! URxvt*iso14755_52: boolean +! URxvt*xrm: string +! URxvt*keysym.sym: keysym +! URxvt*background.border: boolean +! URxvt*background.expr: string +! URxvt*background.interval: seconds +! URxvt*bell-command: string +URxvt*matcher.button: C-1 +! URxvt*matcher.launcher: string +! URxvt*matcher.launcher.*: string +! URxvt*matcher.pattern.*: string +! URxvt*matcher.rend.*: string +! URxvt*remote-clipboard.fetch: string +! URxvt*remote-clipboard.store: string +! URxvt*searchable-scrollback: string +! URxvt*selection-autotransform.*: string +! URxvt*selection-pastebin.cmd: string +! URxvt*selection-pastebin.url: string +!URxvt*selection.pattern-0: \\|([^|]+)\\| +! URxvt*tab-bg: colour +! URxvt*tab-fg: colour +! URxvt*tabbar-bg: colour +! URxvt*tabbar-fg: colour +URxvt*url-launcher: /usr/bin/xdg-open + + +! https://bastian.rieck.ru/blog/posts/2013/making_urxvt_beautiful/ + *color0: #2E3436 + *color1: #CC0000 + *color2: #4E9A06 + *color3: #C4A000 + *color4: #3465A4 + *color5: #75507B + *color6: #06989A + *color7: #D3D7CF + *color8: #555753 + *color9: #EF2929 + *color10: #8AE234 + *color11: #FCE94F + *color12: #729FCF + *color13: #AD7FA8 + *color14: #34E2E3 + *color15: #EEEEEC + +URxvt.keysym.Shift-Control-V: eval:paste_clipboard +URxvt.keysym.Shift-Control-C: eval:selection_to_clipboard + +!! Control + arrow key navigation +URxvt.keysym.Control-Up: \033[1;5A +URxvt.keysym.Control-Down: \033[1;5B +URxvt.keysym.Control-Left: \033[1;5D +URxvt.keysym.Control-Right: \033[1;5C + +!! Shift + page up/down +URxvt.keysym.Shift-Up: command:\033]720;1\007 +URxvt.keysym.Shift-Down: command:\033]721;1\007 + +URxvt.keysym.Home: \033[1~ +URxvt.keysym.End: \033[4~ +URxvt.keysym.KP_Home: \033[1~ +URxvt.keysym.KP_End: \033[4~ + diff --git a/roles/workstation_xdesktop/files/Xresources b/roles/workstation_xdesktop/files/Xresources new file mode 100644 index 0000000..656d378 --- /dev/null +++ b/roles/workstation_xdesktop/files/Xresources @@ -0,0 +1,3 @@ +Xterm*background: BLACK +Xterm*foreground: GREEN + diff --git a/roles/workstation_xdesktop/files/awesome.rc.lua b/roles/workstation_xdesktop/files/awesome.rc.lua new file mode 100644 index 0000000..22056f5 --- /dev/null +++ b/roles/workstation_xdesktop/files/awesome.rc.lua @@ -0,0 +1,608 @@ +-- Standard awesome library +local gears = require("gears") +local awful = require("awful") +require("awful.autofocus") +-- Widget and layout library +local wibox = require("wibox") +-- Theme handling library +local beautiful = require("beautiful") +-- Notification library +local naughty = require("naughty") +local menubar = require("menubar") +local hotkeys_popup = require("awful.hotkeys_popup").widget +-- Enable hotkeys help widget for VIM and other apps +-- when client with a matching name is opened: +require("awful.hotkeys_popup.keys") +beautiful.tooltip_fg = beautiful.fg_normal +beautiful.tooltip_bg = beautiful.bg_normal + +-- beautiful.wallpaper = "" + +-- gears.wallpaper.set("#dd3333") + +-- theme.wallpaper = "" + +local net_widgets = require("net_widgets") +local net_wireless = net_widgets.wireless({interface="wlp3s0", font="monospace", onclick = "sudo wpa_gui"}) +local net_internet = net_widgets.internet({indent = 0, timeout = 5, font="monospace", showconnected=true}) +local net_wired = net_widgets.indicator({ + interfaces = {"enp0s25"}, + timeout = 5, + font = "monospace", + onclick = "urxvt" +}) + +local battery_widget = require("battery-widget.battery-widget") +local cpu_widget = require("awesome-wm-widgets.cpu-widget.cpu-widget") +local brightness_widget = require("awesome-wm-widgets.brightness-widget.brightness") +local volume_widget = require("awesome-wm-widgets.volume-widget.volume") +local ram_widget = require("awesome-wm-widgets.ram-widget.ram-widget") + + +local BAT0 = battery_widget { adapter = "BAT0" } +local BAT1 = battery_widget { adapter = "BAT1" } + +-- {{{ Error handling +-- Check if awesome encountered an error during startup and fell back to +-- another config (This code will only ever execute for the fallback config) +if awesome.startup_errors then + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, there were errors during startup!", + text = awesome.startup_errors }) +end + +-- Handle runtime errors after startup +do + local in_error = false + awesome.connect_signal("debug::error", function (err) + -- Make sure we don't go into an endless error loop + if in_error then return end + in_error = true + + naughty.notify({ preset = naughty.config.presets.critical, + title = "Oops, an error happened!", + text = tostring(err) }) + in_error = false + end) +end +-- }}} + +-- {{{ Variable definitions +-- Themes define colours, icons, font and wallpapers. +beautiful.init(gears.filesystem.get_themes_dir() .. "default/theme.lua") + +-- This is used later as the default terminal and editor to run. +terminal = "urxvt" +editor = os.getenv("EDITOR") or "vim" +editor_cmd = terminal .. " -e " .. editor + +-- Default modkey. +-- Usually, Mod4 is the key with a logo between Control and Alt. +-- If you do not like this or do not have such a key, +-- I suggest you to remap Mod4 to another key using xmodmap or other tools. +-- However, you can use another modifier like Mod1, but it may interact with others. +modkey = "Mod4" + +-- Table of layouts to cover with awful.layout.inc, order matters. +awful.layout.layouts = { + awful.layout.suit.floating, + awful.layout.suit.tile, +-- awful.layout.suit.tile.left, + awful.layout.suit.tile.bottom, +-- awful.layout.suit.tile.top, + awful.layout.suit.fair, + awful.layout.suit.fair.horizontal, +-- awful.layout.suit.spiral, +-- awful.layout.suit.spiral.dwindle, + awful.layout.suit.max, + awful.layout.suit.max.fullscreen, + awful.layout.suit.magnifier, +-- awful.layout.suit.corner.nw, + -- awful.layout.suit.corner.ne, + -- awful.layout.suit.corner.sw, + -- awful.layout.suit.corner.se, +} +-- }}} + +-- {{{ Helper functions +local function client_menu_toggle_fn() + local instance = nil + + return function () + if instance and instance.wibox.visible then + instance:hide() + instance = nil + else + instance = awful.menu.clients({ theme = { width = 250 } }) + end + end +end +-- }}} + +-- {{{ Menu +-- Create a launcher widget and a main menu +myawesomemenu = { + { "hotkeys", function() return false, hotkeys_popup.show_help end}, + { "manual", terminal .. " -e man awesome" }, + { "edit config", editor_cmd .. " " .. awesome.conffile }, + { "restart", awesome.restart }, + { "quit", function() awesome.quit() end}, + { "reboot", "sudo reboot" }, + { "shutdown", "sudo shutdown -h now" } +} + +-- app_folders = { "/usr/share/applications/", "~/.local/share/applications/" } + +mymainmenu = awful.menu({ items = { { "awesome", myawesomemenu, beautiful.awesome_icon }, + { "open terminal", terminal } + } + }) + +mylauncher = awful.widget.launcher({ image = beautiful.awesome_icon, + menu = mymainmenu }) + +-- Menubar configuration +menubar.utils.terminal = terminal -- Set the terminal for applications that require it +-- }}} + +-- Keyboard map indicator and switcher +mykeyboardlayout = awful.widget.keyboardlayout() + +-- {{{ Wibar +-- Create a textclock widget +mytextclock = wibox.widget.textclock() + +-- Create a wibox for each screen and add it +local taglist_buttons = gears.table.join( + awful.button({ }, 1, function(t) t:view_only() end), + awful.button({ modkey }, 1, function(t) + if client.focus then + client.focus:move_to_tag(t) + end + end), + awful.button({ }, 3, awful.tag.viewtoggle), + awful.button({ modkey }, 3, function(t) + if client.focus then + client.focus:toggle_tag(t) + end + end), + awful.button({ }, 4, function(t) awful.tag.viewnext(t.screen) end), + awful.button({ }, 5, function(t) awful.tag.viewprev(t.screen) end) + ) + +local tasklist_buttons = gears.table.join( + awful.button({ }, 1, function (c) + if c == client.focus then + c.minimized = true + else + -- Without this, the following + -- :isvisible() makes no sense + c.minimized = false + if not c:isvisible() and c.first_tag then + c.first_tag:view_only() + end + -- This will also un-minimize + -- the client, if needed + client.focus = c + c:raise() + end + end), + awful.button({ }, 3, client_menu_toggle_fn()), + awful.button({ }, 4, function () + awful.client.focus.byidx(1) + end), + awful.button({ }, 5, function () + awful.client.focus.byidx(-1) + end)) + +local function set_wallpaper(s) + -- Wallpaper + if beautiful.wallpaper then + local wallpaper = beautiful.wallpaper + -- If wallpaper is a function, call it with the screen + if type(wallpaper) == "function" then + wallpaper = wallpaper(s) + end + gears.wallpaper.maximized(wallpaper, s, true) + end +end + +-- Re-set wallpaper when a screen's geometry changes (e.g. different resolution) +screen.connect_signal("property::geometry", set_wallpaper) + +awful.screen.connect_for_each_screen(function(s) + -- Wallpaper + set_wallpaper(s) + + -- Each screen has its own tag table. + awful.tag({ "1", "2", "3", "4", "5", "6", "7", "8", "9" }, s, awful.layout.layouts[1]) + + -- Create a promptbox for each screen + s.mypromptbox = awful.widget.prompt() + -- Create an imagebox widget which will contain an icon indicating which layout we're using. + -- We need one layoutbox per screen. + s.mylayoutbox = awful.widget.layoutbox(s) + s.mylayoutbox:buttons(gears.table.join( + awful.button({ }, 1, function () awful.layout.inc( 1) end), + awful.button({ }, 3, function () awful.layout.inc(-1) end), + awful.button({ }, 4, function () awful.layout.inc( 1) end), + awful.button({ }, 5, function () awful.layout.inc(-1) end))) + -- Create a taglist widget + s.mytaglist = awful.widget.taglist(s, awful.widget.taglist.filter.all, taglist_buttons) + + -- Create a tasklist widget + s.mytasklist = awful.widget.tasklist(s, awful.widget.tasklist.filter.currenttags, tasklist_buttons) + + -- Create the wibox + s.mywibox = awful.wibar({ position = "top", screen = s }) + + -- Add widgets to the wibox + s.mywibox:setup { + layout = wibox.layout.align.horizontal, + { -- Left widgets + layout = wibox.layout.fixed.horizontal, + mylauncher, + s.mytaglist, + s.mypromptbox, + }, + s.mytasklist, -- Middle widget + { -- Right widgets + layout = wibox.layout.fixed.horizontal, + wibox.widget.systray(), + cpu_widget, + ram_widget, + volume_widget, + brightness_widget, + BAT0, + BAT1, + --net_wireless, + --net_wired, + net_internet, + mytextclock, + s.mylayoutbox, + }, + } +end) +-- }}} + +-- {{{ Mouse bindings +root.buttons(gears.table.join( + awful.button({ }, 3, function () mymainmenu:toggle() end), + awful.button({ }, 4, awful.tag.viewnext), + awful.button({ }, 5, awful.tag.viewprev) +)) +-- }}} + +-- {{{ Key bindings +globalkeys = gears.table.join( + awful.key({ modkey, }, "s", hotkeys_popup.show_help, + {description="show help", group="awesome"}), + awful.key({ modkey, }, "Left", awful.tag.viewprev, + {description = "view previous", group = "tag"}), + awful.key({ modkey, }, "Right", awful.tag.viewnext, + {description = "view next", group = "tag"}), + awful.key({ modkey, }, "Escape", awful.tag.history.restore, + {description = "go back", group = "tag"}), + awful.key({ }, "XF86MonBrightnessUp", function () awful.spawn("xbacklight +3") end, {description = "increase brightness", group = "custom"}), + awful.key({ }, "XF86MonBrightnessDown", function () awful.spawn("xbacklight -3") end, {description = "decrease brightness", group = "custom"}), + awful.key({ }, "XF86AudioLowerVolume", function () awful.spawn("amixer -c 1 sset Master 5%-") end, {description = "increase volume", group = "custom"}), + awful.key({ }, "XF86AudioRaiseVolume", function () awful.spawn("amixer -c 1 sset Master 5%+") end, {description = "decrease volume", group = "custom"}), + awful.key({ }, "XF86AudioMute", function () awful.spawn("amixer -c 1 set Master +1 toggle") end, {description = "mute volume", group = "custom"}), + awful.key({ }, "Print", function () awful.util.spawn("scrot -e 'mv $f ~/screenshots/ 2>/dev/null'", false) end), + --awful.key({ modkey, "Shift"}, "&", function () awful.util.spawn("xscreensaver-command -lock") end), + awful.key({ modkey, }, "l", function () awful.util.spawn("xscreensaver-command -lock") end), + awful.key({ modkey, }, "j", + function () + awful.client.focus.byidx( 1) + end, + {description = "focus next by index", group = "client"} + ), + awful.key({ modkey, }, "k", + function () + awful.client.focus.byidx(-1) + end, + {description = "focus previous by index", group = "client"} + ), + awful.key({ modkey, }, "w", function () mymainmenu:show() end, + {description = "show main menu", group = "awesome"}), + + -- Layout manipulation + awful.key({ modkey, "Shift" }, "j", function () awful.client.swap.byidx( 1) end, + {description = "swap with next client by index", group = "client"}), + awful.key({ modkey, "Shift" }, "k", function () awful.client.swap.byidx( -1) end, + {description = "swap with previous client by index", group = "client"}), + awful.key({ modkey, "Control" }, "j", function () awful.screen.focus_relative( 1) end, + {description = "focus the next screen", group = "screen"}), + awful.key({ modkey, "Control" }, "k", function () awful.screen.focus_relative(-1) end, + {description = "focus the previous screen", group = "screen"}), + awful.key({ modkey, }, "u", awful.client.urgent.jumpto, + {description = "jump to urgent client", group = "client"}), + awful.key({ modkey, }, "Tab", + function () + awful.client.focus.history.previous() + if client.focus then + client.focus:raise() + end + end, + {description = "go back", group = "client"}), + + -- Standard program + awful.key({ modkey, }, "Return", function () awful.spawn(terminal) end, + {description = "open a terminal", group = "launcher"}), + awful.key({ modkey, "Control" }, "r", awesome.restart, + {description = "reload awesome", group = "awesome"}), + awful.key({ modkey, "Shift" }, "q", awesome.quit, + {description = "quit awesome", group = "awesome"}), + +-- awful.key({ modkey, }, "l", function () awful.tag.incmwfact( 0.05) end, + -- {description = "increase master width factor", group = "layout"}), + awful.key({ modkey, }, "h", function () awful.tag.incmwfact(-0.05) end, + {description = "decrease master width factor", group = "layout"}), + awful.key({ modkey, "Shift" }, "h", function () awful.tag.incnmaster( 1, nil, true) end, + {description = "increase the number of master clients", group = "layout"}), + awful.key({ modkey, "Shift" }, "l", function () awful.tag.incnmaster(-1, nil, true) end, + {description = "decrease the number of master clients", group = "layout"}), + awful.key({ modkey, "Control" }, "h", function () awful.tag.incncol( 1, nil, true) end, + {description = "increase the number of columns", group = "layout"}), + awful.key({ modkey, "Control" }, "l", function () awful.tag.incncol(-1, nil, true) end, + {description = "decrease the number of columns", group = "layout"}), + awful.key({ modkey, }, "space", function () awful.layout.inc( 1) end, + {description = "select next", group = "layout"}), + awful.key({ modkey, "Shift" }, "space", function () awful.layout.inc(-1) end, + {description = "select previous", group = "layout"}), + + awful.key({ modkey, "Control" }, "n", + function () + local c = awful.client.restore() + -- Focus restored client + if c then + client.focus = c + c:raise() + end + end, + {description = "restore minimized", group = "client"}), + + -- Prompt + awful.key({ modkey }, "r", function () awful.screen.focused().mypromptbox:run() end, + {description = "run prompt", group = "launcher"}), + + awful.key({ modkey }, "x", + function () + awful.prompt.run { + prompt = "Run Lua code: ", + textbox = awful.screen.focused().mypromptbox.widget, + exe_callback = awful.util.eval, + history_path = awful.util.get_cache_dir() .. "/history_eval" + } + end, + {description = "lua execute prompt", group = "awesome"}), + -- Menubar + awful.key({ modkey }, "p", function() menubar.show() end, + {description = "show the menubar", group = "launcher"}) +) + +clientkeys = gears.table.join( + awful.key({ modkey, }, "f", + function (c) + c.fullscreen = not c.fullscreen + c:raise() + end, + {description = "toggle fullscreen", group = "client"}), + awful.key({ modkey, "Shift" }, "c", function (c) c:kill() end, + {description = "close", group = "client"}), + awful.key({ modkey, "Control" }, "space", awful.client.floating.toggle , + {description = "toggle floating", group = "client"}), + awful.key({ modkey, "Control" }, "Return", function (c) c:swap(awful.client.getmaster()) end, + {description = "move to master", group = "client"}), + awful.key({ modkey, }, "o", function (c) c:move_to_screen() end, + {description = "move to screen", group = "client"}), + awful.key({ modkey, }, "t", function (c) c.ontop = not c.ontop end, + {description = "toggle keep on top", group = "client"}), + awful.key({ modkey, }, "n", + function (c) + -- The client currently has the input focus, so it cannot be + -- minimized, since minimized clients can't have the focus. + c.minimized = true + end , + {description = "minimize", group = "client"}), + awful.key({ modkey, }, "m", + function (c) + c.maximized = not c.maximized + c:raise() + end , + {description = "(un)maximize", group = "client"}), + awful.key({ modkey, "Control" }, "m", + function (c) + c.maximized_vertical = not c.maximized_vertical + c:raise() + end , + {description = "(un)maximize vertically", group = "client"}), + awful.key({ modkey, "Shift" }, "m", + function (c) + c.maximized_horizontal = not c.maximized_horizontal + c:raise() + end , + {description = "(un)maximize horizontally", group = "client"}) +) + +-- Bind all key numbers to tags. +-- Be careful: we use keycodes to make it work on any keyboard layout. +-- This should map on the top row of your keyboard, usually 1 to 9. +for i = 1, 9 do + globalkeys = gears.table.join(globalkeys, + -- View tag only. + awful.key({ modkey }, "#" .. i + 9, + function () + local screen = awful.screen.focused() + local tag = screen.tags[i] + if tag then + tag:view_only() + end + end, + {description = "view tag #"..i, group = "tag"}), + -- Toggle tag display. + awful.key({ modkey, "Control" }, "#" .. i + 9, + function () + local screen = awful.screen.focused() + local tag = screen.tags[i] + if tag then + awful.tag.viewtoggle(tag) + end + end, + {description = "toggle tag #" .. i, group = "tag"}), + -- Move client to tag. + awful.key({ modkey, "Shift" }, "#" .. i + 9, + function () + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:move_to_tag(tag) + end + end + end, + {description = "move focused client to tag #"..i, group = "tag"}), + -- Toggle tag on focused client. + awful.key({ modkey, "Control", "Shift" }, "#" .. i + 9, + function () + if client.focus then + local tag = client.focus.screen.tags[i] + if tag then + client.focus:toggle_tag(tag) + end + end + end, + {description = "toggle focused client on tag #" .. i, group = "tag"}) + ) +end + +clientbuttons = gears.table.join( + awful.button({ }, 1, function (c) client.focus = c; c:raise() end), + awful.button({ modkey }, 1, awful.mouse.client.move), + awful.button({ modkey }, 3, awful.mouse.client.resize)) + +-- Set keys +root.keys(globalkeys) +-- }}} + +-- {{{ Rules +-- Rules to apply to new clients (through the "manage" signal). +awful.rules.rules = { + -- All clients will match this rule. + { rule = { }, + properties = { border_width = beautiful.border_width, + border_color = beautiful.border_normal, + focus = awful.client.focus.filter, + raise = true, + keys = clientkeys, + buttons = clientbuttons, + screen = awful.screen.preferred, + placement = awful.placement.no_overlap+awful.placement.no_offscreen, + size_hints_honor = false + } + }, + + -- Floating clients. + { rule_any = { + instance = { + "DTA", -- Firefox addon DownThemAll. + "copyq", -- Includes session name in class. + }, + class = { + "Arandr", + "Gpick", + "Kruler", + "MessageWin", -- kalarm. + "Sxiv", + "Wpa_gui", + "pinentry", + "veromix", + "xtightvncviewer"}, + + name = { + "Event Tester", -- xev. + }, + role = { + "AlarmWindow", -- Thunderbird's calendar. + "pop-up", -- e.g. Google Chrome's (detached) Developer Tools. + } + }, properties = { floating = true }}, + + -- Add titlebars to normal clients and dialogs + { rule_any = {type = { "normal", "dialog" } + }, properties = { titlebars_enabled = true } + }, + + -- Set Firefox to always map on the tag named "2" on screen 1. + -- { rule = { class = "Firefox" }, + -- properties = { screen = 1, tag = "2" } }, +} +-- }}} + +-- {{{ Signals +-- Signal function to execute when a new client appears. +client.connect_signal("manage", function (c) + -- Set the windows at the slave, + -- i.e. put it at the end of others instead of setting it master. + -- if not awesome.startup then awful.client.setslave(c) end + + if awesome.startup and + not c.size_hints.user_position + and not c.size_hints.program_position then + -- Prevent clients from being unreachable after screen count changes. + awful.placement.no_offscreen(c) + end +end) + +-- Add a titlebar if titlebars_enabled is set to true in the rules. +client.connect_signal("request::titlebars", function(c) + -- buttons for the titlebar + local buttons = gears.table.join( + awful.button({ }, 1, function() + client.focus = c + c:raise() + awful.mouse.client.move(c) + end), + awful.button({ }, 3, function() + client.focus = c + c:raise() + awful.mouse.client.resize(c) + end) + ) + + awful.titlebar(c) : setup { + { -- Left + awful.titlebar.widget.iconwidget(c), + buttons = buttons, + layout = wibox.layout.fixed.horizontal + }, + { -- Middle + { -- Title + align = "center", + widget = awful.titlebar.widget.titlewidget(c) + }, + buttons = buttons, + layout = wibox.layout.flex.horizontal + }, + { -- Right + awful.titlebar.widget.floatingbutton (c), + awful.titlebar.widget.maximizedbutton(c), + awful.titlebar.widget.stickybutton (c), + awful.titlebar.widget.ontopbutton (c), + awful.titlebar.widget.closebutton (c), + layout = wibox.layout.fixed.horizontal() + }, + layout = wibox.layout.align.horizontal + } +end) + +-- Enable sloppy focus, so that focus follows mouse. +client.connect_signal("mouse::enter", function(c) + if awful.layout.get(c.screen) ~= awful.layout.suit.magnifier + and awful.client.focus.filter(c) then + client.focus = c + end +end) + +client.connect_signal("focus", function(c) c.border_color = beautiful.border_focus end) +client.connect_signal("unfocus", function(c) c.border_color = beautiful.border_normal end) +-- }}} diff --git a/roles/workstation_xdesktop/files/xinitrc b/roles/workstation_xdesktop/files/xinitrc new file mode 100644 index 0000000..1f705f4 --- /dev/null +++ b/roles/workstation_xdesktop/files/xinitrc @@ -0,0 +1,4 @@ +xrdb .Xdefaults +xbacklight -set 30 +xscreensaver -no-splash & +exec awesome -c ~/.config/awesome/rc.lua 2>> ~/.xsession-errors diff --git a/roles/workstation_xdesktop/files/xscreensaver b/roles/workstation_xdesktop/files/xscreensaver new file mode 100644 index 0000000..52d76d5 --- /dev/null +++ b/roles/workstation_xdesktop/files/xscreensaver @@ -0,0 +1,293 @@ +# XScreenSaver Preferences File +# Written by xscreensaver-demo 5.43 for john on Tue May 5 07:39:02 2020. +# https://www.jwz.org/xscreensaver/ + +timeout: 0:30:00 +cycle: 0:30:00 +lock: True +lockTimeout: 1:00:00 +passwdTimeout: 0:00:30 +visualID: default +installColormap: True +verbose: False +timestamp: True +splash: True +splashDuration: 0:00:05 +demoCommand: xscreensaver-demo +prefsCommand: xscreensaver-demo -prefs +nice: 10 +memoryLimit: 0 +fade: True +unfade: False +fadeSeconds: 0:00:03 +fadeTicks: 20 +captureStderr: True +ignoreUninstalledPrograms:False +font: *-medium-r-*-140-*-m-* +dpmsEnabled: True +dpmsQuickOff: False +dpmsStandby: 2:00:00 +dpmsSuspend: 2:00:00 +dpmsOff: 4:00:00 +grabDesktopImages: False +grabVideoFrames: False +chooseRandomImages: False +imageDirectory: + +mode: blank +selected: 224 + +textMode: date +textLiteral: XScreenSaver +textFile: /etc/gentoo-release +textProgram: fortune +textURL: https://planet.gentoo.org/rss20.xml + +programs: \ + maze -root \n\ + GL: superquadrics -root \n\ + attraction -root \n\ + blitspin -root \n\ + greynetic -root \n\ + helix -root \n\ + hopalong -root \n\ + imsmap -root \n\ +- noseguy -root \n\ +- pyro -root \n\ + qix -root \n\ +- rocks -root \n\ + rorschach -root \n\ + decayscreen -root \n\ + flame -root \n\ + halo -root \n\ + slidescreen -root \n\ + pedal -root \n\ + bouboule -root \n\ +- braid -root \n\ + coral -root \n\ + deco -root \n\ + drift -root \n\ +- fadeplot -root \n\ + galaxy -root \n\ + goop -root \n\ + grav -root \n\ + ifs -root \n\ + GL: jigsaw -root \n\ + julia -root \n\ +- kaleidescope -root \n\ + GL: moebius -root \n\ + moire -root \n\ + GL: morph3d -root \n\ + mountain -root \n\ + munch -root \n\ + penrose -root \n\ + GL: pipes -root \n\ + rd-bomb -root \n\ + GL: rubik -root \n\ +- sierpinski -root \n\ + slip -root \n\ + GL: sproingies -root \n\ + starfish -root \n\ + strange -root \n\ + swirl -root \n\ + triangle -root \n\ + xjack -root \n\ + xlyap -root \n\ + GL: atlantis -root \n\ + bsod -root \n\ + GL: bubble3d -root \n\ + GL: cage -root \n\ +- crystal -root \n\ + cynosure -root \n\ + discrete -root \n\ + distort -root \n\ + epicycle -root \n\ + flow -root \n\ + GL: glplanet -root \n\ + interference -root \n\ + kumppa -root \n\ + GL: lament -root \n\ + moire2 -root \n\ + GL: sonar -root \n\ + GL: stairs -root \n\ + truchet -root \n\ +- vidwhacker -root \n\ + blaster -root \n\ + bumps -root \n\ + ccurve -root \n\ + compass -root \n\ + deluxe -root \n\ +- demon -root \n\ +- GL: extrusion -root \n\ +- loop -root \n\ + penetrate -root \n\ + petri -root \n\ + phosphor -root \n\ + GL: pulsar -root \n\ + ripples -root \n\ + shadebobs -root \n\ + GL: sierpinski3d -root \n\ + spotlight -root \n\ + squiral -root \n\ + wander -root \n\ +- webcollage -root \n\ + xflame -root \n\ + xmatrix -root \n\ + GL: gflux -root \n\ +- nerverot -root \n\ + xrayswarm -root \n\ + xspirograph -root \n\ + GL: circuit -root \n\ + GL: dangerball -root \n\ +- GL: dnalogo -root \n\ + GL: engine -root \n\ + GL: flipscreen3d -root \n\ + GL: gltext -root \n\ + GL: menger -root \n\ + GL: molecule -root \n\ + rotzoomer -root \n\ + speedmine -root \n\ + GL: starwars -root \n\ + GL: stonerview -root \n\ + vermiculate -root \n\ + whirlwindwarp -root \n\ + zoom -root \n\ + anemone -root \n\ + apollonian -root \n\ + GL: boxed -root \n\ + GL: cubenetic -root \n\ + GL: endgame -root \n\ + euler2d -root \n\ + fluidballs -root \n\ + GL: flurry -root \n\ +- GL: glblur -root \n\ + GL: glsnake -root \n\ + halftone -root \n\ + GL: juggler3d -root \n\ + GL: lavalite -root \n\ +- polyominoes -root \n\ + GL: queens -root \n\ +- GL: sballs -root \n\ + GL: spheremonics -root \n\ +- thornbird -root \n\ + twang -root \n\ +- GL: antspotlight -root \n\ + apple2 -root \n\ + GL: atunnel -root \n\ + barcode -root \n\ + GL: blinkbox -root \n\ + GL: blocktube -root \n\ + GL: bouncingcow -root \n\ + cloudlife -root \n\ + GL: cubestorm -root \n\ + eruption -root \n\ + GL: flipflop -root \n\ + GL: flyingtoasters -root \n\ + fontglide -root \n\ + GL: gleidescope -root \n\ + GL: glknots -root \n\ + GL: glmatrix -root \n\ +- GL: glslideshow -root \n\ + GL: hypertorus -root \n\ +- GL: jigglypuff -root \n\ + metaballs -root \n\ + GL: mirrorblob -root \n\ + piecewise -root \n\ + GL: polytopes -root \n\ + pong -root \n\ + popsquares -root \n\ + GL: surfaces -root \n\ + xanalogtv -root \n\ + abstractile -root \n\ + anemotaxis -root \n\ +- GL: antinspect -root \n\ + fireworkx -root \n\ + fuzzyflakes -root \n\ + interaggregate -root \n\ + intermomentary -root \n\ + memscroller -root \n\ + GL: noof -root \n\ + pacman -root \n\ + GL: pinion -root \n\ + GL: polyhedra -root \n\ +- GL: providence -root \n\ + substrate -root \n\ + wormhole -root \n\ +- GL: antmaze -root \n\ + GL: boing -root \n\ + boxfit -root \n\ + GL: carousel -root \n\ + celtic -root \n\ + GL: crackberg -root \n\ + GL: cube21 -root \n\ + fiberlamp -root \n\ + GL: fliptext -root \n\ + GL: glhanoi -root \n\ + GL: tangram -root \n\ + GL: timetunnel -root \n\ + GL: glschool -root \n\ + GL: topblock -root \n\ + GL: cubicgrid -root \n\ + cwaves -root \n\ + GL: gears -root \n\ + GL: glcells -root \n\ + GL: lockward -root \n\ + m6502 -root \n\ + GL: moebiusgears -root \n\ + GL: voronoi -root \n\ + GL: hypnowheel -root \n\ + GL: klein -root \n\ +- lcdscrub -root \n\ + GL: photopile -root \n\ + GL: skytentacles -root \n\ + GL: rubikblocks -root \n\ + GL: companioncube -root \n\ + GL: hilbert -root \n\ + GL: tronbit -root \n\ + GL: geodesic -root \n\ + hexadrop -root \n\ + GL: kaleidocycle -root \n\ + GL: quasicrystal -root \n\ + GL: unknownpleasures -root \n\ + binaryring -root \n\ + GL: cityflow -root \n\ + GL: geodesicgears -root \n\ + GL: projectiveplane -root \n\ + GL: romanboy -root \n\ + tessellimage -root \n\ + GL: winduprobot -root \n\ + GL: splitflap -root \n\ + GL: cubestack -root \n\ + GL: cubetwist -root \n\ + GL: discoball -root \n\ + GL: dymaxionmap -root \n\ + GL: energystream -root \n\ + GL: hexstrut -root \n\ + GL: hydrostat -root \n\ + GL: raverhoop -root \n\ + GL: splodesic -root \n\ + GL: unicrud -root \n\ + GL: esper -root \n\ + GL: vigilance -root \n\ + GL: crumbler -root \n\ + filmleader -root \n\ + glitchpeg -root \n\ + GL: handsy -root \n\ + GL: maze3d -root \n\ + GL: peepers -root \n\ + GL: razzledazzle -root \n\ + vfeedback -root \n\ + GL: deepstars -root \n\ + GL: gravitywell -root \n\ + + +pointerPollTime: 0:00:05 +pointerHysteresis: 10 +windowCreationTimeout:0:00:30 +initialDelay: 0:00:00 +GetViewPortIsFullOfLies:False +procInterrupts: True +xinputExtensionDev: False +overlayStderr: True +authWarningSlack: 20 + diff --git a/roles/workstation_xdesktop/meta/main.yml b/roles/workstation_xdesktop/meta/main.yml new file mode 100644 index 0000000..85baa92 --- /dev/null +++ b/roles/workstation_xdesktop/meta/main.yml @@ -0,0 +1,22 @@ +galaxy_info: + author: nemo + description: Configure X environment on a GNU/Linux workstation. + company: Wirebrass + + license: license (BSD) + + min_ansible_version: 2.4 + + platforms: + - name: Gentoo + versions: + - all + + galaxy_tags: + - awesome + - xorg + - startx + - desktop + - windows manager + +dependencies: [] diff --git a/roles/workstation_xdesktop/tasks/main.yml b/roles/workstation_xdesktop/tasks/main.yml new file mode 100644 index 0000000..4025872 --- /dev/null +++ b/roles/workstation_xdesktop/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- import_tasks: package.yml +- import_tasks: xdesktop.yml diff --git a/roles/workstation_xdesktop/tasks/package.yml b/roles/workstation_xdesktop/tasks/package.yml new file mode 100644 index 0000000..792cd0e --- /dev/null +++ b/roles/workstation_xdesktop/tasks/package.yml @@ -0,0 +1,5 @@ +--- +- name: X environment package (awesome, Xorg, Xscreensaver, Xrb, ...) + package: + name: "{{ workstation_xdesktop_packages }}" + state: present diff --git a/roles/workstation_xdesktop/tasks/xdesktop.yml b/roles/workstation_xdesktop/tasks/xdesktop.yml new file mode 100644 index 0000000..d0d145e --- /dev/null +++ b/roles/workstation_xdesktop/tasks/xdesktop.yml @@ -0,0 +1,58 @@ +--- +- name: Home x files deployed + copy: + src: "{{ item }}" + dest: "{{ workstation_xdesktop_home }}/.{{ item }}" + owner: "{{ workstation_xdesktop_user }}" + group: "{{ workstation_xdesktop_group }}" + mode: 0640 + loop: + - Xdefaults + - xinitrc + - Xresources + - xscreensaver + +- name: Awesome rc.lua configured + copy: + src: awesome.rc.lua + dest: "{{ workstation_xdesktop_home }}/.config/awesome/rc.lua" + owner: "{{ workstation_xdesktop_user }}" + group: "{{ workstation_xdesktop_group }}" + mode: 0640 + +- name: Check if awesome-wm-widgets alreay exists + stat: + path: "{{ workstation_xdesktop_home }}/.config/awesome/awesome-wm-widgets" + register: awesome_wm_widgets_directory + +- name: awesome-wm-widgets GIT repository cloned + git: + repo: https://github.com/streetturtle/awesome-wm-widgets.git + dest: "{{ workstation_xdesktop_home }}/.config/awesome/awesome-wm-widgets" + update: no + when: not awesome_wm_widgets_directory.stat.exists + +- name: Check if battery-widget alreay exists + stat: + path: "{{ workstation_xdesktop_home }}/.config/awesome/battery-widget" + register: battery_widget_directory + +- name: battery-widget GIT repository cloned + git: + repo: https://github.com/deficient/battery-widget.git + dest: "{{ workstation_xdesktop_home }}/.config/awesome/battery-widget" + update: no + when: not battery_widget_directory.stat.exists + +- name: Check if net_widgets alreay exists + stat: + path: "{{ workstation_xdesktop_home }}/.config/awesome/net_widgets" + register: net_widgets_directory + +- name: net_widgets GIT repository cloned + git: + repo: https://github.com/pltanton/net_widgets.git + dest: "{{ workstation_xdesktop_home }}/.config/awesome/net_widgets" + update: no + when: not net_widgets_directory.stat.exists + From d336d22f5d423f7609396e521634e1e6e154572c Mon Sep 17 00:00:00 2001 From: Nemo Date: Mon, 12 Oct 2020 19:05:29 +0200 Subject: [PATCH 5/5] Add configure portage --- roles/workstation_portage/README.md | 36 ++++++++++++ roles/workstation_portage/defaults/main.yml | 16 +++++ roles/workstation_portage/meta/main.yml | 19 ++++++ roles/workstation_portage/tasks/main.yml | 2 + roles/workstation_portage/tasks/portage.yml | 58 +++++++++++++++++++ .../templates/make.conf.j2 | 28 +++++++++ .../package.accept_keywords.ansible.j2 | 16 +++++ .../templates/package.license.j2 | 1 + .../templates/package.use.ansible.j2 | 31 ++++++++++ 9 files changed, 207 insertions(+) create mode 100644 roles/workstation_portage/README.md create mode 100644 roles/workstation_portage/defaults/main.yml create mode 100644 roles/workstation_portage/meta/main.yml create mode 100644 roles/workstation_portage/tasks/main.yml create mode 100644 roles/workstation_portage/tasks/portage.yml create mode 100644 roles/workstation_portage/templates/make.conf.j2 create mode 100644 roles/workstation_portage/templates/package.accept_keywords.ansible.j2 create mode 100644 roles/workstation_portage/templates/package.license.j2 create mode 100644 roles/workstation_portage/templates/package.use.ansible.j2 diff --git a/roles/workstation_portage/README.md b/roles/workstation_portage/README.md new file mode 100644 index 0000000..db12614 --- /dev/null +++ b/roles/workstation_portage/README.md @@ -0,0 +1,36 @@ +Ansible Role: workstation portage +========= + +This role configure Gentoo Portage on a GNU/Linux workstation. + +Requirements +------------ + +None. + +Role Variables +-------------- + +All variables and default values are defined in `defaults/main.yml`. + +Dependencies +------------ + +None. + +Example Playbook +---------------- + + - hosts: localhost + roles: + - workstation_portage + +License +------- + +BSD + +Author Information +------------------ + +This role was created in 2020 by Nemo. diff --git a/roles/workstation_portage/defaults/main.yml b/roles/workstation_portage/defaults/main.yml new file mode 100644 index 0000000..d6f0311 --- /dev/null +++ b/roles/workstation_portage/defaults/main.yml @@ -0,0 +1,16 @@ +--- +# defaults file for workstation_portage + +workstation_portage_cflags: "-march=native -O2 -pipe" +workstation_portage_makeopts: "-j3" +workstation_portage_portdir: "/usr/portage" +workstation_portage_distdir: "/usr/portage/distfiles" +workstation_portage_pkgdir: "/usr/portage/packages" +workstation_portage_gentoo_mirrors: + - "ftp://ftp.free.fr/mirrors/ftp.gentoo.org/" +workstation_portage_cpuflags: "aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3" +workstation_portage_use: "bash-completion aes avx avx2 f16c fma3 mmx mmxext pclmul popcnt sse sse2 sse3 sse4_1 sse4_2 ssse3 alsa jack -pulseaudio xinemara abi_riscv_ilp32 abi_riscv_ilp32d" +workstation_portage_accept_license: "*" +workstation_portage_L10N: "fr" +workstation_portage_binhost: "http://yourbinhost.example.org/packages-workstation/" +workstation_portage_niceness: "19" diff --git a/roles/workstation_portage/meta/main.yml b/roles/workstation_portage/meta/main.yml new file mode 100644 index 0000000..1baf389 --- /dev/null +++ b/roles/workstation_portage/meta/main.yml @@ -0,0 +1,19 @@ +galaxy_info: + author: nemo + description: Configure Gentoo Portage on a GNU/Linux workstation. + company: Wirebrass + + license: license (BSD) + + min_ansible_version: 2.4 + + platforms: + - name: Gentoo + versions: + - all + + galaxy_tags: + - mutt + - mail + +dependencies: [] diff --git a/roles/workstation_portage/tasks/main.yml b/roles/workstation_portage/tasks/main.yml new file mode 100644 index 0000000..742229d --- /dev/null +++ b/roles/workstation_portage/tasks/main.yml @@ -0,0 +1,2 @@ +--- +- import_tasks: portage.yml diff --git a/roles/workstation_portage/tasks/portage.yml b/roles/workstation_portage/tasks/portage.yml new file mode 100644 index 0000000..f51febf --- /dev/null +++ b/roles/workstation_portage/tasks/portage.yml @@ -0,0 +1,58 @@ +--- +- name: Portage profile defined + file: + src: "../../usr/portage/profiles/default/linux/amd64/17.1/desktop" + dest: "/etc/portage/make.profile" + owner: root + group: root + state: link + +- name: Portage make.conf file configured + template: + src: make.conf.j2 + dest: /etc/portage/make.conf + owner: root + group: root + mode: 0644 + +- name: Portage USE flags folder configured + file: + src: package.use.ansible.j2 + dest: /etc/portage/package.use + owner: root + group: root + mode: 0755 + state: directory + +- name: Portage USE flags configured + template: + src: package.use.ansible.j2 + dest: /etc/portage/package.use/ansible + owner: root + group: root + mode: 0644 + +- name: Portage ACCEPT_KEYWORDS flags folder configured + file: + src: package.use.ansible.j2 + dest: /etc/portage/package.accept_keywords + owner: root + group: root + mode: 0755 + state: directory + +- name: Portage ACCEPT_KEYWORDS flags configured + template: + src: package.accept_keywords.ansible.j2 + dest: /etc/portage/package.accept_keywords/ansible + owner: root + group: root + mode: 0644 + +- name: Portage LICENSE configured + template: + src: package.license.j2 + dest: /etc/portage/package.license + owner: root + group: root + mode: 0644 diff --git a/roles/workstation_portage/templates/make.conf.j2 b/roles/workstation_portage/templates/make.conf.j2 new file mode 100644 index 0000000..6d4b8e5 --- /dev/null +++ b/roles/workstation_portage/templates/make.conf.j2 @@ -0,0 +1,28 @@ +CFLAGS="{{ workstation_portage_cflags }}" +CXXFLAGS="${CFLAGS}" +MAKEOPTS="{{ workstation_portage_makeopts }}" + +PORTDIR="{{ workstation_portage_portdir }}" +DISTDIR="{{ workstation_portage_distdir }}" +PKGDIR="{{ workstation_portage_pkgdir }}" + +LC_MESSAGES=C + +GENTOO_MIRRORS=" +{% for workstation_portage_gentoo_mirror in workstation_portage_gentoo_mirrors %} +{{ workstation_portage_gentoo_mirror }} +{% endfor %} +" + +CPU_FLAGS_X86="{{ workstation_portage_cpuflags }}" + +USE="{{ workstation_portage_use }}" + +source /var/lib/layman/make.conf +ACCEPT_LICENSE="{{ workstation_portage_accept_license }}" +L10N="{{ workstation_portage_L10N }}" + +FEATURES="getbinpkg" +PORTAGE_BINHOST="{{ workstation_portage_binhost }}" + +PORTAGE_NICENESS="{{ workstation_portage_niceness }}" diff --git a/roles/workstation_portage/templates/package.accept_keywords.ansible.j2 b/roles/workstation_portage/templates/package.accept_keywords.ansible.j2 new file mode 100644 index 0000000..8a42c14 --- /dev/null +++ b/roles/workstation_portage/templates/package.accept_keywords.ansible.j2 @@ -0,0 +1,16 @@ +net-nds/ApacheDirectoryStudio ~amd64 +=x11-themes/arc-theme-20190917 ~amd64 +media-sound/ardour ~adm64 +net-analyzer/arp-scan ~amd64 +x11-wm/awesome ~amd64 +app-misc/crunch ~amd64 +app-admin/haskell-updater ~amd64 +media-sound/jack ~amd64 +media-sound/mumble ~amd64 +net-wireless/reaver ~amd64 +#=net-im/skypeforlinux-8.47.0.59 ~amd64 +net-im/skypeforlinux ~amd64 +net-fs/smbnetfs ~amd64 +net-im/teams ~amd64 +net-vpn/tinc ~amd64 +virtual/wireguard ~amd64 diff --git a/roles/workstation_portage/templates/package.license.j2 b/roles/workstation_portage/templates/package.license.j2 new file mode 100644 index 0000000..d38ff9c --- /dev/null +++ b/roles/workstation_portage/templates/package.license.j2 @@ -0,0 +1 @@ +app-emulation/virtualbox-bin PUEL diff --git a/roles/workstation_portage/templates/package.use.ansible.j2 b/roles/workstation_portage/templates/package.use.ansible.j2 new file mode 100644 index 0000000..4238f35 --- /dev/null +++ b/roles/workstation_portage/templates/package.use.ansible.j2 @@ -0,0 +1,31 @@ +>=net-libs/nodejs-14.2.0 inspector +netprint/cups zeroconf +>=media-video/ffmpeg-4.2.3 chromium +www-client/firefox-bin pulseaudio +net-misc/freerdp openh264 pulseaudio +sys-apps/util-linux static-libs +net-print/gutenprint gimp +net-wireless/lorcon python +dev-lang/mono minimal +net-analyzer/mtr -gtk +mail-client/mutt berkdb gpg imap smtp pop smime sasl doc -gdbm -lmdb -qdbm -tokyocabinet +sys-libs/ncurses -gpm +media-plugins/alsa-plugins pulseaudio +dev-lang/python -bluetooth +>=dev-python/QtPy-1.9.0-r2 printsupport +dev-qt/qtmultimedia widgets +net-misc/remmina crypt cups nls rdp spice ssh vnc +app-admin/rsyslog openssl +x11-terms/rxvt-unicode 256-color xft +sys-libs/tevent python +sys-libs/tdb python +app-crypt/pinentry gnome-keyring +app-text/texlive-core cjk xetex +media-libs/gd fontconfig +app-text/texlive X png truetype xml cjk context detex dvi2tty epspdf extra games graphics humanities jadetex luatex metapost music pdfannotextractor pstricks publishers science tex4ht texi2html xetex xindy +mail-client/thunderbird-bin -alsa +sys-libs/zlib minizip +media-libs/libsdl2 haptic +x11-base/xorg-server suid +x11-terms/xterm Xaw3d xinerama +net-libs/zeromq drafts