summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/roles/liw-usual/files/dict.conf1
-rw-r--r--ansible/roles/liw-usual/tasks/command-line-tools.yml67
-rw-r--r--ansible/roles/liw-usual/tasks/main.yml4
-rw-r--r--ansible/roles/liw-usual/tasks/storage-tools.yml15
-rw-r--r--ansible/solace.yml77
-rw-r--r--ansible/x220.yml77
6 files changed, 152 insertions, 89 deletions
diff --git a/ansible/roles/liw-usual/files/dict.conf b/ansible/roles/liw-usual/files/dict.conf
deleted file mode 100644
index d2682cb..0000000
--- a/ansible/roles/liw-usual/files/dict.conf
+++ /dev/null
@@ -1 +0,0 @@
-server localhost
diff --git a/ansible/roles/liw-usual/tasks/command-line-tools.yml b/ansible/roles/liw-usual/tasks/command-line-tools.yml
deleted file mode 100644
index df293d0..0000000
--- a/ansible/roles/liw-usual/tasks/command-line-tools.yml
+++ /dev/null
@@ -1,67 +0,0 @@
-- name: install command line utilities
- apt:
- name:
- - locales-all
- - psmisc
- - mosh
- - rsync
- - vim
- - screen
- - tmux
- - strace
- - gddrescue
- - pv
- - moreutils
- - bind9-host
- - dnsutils
- - lshw
- - curl
-# - extrautils
-# - liw-automation
-# - copyright-statement-lint
- - bc
- - yaml-mode
- - ikiwiki
- - taskwarrior
- - zip
-# - cachedir
- - debmirror
- - git-annex
- - iftop
- - info
-# - jt
- - kpartx
- - lftp
- - mediainfo
- - mmv
- - mtr
- - num-utils
- - parted-doc
- - trickle
- - units
- - w3m
- - youtube-dl
- - signing-party
- - sshfs
- - dict
- - dictd
- - dict-foldoc
- - dict-gcide
- - dict-jargon
- - dict-vera
- - dict-wn
- - gnuplot
- - acpi
- - nmap
- - nethogs
- - time
- - restic
- - apt-file
- - whois
- - oathtool
- - htop
-
-- name: configure dict
- copy:
- src: dict.conf
- dest: /etc/dictd/dict.conf
diff --git a/ansible/roles/liw-usual/tasks/main.yml b/ansible/roles/liw-usual/tasks/main.yml
deleted file mode 100644
index 50021ba..0000000
--- a/ansible/roles/liw-usual/tasks/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include: command-line-tools.yml
-- include: storage-tools.yml
-...
diff --git a/ansible/roles/liw-usual/tasks/storage-tools.yml b/ansible/roles/liw-usual/tasks/storage-tools.yml
deleted file mode 100644
index 39f736c..0000000
--- a/ansible/roles/liw-usual/tasks/storage-tools.yml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-- name: install smartmontools
- apt: name=smartmontools
-- name: install bonnie++
- apt: name=bonnie++
-- name: install mdadm
- apt: name=mdadm
-- name: install hddtemp
- apt: name=hddtemp
-- name: install parted
- apt: name=parted
-- name: install lvm2
- apt: name=lvm2
-- apt: name=cryptsetup
-...
diff --git a/ansible/solace.yml b/ansible/solace.yml
index facada5..0df6bd6 100644
--- a/ansible/solace.yml
+++ b/ansible/solace.yml
@@ -17,7 +17,6 @@
- role: mail-client
- role: annexed
- role: riot-host
- - role: liw-usual
# # - role: writing-dev-env
# # - role: journal-workstation
# # - role: debian-dev-env
@@ -108,6 +107,82 @@
- xpdf
- zerofree
+ - name: install command line utilities
+ apt:
+ name:
+ - locales-all
+ - psmisc
+ - mosh
+ - rsync
+ - vim
+ - screen
+ - tmux
+ - strace
+ - gddrescue
+ - pv
+ - moreutils
+ - bind9-host
+ - dnsutils
+ - lshw
+ - curl
+ # - extrautils
+ # - liw-automation
+ # - copyright-statement-lint
+ - bc
+ - yaml-mode
+ - ikiwiki
+ - taskwarrior
+ - zip
+ # - cachedir
+ - debmirror
+ - git-annex
+ - iftop
+ - info
+ # - jt
+ - kpartx
+ - lftp
+ - mediainfo
+ - mmv
+ - mtr
+ - num-utils
+ - parted-doc
+ - trickle
+ - units
+ - w3m
+ - youtube-dl
+ - signing-party
+ - sshfs
+ - dict
+ - dictd
+ - dict-foldoc
+ - dict-gcide
+ - dict-jargon
+ - dict-vera
+ - dict-wn
+ - gnuplot
+ - acpi
+ - nmap
+ - nethogs
+ - time
+ - restic
+ - apt-file
+ - whois
+ - oathtool
+ - htop
+ - smartmontools
+ - bonnie++
+ - mdadm
+ - hddtemp
+ - parted
+ - lvm2
+ - cryptsetup
+
+ - name: configure dict
+ copy:
+ content: |
+ server localhost
+ dest: /etc/dictd/dict.conf
+
- lineinfile:
path: /etc/gdm3/daemon.conf
regexp: WaylandEnable=
diff --git a/ansible/x220.yml b/ansible/x220.yml
index e60faca..c5ae1eb 100644
--- a/ansible/x220.yml
+++ b/ansible/x220.yml
@@ -11,7 +11,6 @@
- role: gnupg-workstation
- role: gnome-system
- role: ansible
- - role: liw-usual
- role: unix_users
- role: thinkpad
tasks:
@@ -21,6 +20,82 @@
- build-essential
- hugo
+ - name: install command line utilities
+ apt:
+ name:
+ - locales-all
+ - psmisc
+ - mosh
+ - rsync
+ - vim
+ - screen
+ - tmux
+ - strace
+ - gddrescue
+ - pv
+ - moreutils
+ - bind9-host
+ - dnsutils
+ - lshw
+ - curl
+ # - extrautils
+ # - liw-automation
+ # - copyright-statement-lint
+ - bc
+ - yaml-mode
+ - ikiwiki
+ - taskwarrior
+ - zip
+ # - cachedir
+ - debmirror
+ - git-annex
+ - iftop
+ - info
+ # - jt
+ - kpartx
+ - lftp
+ - mediainfo
+ - mmv
+ - mtr
+ - num-utils
+ - parted-doc
+ - trickle
+ - units
+ - w3m
+ - youtube-dl
+ - signing-party
+ - sshfs
+ - dict
+ - dictd
+ - dict-foldoc
+ - dict-gcide
+ - dict-jargon
+ - dict-vera
+ - dict-wn
+ - gnuplot
+ - acpi
+ - nmap
+ - nethogs
+ - time
+ - restic
+ - apt-file
+ - whois
+ - oathtool
+ - htop
+ - smartmontools
+ - bonnie++
+ - mdadm
+ - hddtemp
+ - parted
+ - lvm2
+ - cryptsetup
+
+ - name: configure dict
+ copy:
+ content: |
+ server localhost
+ dest: /etc/dictd/dict.conf
+
- lineinfile:
path: /etc/xdg/autostart/gnome-keyring-ssh.desktop
line: Hidden=true