Move some packages from desktop profile to desktop/x

9 files changed, 40 insertions, 38 deletions

diff --git a/profiles/desktop/package.accept_keywords b/profiles/desktop/package.accept_keywords
index c083f61..c08cfc9 100644
--- a/profiles/desktop/package.accept_keywords
+++ b/profiles/desktop/package.accept_keywords
@@ -1,4 +1,4 @@
-# i3
+# i3blocks
 media-sound/playerctl ~amd64
 # terminal
 x11-terms/rxvt-unicode ~amd64
diff --git a/profiles/desktop/package.use b/profiles/desktop/package.use
index 301c4aa..76ad521 100644
--- a/profiles/desktop/package.use
+++ b/profiles/desktop/package.use
@@ -1,14 +1,9 @@
 # Multiconfig
 sys-apps/multiconfig bridge firewall openvpn
 
-# Who knows..
+# Printing
 app-text/ghostscript-gpl cups
 
-# Xorg
-x11-base/xorg-server xvfb
-# XCB keyboard extension for libxcb
-x11-libs/libxcb xkb
-
 # Pulseaudio (systemwide)
 media-sound/pulseaudio alsa alsa-plugin bluetooth system-wide
 
@@ -45,9 +40,6 @@ dev-python/matplotlib gtk3 latex -qt5
 dev-qt/qtgui gtkstyle xcb
 dev-libs/libpcre pcre16
 
-# Multiscreen dmenu
-x11-misc/dmenu xinerama
-
 # For kicad
 dev-libs/boost python
 
diff --git a/profiles/desktop/packages b/profiles/desktop/packages
index 4b25484..6fe2d21 100644
--- a/profiles/desktop/packages
+++ b/profiles/desktop/packages
@@ -5,42 +5,22 @@ app-text/llpp
 app-admin/pass
 app-misc/task
 sys-apps/multiconfig
+x11-apps/mesa-progs
 
-# vim
-app-vim/vim-spell-cs
-app-vim/vim-spell-en
-
-# i3
-x11-wm/i3
+# i3 and Sway
 x11-misc/i3blocks
-x11-misc/i3lock
 x11-misc/dmenu
 x11-misc/dunst
 
+# vim
+app-vim/vim-spell-cs
+app-vim/vim-spell-en
+
 # urxvt
 x11-terms/rxvt-unicode
 x11-misc/urxvt-font-size
 x11-misc/urxvt-perls
 
-# X11
-x11-base/xorg-x11
-x11-drivers/xf86-input-evdev
-x11-apps/mesa-progs
-
-x11-base/xorg-drivers
-x11-base/xorg-server
-x11-apps/setxkbmap
-x11-apps/xev
-x11-apps/xinit
-x11-apps/xprop
-x11-apps/xrandr
-x11-libs/cairo
-x11-misc/xdotool
-x11-misc/numlockx
-
-x11-misc/x11vnc
-net-misc/tigervnc
-
 # Mail
 mail-client/neomutt
 mail-mta/msmtp
diff --git a/profiles/desktop/wayland/make.defaults b/profiles/desktop/wayland/make.defaults
new file mode 100644
index 0000000..e47d5fe
--- /dev/null
+++ b/profiles/desktop/wayland/make.defaults
@@ -0,0 +1,2 @@
+# vim:ft=gentoo-make-conf
+USE="$USE wayland"
diff --git a/profiles/desktop/x/package.use b/profiles/desktop/x/package.use
new file mode 100644
index 0000000..4b9c259
--- /dev/null
+++ b/profiles/desktop/x/package.use
@@ -0,0 +1,7 @@
+# Xorg
+x11-base/xorg-server xvfb
+# XCB keyboard extension for libxcb
+x11-libs/libxcb xkb
+
+# Multiscreen dmenu
+x11-misc/dmenu xinerama
diff --git a/profiles/desktop/x/packages b/profiles/desktop/x/packages
new file mode 100644
index 0000000..0a83c8b
--- /dev/null
+++ b/profiles/desktop/x/packages
@@ -0,0 +1,18 @@
+# i3
+x11-wm/i3
+x11-misc/i3lock
+
+# X11
+x11-base/xorg-x11
+x11-drivers/xf86-input-evdev
+
+x11-base/xorg-drivers
+x11-base/xorg-server
+x11-apps/setxkbmap
+x11-apps/xev
+x11-apps/xinit
+x11-apps/xprop
+x11-apps/xrandr
+x11-libs/cairo
+x11-misc/xdotool
+x11-misc/numlockx
diff --git a/profiles/desktop/x/parent b/profiles/desktop/x/parent
new file mode 100644
index 0000000..eb4d905
--- /dev/null
+++ b/profiles/desktop/x/parent
@@ -0,0 +1 @@
+../
diff --git a/profiles/laptop/parent b/profiles/laptop/parent
index 5b26f1c..99a0cd8 100644
--- a/profiles/laptop/parent
+++ b/profiles/laptop/parent
@@ -1 +1,2 @@
-../desktop
+../desktop/x
+../desktop/wayland
diff --git a/profiles/work-pc/parent b/profiles/work-pc/parent
index f5422db..017b353 100644
--- a/profiles/work-pc/parent
+++ b/profiles/work-pc/parent
@@ -1,5 +1,6 @@
 ../base/amd64
-../desktop
+../desktop/x
+../desktop/wayland
 ../intel
 ../qemu
 ../devel