Merge pull request #14 from DO1JLR/a

adding i3wm support again

.github/dependabot.yml

@@ -0,0 +1,9 @@
+---
+# See https://docs.github.com/en/github/administering-a-repository/configuration-options-for-dependency-updates
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/ansible-linting-check.yml

@@ -2,26 +2,22 @@
 name: Ansible Lint check
 
 # yamllint disable-line rule:truthy
-on:
-  push:
-    branches: '*'
-  pull_request:
-    branches: '*'
+on: [push, pull_request]
 
 jobs:
   build:
-
+    name: Ansible Lint
     runs-on: ubuntu-latest
 
     steps:
       - name: 'checkout git repo'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           lfs: true
           submodules: true
           fetch-depth: 0
 
       - name: 'Lint Ansible Playbook'
-        uses: ansible/ansible-lint-action@v6
+        uses: ansible/ansible-lint-action@v6.17.0
         with:
-          path: "."
+          path: "site.yml"

.github/workflows/pylint.yml

@@ -10,6 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout'
-        uses: actions/checkout@master
+        uses: actions/checkout@v3.5.3
+
       - name: GitHub Action for pylint
         uses: cclauss/GitHub-Action-for-pylint@0.7.0

.github/workflows/yamllint.yaml

@@ -9,12 +9,11 @@ jobs:
     name: 'Yamllint'
     runs-on: ubuntu-latest
     steps:
-      - name: 'Checkout'
-        uses: actions/checkout@master
+      - name: 'checkout git repo'
+        uses: actions/checkout@v3.5.3
+
       - name: 'Yamllint'
-        uses: karancode/yamllint-github-action@master
+        uses: karancode/yamllint-github-action@v2.1.1
         with:
           yamllint_file_or_dir: '.'
           yamllint_config_filepath: './.yamllint'
-          yamllint_strict: false
-          yamllint_comment: true

.gitmodules

@@ -16,7 +16,7 @@
 	branch = main
 [submodule "files/admin_ssh_keys"]
 	path = files/admin_ssh_keys
-	url = https://backwesen.de/ansible/ssh_public_keys.git
+	url = https://git.l3d.ch/ansible/ssh_public_keys.git
 	branch = main
 [submodule "roles/sshd"]
 	path = roles/do1jlr.sshd
@@ -62,10 +62,6 @@
 	path = roles/ansible_version
 	url = https://github.com/chaos-bodensee/role-ansible_version.git
 	branch = main
-[submodule "roles/base"]
-	path = roles/do1jlr.base
-	url = https://github.com/roles-ansible/ansible_role_base.git
-	branch = main
 [submodule "roles/amdgpu_firmware"]
 	path = roles/amdgpu_firmware
 	url = https://github.com/DO1JLR/ansible_role_amdgpu_firmware.git
@@ -91,3 +87,6 @@
 [submodule "collections/ansible_collections/l3d/avahi"]
 	path = collections/ansible_collections/l3d/avahi
 	url = https://github.com/roles-ansible/ansible_collection_avahi.git
+[submodule "roles/l3d.packages"]
+	path = roles/l3d.packages
+	url = https://github.com/roles-ansible/ansible_role_packages.git

group_vars/all.yml

@@ -70,5 +70,12 @@ i3_run_on_startup:
 
 htop__compile: true
 
+# roles/do1jlr.base
+l3d_pkgs__install_advanced: true
+l3d_pkgs__install_python: true
+l3d_pkgs__install_cli: true
+l3d_pkgs__install_extra_packages:
+ - keychain
+
 # globaly enably simple versionscheck - if available
 submodules_versioncheck: true

group_vars/thinkpad.yml

@@ -18,7 +18,7 @@ i3_packages_extra:
   - evince
   - speedtest-cli
 
-i3_font_size: 11
+i3_font_size: 13
 i3_focus_follows_mouse: true
 
 i3_desktop_background: "/home/{{ user }}/.config/background.png"

host_vars/daringdoo.local.yml

@@ -0,0 +1,7 @@
+---
+# l3d.i3wm
+i3wm_user_list:
+  - user: "l3d"
+    home: "/home/l3d"
+  - user: "lilian"
+    home: "/home/lilian"

site.yml

@@ -7,13 +7,14 @@
 - name: Generic Workstation Preperation
   hosts: all
   roles:
-    # - {role: do1jlr.base, tags: [default, packages, base]}
+    - {role: l3d.packages, tags: [packages, apt]}
     # - {role: workstation_packages, tags: [default, workstation_packages, packages, setup]}
     - {role: l3d.ntp, tags: ntp}
     - {role: l3d.avahi.client, tags: avahi}
     - {role: l3d.avahi.daemon, tags: avahi}
     - {role: gantsign.bat, tags: bat}
     # - {role: arch-fonts, tags: [font, fonts, arch-fonts]}
+    - {role: do1jlr.i3wm, tags: i3wm}
 
 # - name: user specific setup
 #   hosts: private