summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO62
-rw-r--r--PKGBUILD7
2 files changed, 46 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25b8777e5e77..96a0ccee7010 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -205,26 +205,48 @@ pkgname = regolith-i3xrocks-config
depends = lm_sensors
depends = curl
depends = networkmanager
- provides = app-launcher
- provides = battery
- provides = bluetooth
- provides = cpu-usage
- provides = disk-capacity
- provides = focused-window-name
- provides = key-indicator
- provides = keyboard-layout
- provides = media-player
- provides = memory
- provides = microphone
- provides = net-traffic
- provides = next-workspace-widget
- provides = nm-vpn
- provides = openvpn
- provides = temp
- provides = time
- provides = volume
- provides = weather
- provides = wifi
+ provides = i3xrocks-app-launcher
+ provides = i3xrocks-battery
+ provides = i3xrocks-bluetooth
+ provides = i3xrocks-cpu-usage
+ provides = i3xrocks-disk-capacity
+ provides = i3xrocks-focused-window-name
+ provides = i3xrocks-info
+ provides = i3xrocks-key-indicator
+ provides = i3xrocks-keyboard-layout
+ provides = i3xrocks-media-player
+ provides = i3xrocks-memory
+ provides = i3xrocks-microphone
+ provides = i3xrocks-net-traffic
+ provides = i3xrocks-next-workspace-widget
+ provides = i3xrocks-nm-vpn
+ provides = i3xrocks-openvpn
+ provides = i3xrocks-temp
+ provides = i3xrocks-time
+ provides = i3xrocks-volume
+ provides = i3xrocks-weather
+ provides = i3xrocks-wifi
+ conflicts = i3xrocks-app-launcher
+ conflicts = i3xrocks-battery
+ conflicts = i3xrocks-bluetooth
+ conflicts = i3xrocks-cpu-usage
+ conflicts = i3xrocks-disk-capacity
+ conflicts = i3xrocks-focused-window-name
+ conflicts = i3xrocks-info
+ conflicts = i3xrocks-key-indicator
+ conflicts = i3xrocks-keyboard-layout
+ conflicts = i3xrocks-media-player
+ conflicts = i3xrocks-memory
+ conflicts = i3xrocks-microphone
+ conflicts = i3xrocks-net-traffic
+ conflicts = i3xrocks-next-workspace-widget
+ conflicts = i3xrocks-nm-vpn
+ conflicts = i3xrocks-openvpn
+ conflicts = i3xrocks-temp
+ conflicts = i3xrocks-time
+ conflicts = i3xrocks-volume
+ conflicts = i3xrocks-weather
+ conflicts = i3xrocks-wifi
pkgname = regolith-styles
pkgdesc = Regolith's themes for i3, gdm, gtk, rofi, plymouth, etc.
diff --git a/PKGBUILD b/PKGBUILD
index 3dcc04c634ad..cc7ccb908adb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -228,7 +228,7 @@ package_regolith-i3xrocks () {
./autogen.sh
./configure --prefix=/usr
make && make DESTDIR="${pkgdir}" install
- move_conf "${srcdir}"/regolith-i3xrocks-config/conf.d/01_setup
+# move_conf "${srcdir}"/regolith-i3xrocks-config/conf.d/01_setup
mkdir -p "${pkgdir}"/etc && install -Dm644 "${srcdir}"/i3xrocks/i3xrocks.conf "${pkgdir}"/etc/i3xrocks.conf
}
@@ -238,7 +238,8 @@ package_regolith-i3xrocks-config () {
license=('GPLv3')
depends=('glibc' 'accountsservice' 'bc' 'ttf-font-awesome' 'sysstat' 'remontoire' 'regolith-i3' 'alsa-utils' 'perl' 'iproute2' 'lm_sensors' 'curl' 'networkmanager')
arch=('any')
- provides=('app-launcher' 'battery' 'bluetooth' 'cpu-usage' 'disk-capacity' 'focused-window-name' 'key-indicator' 'keyboard-layout' 'media-player' 'memory' 'microphone' 'net-traffic' 'next-workspace-widget' 'nm-vpn' 'openvpn' 'temp' 'time' 'volume' 'weather' 'wifi')
+ provides=('i3xrocks-app-launcher' 'i3xrocks-battery' 'i3xrocks-bluetooth' 'i3xrocks-cpu-usage' 'i3xrocks-disk-capacity' 'i3xrocks-focused-window-name' 'i3xrocks-info' 'i3xrocks-key-indicator' 'i3xrocks-keyboard-layout' 'i3xrocks-media-player' 'i3xrocks-memory' 'i3xrocks-microphone' 'i3xrocks-net-traffic' 'i3xrocks-next-workspace-widget' 'i3xrocks-nm-vpn' 'i3xrocks-openvpn' 'i3xrocks-temp' 'i3xrocks-time' 'i3xrocks-volume' 'i3xrocks-weather' 'i3xrocks-wifi')
+ conflicts=('i3xrocks-app-launcher' 'i3xrocks-battery' 'i3xrocks-bluetooth' 'i3xrocks-cpu-usage' 'i3xrocks-disk-capacity' 'i3xrocks-focused-window-name' 'i3xrocks-info' 'i3xrocks-key-indicator' 'i3xrocks-keyboard-layout' 'i3xrocks-media-player' 'i3xrocks-memory' 'i3xrocks-microphone' 'i3xrocks-net-traffic' 'i3xrocks-next-workspace-widget' 'i3xrocks-nm-vpn' 'i3xrocks-openvpn' 'i3xrocks-temp' 'i3xrocks-time' 'i3xrocks-volume' 'i3xrocks-weather' 'i3xrocks-wifi')
cd $srcdir/regolith-i3xrocks-config
@@ -331,7 +332,7 @@ package_regolith-desktop-config () {
python setup.py build
python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
- move_conf "${srcdir}"/regolith-rofication/80_rofication 80_rofication
+# move_conf "${srcdir}"/regolith-rofication/80_rofication 80_rofication
}