Skip to content

Commit 20de21b

Browse files
imbevimbev
committed
Re-enable everything
1 parent b1db00d commit 20de21b

File tree

5 files changed

+118
-118
lines changed

5 files changed

+118
-118
lines changed

files/usr/bin/branding.sh renamed to files/branding.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,4 +143,4 @@ dnf remove -y \
143143
rm -rf \
144144
/var/run
145145

146-
rm /usr/bin/branding.sh
146+
rm /branding.sh

‎files/usr/lib/dracut/dracut.conf.d/10-heliumos.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
force_drivers+=" nvidia nvidia_modeset nvidia_uvm nvidia_drm "
2-
add_dracutmodules+=" plymouth "
2+
dracutmodules+=" plymouth "

‎tasks/base/base.yaml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
- ansible.builtin.import_tasks: ../base/dnf-config.yaml
2-
# - ansible.builtin.import_tasks: ../base/addons.yaml
3-
# - ansible.builtin.import_tasks: ../base/bootc-tweaks.yaml
2+
- ansible.builtin.import_tasks: ../base/addons.yaml
3+
- ansible.builtin.import_tasks: ../base/bootc-tweaks.yaml
44
- ansible.builtin.import_tasks: ../base/epel-repo.yaml
5-
# - ansible.builtin.import_tasks: ../base/appimage-compat.yaml
6-
# - ansible.builtin.import_tasks: ../base/dev-tools.yaml
7-
# - ansible.builtin.import_tasks: ../base/docker.yaml
8-
# - ansible.builtin.import_tasks: ../base/firewall.yaml
9-
# - ansible.builtin.import_tasks: ../base/flatpak.yaml
10-
# - ansible.builtin.import_tasks: ../base/gaming-hardware-compat.yaml
5+
- ansible.builtin.import_tasks: ../base/appimage-compat.yaml
6+
- ansible.builtin.import_tasks: ../base/dev-tools.yaml
7+
- ansible.builtin.import_tasks: ../base/docker.yaml
8+
- ansible.builtin.import_tasks: ../base/firewall.yaml
9+
- ansible.builtin.import_tasks: ../base/flatpak.yaml
10+
- ansible.builtin.import_tasks: ../base/gaming-hardware-compat.yaml
1111
- ansible.builtin.import_tasks: ../base/kde-plasma.yaml
12-
# - ansible.builtin.import_tasks: ../base/selinux.yaml
13-
# - ansible.builtin.import_tasks: ../base/shell.yaml
12+
- ansible.builtin.import_tasks: ../base/selinux.yaml
13+
- ansible.builtin.import_tasks: ../base/shell.yaml
1414
- ansible.builtin.import_tasks: ../base/branding.yaml
15-
# - ansible.builtin.import_tasks: ../base/time-fix.yaml
16-
# - ansible.builtin.import_tasks: ../base/kdump.yaml
15+
- ansible.builtin.import_tasks: ../base/time-fix.yaml
16+
- ansible.builtin.import_tasks: ../base/kdump.yaml

‎tasks/base/branding.yaml‎

