mirror of
https://github.com/philmmanjaro/alma.git
synced 2025-12-06 19:39:20 +01:00
[presets] fix user toml
This commit is contained in:
committed by
Philip Mueller
parent
20a80c73e2
commit
19d26cf0bf
1
presets/plasma-steam/00-base.toml
Symbolic link
1
presets/plasma-steam/00-base.toml
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../base.toml
|
||||||
1
presets/plasma-steam/01-xorg.toml
Symbolic link
1
presets/plasma-steam/01-xorg.toml
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../xorg.toml
|
||||||
1
presets/plasma-steam/02-user.toml
Symbolic link
1
presets/plasma-steam/02-user.toml
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../user.toml
|
||||||
1
presets/plasma-steam/03-kde.toml
Symbolic link
1
presets/plasma-steam/03-kde.toml
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../kde.toml
|
||||||
1
presets/plasma-steam/04-steam.toml
Symbolic link
1
presets/plasma-steam/04-steam.toml
Symbolic link
@@ -0,0 +1 @@
|
|||||||
|
../steam.toml
|
||||||
@@ -1,4 +1,8 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter-settings", "accountsservice"]
|
packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter-settings", "accountsservice"]
|
||||||
|
=======
|
||||||
|
packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter"]
|
||||||
|
>>>>>>> 4cab099 ([presets] fix user toml)
|
||||||
script = """
|
script = """
|
||||||
set -exu
|
set -exu
|
||||||
|
|
||||||
|
|||||||
@@ -1 +1,5 @@
|
|||||||
|
<<<<<<< HEAD
|
||||||
packages = ["xf86-input-libinput", "xf86-video-amdgpu", "xf86-video-ati", "xf86-video-nouveau", "xorg-server", "xterm"]
|
packages = ["xf86-input-libinput", "xf86-video-amdgpu", "xf86-video-ati", "xf86-video-nouveau", "xorg-server", "xterm"]
|
||||||
|
=======
|
||||||
|
packages = ["xf86-input-libinput", "xf86-video-amdgpu", "xf86-video-ati", "xf86-video-nouveau", "xf86-video-vesa", "xorg-server", "xterm"]
|
||||||
|
>>>>>>> 4cab099 ([presets] fix user toml)
|
||||||
|
|||||||
Reference in New Issue
Block a user