From 19d26cf0bf24e8564bc91b0623e2b2b04147133a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20M=C3=BCller?= Date: Fri, 3 Jul 2020 18:27:56 +0200 Subject: [PATCH] [presets] fix user toml --- presets/plasma-steam/00-base.toml | 1 + presets/plasma-steam/01-xorg.toml | 1 + presets/plasma-steam/02-user.toml | 1 + presets/plasma-steam/03-kde.toml | 1 + presets/plasma-steam/04-steam.toml | 1 + presets/xfce.toml | 4 ++++ presets/xorg.toml | 4 ++++ 7 files changed, 13 insertions(+) create mode 120000 presets/plasma-steam/00-base.toml create mode 120000 presets/plasma-steam/01-xorg.toml create mode 120000 presets/plasma-steam/02-user.toml create mode 120000 presets/plasma-steam/03-kde.toml create mode 120000 presets/plasma-steam/04-steam.toml diff --git a/presets/plasma-steam/00-base.toml b/presets/plasma-steam/00-base.toml new file mode 120000 index 0000000..6bf88c6 --- /dev/null +++ b/presets/plasma-steam/00-base.toml @@ -0,0 +1 @@ +../base.toml \ No newline at end of file diff --git a/presets/plasma-steam/01-xorg.toml b/presets/plasma-steam/01-xorg.toml new file mode 120000 index 0000000..5949eb4 --- /dev/null +++ b/presets/plasma-steam/01-xorg.toml @@ -0,0 +1 @@ +../xorg.toml \ No newline at end of file diff --git a/presets/plasma-steam/02-user.toml b/presets/plasma-steam/02-user.toml new file mode 120000 index 0000000..b54cb1e --- /dev/null +++ b/presets/plasma-steam/02-user.toml @@ -0,0 +1 @@ +../user.toml \ No newline at end of file diff --git a/presets/plasma-steam/03-kde.toml b/presets/plasma-steam/03-kde.toml new file mode 120000 index 0000000..d70d7c3 --- /dev/null +++ b/presets/plasma-steam/03-kde.toml @@ -0,0 +1 @@ +../kde.toml \ No newline at end of file diff --git a/presets/plasma-steam/04-steam.toml b/presets/plasma-steam/04-steam.toml new file mode 120000 index 0000000..a44d41b --- /dev/null +++ b/presets/plasma-steam/04-steam.toml @@ -0,0 +1 @@ +../steam.toml \ No newline at end of file diff --git a/presets/xfce.toml b/presets/xfce.toml index ba729d0..c6fda38 100644 --- a/presets/xfce.toml +++ b/presets/xfce.toml @@ -1,4 +1,8 @@ +<<<<<<< HEAD packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter-settings", "accountsservice"] +======= +packages = ["xfce4", "ttf-dejavu", "lightdm-gtk-greeter"] +>>>>>>> 4cab099 ([presets] fix user toml) script = """ set -exu diff --git a/presets/xorg.toml b/presets/xorg.toml index 0106147..f2d095d 100644 --- a/presets/xorg.toml +++ b/presets/xorg.toml @@ -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", "xf86-video-vesa", "xorg-server", "xterm"] +>>>>>>> 4cab099 ([presets] fix user toml)