nix: Some system options, like keyboard
This commit is contained in:
parent
e0b9bbcfba
commit
6ad06cb349
8 changed files with 103 additions and 136 deletions
|
|
@ -1,10 +0,0 @@
|
|||
***************
|
||||
*** 6,11 ****
|
||||
--- 6,12 ----
|
||||
{
|
||||
include "us(basic)"
|
||||
include "level3(ralt_switch)"
|
||||
+ include "keypad(oss)"
|
||||
|
||||
name[Group1]= "US keyboard with french symbols - AltGr combination";
|
||||
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
Section "InputClass"
|
||||
Identifier "system-keyboard"
|
||||
MatchIsKeyboard "on"
|
||||
Option "XkbLayout" "us_qwerty-fr"
|
||||
#Option "XkbModel" "pc105+inet"
|
||||
Option "XkbOptions" "terminate:ctrl_alt_bksp"
|
||||
EndSection
|
||||
|
|
@ -2,125 +2,8 @@
|
|||
|
||||
# Package are installed with --asdeps because they are needed
|
||||
|
||||
# Etckeeper
|
||||
|
||||
- name: Check if etckeeper is initialized
|
||||
stat:
|
||||
path: /etc/.git
|
||||
register: etckeeper
|
||||
become: yes
|
||||
|
||||
- name: Initialize etckeeper
|
||||
command: "etckeeper init"
|
||||
become: yes
|
||||
when: not etckeeper.stat.exists
|
||||
changed_when: yes
|
||||
|
||||
- name: Configure git user.name for etckeeper
|
||||
git_config:
|
||||
scope: local
|
||||
repo: /etc
|
||||
name: "{{ item.name }}"
|
||||
value: "{{ item.value }}"
|
||||
loop:
|
||||
- name: "user.name"
|
||||
value: "etckeeper on {{ inventory_hostname_short }}"
|
||||
- name: "user.email"
|
||||
value: "etckeeper@{{ inventory_hostname }}"
|
||||
become: yes
|
||||
|
||||
# Manjaro configuration
|
||||
|
||||
- name: Remove Manjaro's pamac
|
||||
pacman:
|
||||
name: pamac
|
||||
state: absent
|
||||
become: yes
|
||||
when: arch_based and False # I'm trying to remember why I usually delete this thing
|
||||
|
||||
# Verbose logging during boot
|
||||
|
||||
- name: Check if using Uboot
|
||||
stat:
|
||||
path: /boot/extlinux/extlinux.conf
|
||||
register: extlinux
|
||||
# This (and the following) was made with the Pinebook in mind,
|
||||
# not sure about compatibility
|
||||
|
||||
- name: Remove non-tty1 console (Uboot)
|
||||
replace:
|
||||
path: /boot/extlinux/extlinux.conf
|
||||
regexp: '^APPEND(.*) console=(?!tty1)\S+(.*)$'
|
||||
replace: 'APPEND\1\2'
|
||||
become: yes
|
||||
when: extlinux.stat.exists
|
||||
# Only one console= will be removed because regular expression are either hard
|
||||
# or somewhat limited. It's just what I need anyway
|
||||
|
||||
- name: Remove bootsplash.bootfile (Uboot)
|
||||
replace:
|
||||
path: /boot/extlinux/extlinux.conf
|
||||
regexp: '^APPEND(.*) bootsplash.bootfile=\S+(.*)$'
|
||||
replace: 'APPEND\1\2'
|
||||
become: yes
|
||||
when: extlinux.stat.exists
|
||||
|
||||
- name: Remove bootsplash packages (Arch based)
|
||||
pacman:
|
||||
name:
|
||||
- bootsplash-systemd
|
||||
- bootsplash-theme-manjaro
|
||||
state: absent
|
||||
become: yes
|
||||
when: arch_based
|
||||
|
||||
|
||||
# Display Manager
|
||||
|
||||
- name: Remove display manager packages (Arch based)
|
||||
pacman:
|
||||
name:
|
||||
- sddm
|
||||
- sddm-breath2-theme
|
||||
state: absent
|
||||
become: yes
|
||||
when: arch_based
|
||||
|
||||
# Xorg configuration
|
||||
|
||||
- name: Check if there is nvidia-xrun is installed
|
||||
stat:
|
||||
path: /etc/X11/nvidia-xorg.conf
|
||||
register: nvidia_xrun
|
||||
when: display_server == 'x11'
|
||||
|
||||
- name: Add nvidia-xrun xorg config directory
|
||||
set_fact:
|
||||
xorg_common_config_dirs: "{{ xorg_default_config_dirs + xorg_nvidia_config_dirs }}"
|
||||
vars:
|
||||
xorg_default_config_dirs:
|
||||
- /etc/X11/xorg.conf.d
|
||||
xorg_nvidia_config_dirs: "{{ ['/etc/X11/nvidia-xorg.conf.d'] if nvidia_xrun.stat.exists else [] }}"
|
||||
when: display_server == 'x11'
|
||||
|
||||
- name: Configure Xorg keyboard layout
|
||||
copy:
|
||||
src: xorg/keyboard.conf
|
||||
dest: "{{ item }}/00-keyboard.conf"
|
||||
become: yes
|
||||
when: display_server == 'x11'
|
||||
notify: etc changed
|
||||
loop: "{{ xorg_common_config_dirs }}"
|
||||
|
||||
- name: Use Alt keys for numpad
|
||||
patch:
|
||||
src: us_qwert_alt_numpad.patch
|
||||
dest: /usr/share/X11/xkb/symbols/us_qwerty-fr
|
||||
become: yes
|
||||
when: display_server == 'x11'
|
||||
# This is not very nice but it's updated so infrequently that it's not worth
|
||||
# the trouble
|
||||
|
||||
- name: Check if there is Intel backlight
|
||||
stat:
|
||||
path: /sys/class/backlight/intel_backlight
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue