Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

adding i3wm support again #14

Merged
merged 5 commits into from
Aug 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 5 additions & 9 deletions .github/workflows/ansible-linting-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
3 changes: 2 additions & 1 deletion .github/workflows/pylint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@master
uses: actions/[email protected]

- name: GitHub Action for pylint
uses: cclauss/[email protected]
9 changes: 4 additions & 5 deletions .github/workflows/yamllint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,11 @@ jobs:
name: 'Yamllint'
runs-on: ubuntu-latest
steps:
- name: 'Checkout'
uses: actions/checkout@master
- name: 'checkout git repo'
uses: actions/[email protected]

- 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
9 changes: 4 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion collections/ansible_collections/community/general
Submodule general updated 149 files
7 changes: 7 additions & 0 deletions group_vars/all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion group_vars/thinkpad.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
7 changes: 7 additions & 0 deletions host_vars/daringdoo.local.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
# l3d.i3wm
i3wm_user_list:
- user: "l3d"
home: "/home/l3d"
- user: "lilian"
home: "/home/lilian"
1 change: 0 additions & 1 deletion roles/do1jlr.base
Submodule do1jlr.base deleted from b0c817
1 change: 1 addition & 0 deletions roles/l3d.packages
Submodule l3d.packages added at 5666c1
3 changes: 2 additions & 1 deletion site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down