Lines changed: 102 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,109 @@
1-
# - name: Branding
2-
# ansible.builtin.script: /workdir/files/usr/bin/branding.sh
3-
4-
# - name: Configure SDDM theme
5-
# shell:
6-
# cmd: |
7-
# sed -i \
8-
# 's,#Current=01-breeze-fedora,Current=breeze,g' \
9-
# /etc/sddm.conf
10-
11-
# sed -i \
12-
# 's,/usr/share/wallpapers/Next/contents/images/5120x2880.png,/usr/share/wallpapers/Andromeda/contents/images/5338x5905.jpg,g' \
13-
# /usr/share/sddm/themes/breeze/theme.conf
14-
15-
# - name: Add EULA directories
16-
# ansible.builtin.file:
17-
# path: /usr/share/{{ item.vendor }}-release
18-
# state: directory
19-
# loop:
20-
# - { vendor: heliumos }
21-
# - { vendor: almalinux }
22-
# - { vendor: redhat }
23-
24-
# - name: Add EULA files
25-
# ansible.builtin.copy:
26-
# content: |
27-
# HeliumOS 10 EULA
28-
29-
# HeliumOS 10 comes with no guarantees or warranties of any sorts,
30-
# either written or implied.
31-
32-
# The Distribution is released as GPLv2. Individual packages in the
33-
# distribution come with their own licences. A copy of the GPLv2 license
34-
# is included with the distribution media.
35-
# dest: /usr/share/{{ item.vendor }}-release/EULA
36-
# loop:
37-
# - { vendor: heliumos }
38-
# - { vendor: almalinux }
39-
# - { vendor: redhat }
40-
41-
# - name: Create Plasma favorites defaults script for HeliumOS
42-
# ansible.builtin.copy:
43-
# content: |
44-
# #!/usr/bin/env bash
45-
46-
# set -eoux pipefail
47-
48-
# old_favorites=$(sqlite3 ~/.local/share/kactivitymanagerd/resources/database "SELECT targettedResource FROM 'ResourceLink';")
49-
50-
# for fav in $old_favorites; do
51-
# qdbus-qt6 org.kde.ActivityManager /ActivityManager/Resources/Linking \
52-
# org.kde.ActivityManager.ResourcesLinking.UnlinkResourceFromActivity \
53-
# "org.kde.plasma.favorites.applications" \
54-
# "applications:$fav" \
55-
# ":global"
56-
# done
57-
58-
# new_favorites="preferred://browser,org.kde.kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kwrite.desktop,org.kde.konsole.desktop,org.kde.discover.desktop"
59-
60-
# echo "$new_favorites" | tr ',' '\n' | while read -r fav; do
61-
# qdbus-qt6 org.kde.ActivityManager /ActivityManager/Resources/Linking \
62-
# org.kde.ActivityManager.ResourcesLinking.LinkResourceToActivity \
63-
# "org.kde.plasma.favorites.applications" \
64-
# "applications:$fav" \
65-
# ":global"
66-
# done
67-
# dest: /usr/bin/heliumos-plasma-favorites-set-defaults
68-
# mode: "0755"
69-
70-
# - name: Install sqlite
71-
# ansible.builtin.dnf:
72-
# name:
73-
# - sqlite
74-
# state: present
75-
76-
# - name: Create Plasma favorites defaults service for HeliumOS
77-
# ansible.builtin.copy:
78-
# content: |
79-
# [Unit]
80-
# Description=Set default Plasma favorites service for HeliumOS
81-
# ConditionPathExists=!%s/.local/state/heliumos-plasma-favorites-set-defaults
82-
# Requires=plasma-kactivitymanagerd.service
83-
# After=plasma-workspace.target
84-
85-
# [Service]
86-
# Type=oneshot
87-
# ExecStart=/usr/bin/bash -c '/usr/bin/heliumos-plasma-favorites-set-defaults && touch $HOME/.local/state/heliumos-plasma-favorites-set-defaults'
88-
# dest: /usr/lib/systemd/user/heliumos-plasma-favorites-set-defaults.service
89-
90-
# - name: Enable Plasma favorites defaults service for HeliumOs
91-
# ansible.builtin.file:
92-
# src: /usr/lib/systemd/user/heliumos-plasma-favorites-set-defaults.service
93-
# dest: /etc/systemd/user/plasma-workspace.target.wants/heliumos-plasma-favorites-set-defaults.service
94-
# state: link
1+
- name: Branding
2+
ansible.builtin.script: /workdir/files/branding.sh
3+
4+
- name: Configure SDDM theme
5+
shell:
6+
cmd: |
7+
sed -i \
8+
's,#Current=01-breeze-fedora,Current=breeze,g' \
9+
/etc/sddm.conf
10+
11+
sed -i \
12+
's,/usr/share/wallpapers/Next/contents/images/5120x2880.png,/usr/share/wallpapers/Andromeda/contents/images/5338x5905.jpg,g' \
13+
/usr/share/sddm/themes/breeze/theme.conf
14+
15+
- name: Add EULA directories
16+
ansible.builtin.file:
17+
path: /usr/share/{{ item.vendor }}-release
18+
state: directory
19+
loop:
20+
- { vendor: heliumos }
21+
- { vendor: almalinux }
22+
- { vendor: redhat }
23+
24+
- name: Add EULA files
25+
ansible.builtin.copy:
26+
content: |
27+
HeliumOS 10 EULA
28+
29+
HeliumOS 10 comes with no guarantees or warranties of any sorts,
30+
either written or implied.
31+
32+
The Distribution is released as GPLv2. Individual packages in the
33+
distribution come with their own licences. A copy of the GPLv2 license
34+
is included with the distribution media.
35+
dest: /usr/share/{{ item.vendor }}-release/EULA
36+
loop:
37+
- { vendor: heliumos }
38+
- { vendor: almalinux }
39+
- { vendor: redhat }
40+
41+
- name: Create Plasma favorites defaults script for HeliumOS
42+
ansible.builtin.copy:
43+
content: |
44+
#!/usr/bin/env bash
45+
46+
set -eoux pipefail
47+
48+
old_favorites=$(sqlite3 ~/.local/share/kactivitymanagerd/resources/database "SELECT targettedResource FROM 'ResourceLink';")
49+
50+
for fav in $old_favorites; do
51+
qdbus-qt6 org.kde.ActivityManager /ActivityManager/Resources/Linking \
52+
org.kde.ActivityManager.ResourcesLinking.UnlinkResourceFromActivity \
53+
"org.kde.plasma.favorites.applications" \
54+
"applications:$fav" \
55+
":global"
56+
done
57+
58+
new_favorites="preferred://browser,org.kde.kontact.desktop,systemsettings.desktop,org.kde.dolphin.desktop,org.kde.kwrite.desktop,org.kde.konsole.desktop,org.kde.discover.desktop"
59+
60+
echo "$new_favorites" | tr ',' '\n' | while read -r fav; do
61+
qdbus-qt6 org.kde.ActivityManager /ActivityManager/Resources/Linking \
62+
org.kde.ActivityManager.ResourcesLinking.LinkResourceToActivity \
63+
"org.kde.plasma.favorites.applications" \
64+
"applications:$fav" \
65+
":global"
66+
done
67+
dest: /usr/bin/heliumos-plasma-favorites-set-defaults
68+
mode: "0755"
69+
70+
- name: Install sqlite
71+
ansible.builtin.dnf:
72+
name:
73+
- sqlite
74+
state: present
75+
76+
- name: Create Plasma favorites defaults service for HeliumOS
77+
ansible.builtin.copy:
78+
content: |
79+
[Unit]
80+
Description=Set default Plasma favorites service for HeliumOS
81+
ConditionPathExists=!%s/.local/state/heliumos-plasma-favorites-set-defaults
82+
Requires=plasma-kactivitymanagerd.service
83+
After=plasma-workspace.target
84+
85+
[Service]
86+
Type=oneshot
87+
ExecStart=/usr/bin/bash -c '/usr/bin/heliumos-plasma-favorites-set-defaults && touch $HOME/.local/state/heliumos-plasma-favorites-set-defaults'
88+
dest: /usr/lib/systemd/user/heliumos-plasma-favorites-set-defaults.service
89+
90+
- name: Enable Plasma favorites defaults service for HeliumOs
91+
ansible.builtin.file:
92+
src: /usr/lib/systemd/user/heliumos-plasma-favorites-set-defaults.service
93+
dest: /etc/systemd/user/plasma-workspace.target.wants/heliumos-plasma-favorites-set-defaults.service
94+
state: link
9595

9696
- name: Install Plymouth Spinner Theme
9797
ansible.builtin.dnf:
9898
name:
9999
- plymouth-theme-spinner
100100
state: present
101101

102-
# - name: Set default plymouth theme
103-
# ansible.builtin.copy:
104-
# content: |
105-
# [Daemon]
106-
# Theme=spinner
107-
# ShowDelay=0
108-
# DeviceTimeout=8
109-
# dest: /etc/plymouth/plymouthd.conf
102+
- name: Set default plymouth theme
103+
ansible.builtin.copy:
104+
content: |
105+
[Daemon]
106+
Theme=spinner
107+
ShowDelay=0
108+
DeviceTimeout=8
109+
dest: /etc/plymouth/plymouthd.conf

‎tasks/standard/standard.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
- ansible.builtin.import_tasks: ../base/base.yaml
22

3-
# - ansible.builtin.import_tasks: ../standard/nvidia-kmod.yaml
3+
- ansible.builtin.import_tasks: ../standard/nvidia-kmod.yaml
44

5-
# - ansible.builtin.import_tasks: ../post/post.yaml
5+
- ansible.builtin.import_tasks: ../post/post.yaml

0 commit comments

Comments
 (0)