Skip to content

Commit 6ad0ef2

Browse files
Fixed Calamares Modules
1 parent 4b0fd2e commit 6ad0ef2

File tree

7 files changed

+9
-12
lines changed

7 files changed

+9
-12
lines changed

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
./opt/calinix/*
1+
opt/calinix/*

etc/calamares/branding/mkOS/branding.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ images:
166166
# productBanner: "wallpaper.jpg"
167167
productIcon: "squid.png"
168168
productLogo: "logo.png"
169-
productWallpaper: "wallpaper.jpeg"
169+
productWallpaper: "wallpaper.jpg"
170170
productWelcome: "languages.png"
171171

172172
# Colors for text and background components.

etc/calamares/branding/mkOS/stylesheet.qss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ QPushButton#aboutButton { qproperty-icon: url(:/data/images/release.svg); }
9090
#licenseItemFullText { }
9191
*/
9292
#mainApp { }->setStyleSheet("QLineEdit { color: yellow }");
93-
QComboBox { background: black; color:white; }
93+
QComboBox { background: black; }
9494
QComboBox QAbstractItemView { background: grey; color:blue; }

etc/calamares/modules/netinstall-apps.yaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,12 @@
66
expanded: false
77
packages:
88
- chromium
9-
- firefox-developer-edition
10-
- brave-bin
11-
- google-chrome
12-
- librewolf-bin
9+
- opera
1310
- qutebrowser
1411
- vivaldi
1512
- vivaldi-ffmpeg-codecs
1613
- name: "Office"
17-
description: "LibreOffice Fresh"
14+
description: "LibreOffice "
1815
critical: false
1916
hidden: false
2017
selected: false
@@ -24,3 +21,4 @@
2421
- libreoffice-fresh-fr
2522
- hunspell-$LOCALE
2623
- hunspell-fr
24+
- libreoffice-still

etc/calamares/modules/shellprocess-ezfinish.conf

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,4 @@ script:
9595
- "-rm @@ROOT@@/etc/systemd/system/etc-pacman.d-gnupg.mount"
9696
- "-rm @@ROOT@@/root/.automated_script.sh"
9797
- "-rm @@ROOT@@/root/.zlogin"
98-
- "-bash @@ROOT@@/etc/scripts/WhiteSurtheme/tweaks.sh -f monterey"
99-
- "-bash @@ROOT@@/etc/scripts/WhiteSurtheme/install.sh -N glassy -c dark"
100-
- "-sudo ./@@ROOT@@/etc/scripts/WhiteSurKDE/sddm/install.sh"
98+
- "-bash @@ROOT@@/etc/scripts/replacecal.sh"

etc/scripts/replacecal.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
sed -i 's/awful.util.spawn_with_shell("echo \'calinix\' | sudo -S calamares &")/-- End/g' etc/skel/.config/awesome/rc.lua

etc/skel/.config/awesome/rc.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,4 +82,4 @@ awful.util.spawn_with_shell("nm-applet &")
8282
awful.util.spawn_with_shell("xfce4-power-manager &")
8383
awful.util.spawn_with_shell("picom &")
8484
awful.util.spawn_with_shell("pnmixer &")
85-
awful.util.spawn_with_shell("xfce4-clipman &")
85+
awful.util.spawn_with_shell("xfce4-clipman &")

0 commit comments

Comments
 (0)