cleanup: rearrange packages, add libblockdev-crypto3 (#21)

* cleanup: rearrange pkgs, add libblockdev-crypto2 Signed-off-by: K.B.Dharun Krishna <[email protected]> * fix: move back optipng to desktop base module Signed-off-by: K.B.Dharun Krishna <[email protected]> * fix: libblockdev-crypto version Signed-off-by: K.B.Dharun Krishna <[email protected]> * feat: add separate xdg-desktop-portal packages --------- Signed-off-by: K.B.Dharun Krishna <[email protected]>
Vanilla-OS · Nov 27, 2023 · f3fea2b · f3fea2b
1 parent 35c57fd
commit f3fea2b
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 40 deletions.
diff --git a/modules/00-vanilla-apx-gui.yml b/modules/00-vanilla-apx-gui.yml
@@ -10,7 +10,7 @@ modules:
   type: apt
   source:
     packages:
-    - meson
     - build-essential
-    - libadwaita-1-dev
     - gettext
+    - libadwaita-1-dev
+    - meson
diff --git a/modules/00-vanilla-desktop-base.yml b/modules/00-vanilla-desktop-base.yml
@@ -12,9 +12,8 @@ modules:
   type: apt
   source:
     packages:
+    - build-essential
     - dpkg-dev
     - dh-make
-    - build-essential
-    - inkscape
     - librsvg2-bin
     - optipng
diff --git a/modules/00-vanilla-first-setup.yml b/modules/00-vanilla-first-setup.yml
@@ -12,19 +12,19 @@ modules:
   type: apt
   source:
     packages:
-    - dpkg-dev
     - build-essential
     - debhelper
-    - python3
-    - meson
-    - libadwaita-1-dev
-    - gettext
     - desktop-file-utils
-    - make
+    - dpkg-dev
+    - gettext
+    - gir1.2-nma4-1.0
+    - libadwaita-1-dev
     - libjpeg-dev
     - libnm0
+    - libnm-dev
     - libnma0
     - libnma-gtk4-0
-    - gir1.2-nma4-1.0
-    - libnm-dev
     - libnma-gtk4-dev
+    - make
+    - meson
+    - python3
diff --git a/modules/00-vanilla-system-operator.yml b/modules/00-vanilla-system-operator.yml
@@ -36,13 +36,13 @@ modules:
     type: apt
     source:
       packages:
-      - dpkg-dev
       - build-essential
       - debhelper
-      - python3
-      - meson
-      - libadwaita-1-dev
-      - gettext
-      - make
       - desktop-file-utils
+      - dpkg-dev
+      - gettext
+      - libadwaita-1-dev
       - libjpeg-dev
+      - make
+      - meson
+      - python3
diff --git a/modules/100-accessibility.yml b/modules/100-accessibility.yml
@@ -2,11 +2,11 @@ name: accessibility
 type: apt
 source:
   packages:
-  - orca
+  - at-spi2-core
   - brltty
   - espeak-ng
-  - at-spi2-core
   - mousetweaks
+  - orca
 
   - speech-dispatcher
   - speech-dispatcher-espeak-ng
diff --git a/modules/110-fonts.yml b/modules/110-fonts.yml
@@ -5,14 +5,14 @@ source:
   - fonts-cantarell
   - fonts-dejavu-core
   - fonts-freefont-ttf
-  - fonts-noto-color-emoji
   - fonts-indic
   - fonts-kacst-one
   - fonts-khmeros
   - fonts-lao
   - fonts-liberation
   - fonts-lklug-sinhala
   - fonts-noto-cjk
+  - fonts-noto-color-emoji
   - fonts-sil-abyssinica
   - fonts-sil-padauk
   - fonts-thai-tlwg

diff --git a/modules/120-network.yml b/modules/120-network.yml
@@ -3,10 +3,10 @@ type: apt
 source:
   packages:
   - network-manager-gnome
-  - network-manager-openvpn-gnome
   - network-manager-fortisslvpn-gnome
   - network-manager-l2tp-gnome
   - network-manager-openconnect-gnome
+  - network-manager-openvpn-gnome
   - network-manager-ssh-gnome
   - network-manager-vpnc-gnome
 

diff --git a/modules/140-password.yml b/modules/140-password.yml
@@ -2,6 +2,6 @@ name: password
 type: apt
 source:
   packages:
-  - gnome-keyring
   - cracklib-runtime
+  - gnome-keyring
   - ssh-askpass-gnome
diff --git a/modules/160-utilities.yml b/modules/160-utilities.yml
@@ -2,10 +2,10 @@ name: utilities
 type: apt
 source:
   packages:
+  - adwdialog
   - gnome-disk-utility
   - gnome-system-monitor
   - gnome-sushi
   - gnome-software
   - ghostscript
   - zenity
-  - adwdialog
diff --git a/modules/20-gnome-core.yml b/modules/20-gnome-core.yml
@@ -5,14 +5,16 @@ source:
   - gdm3
   - xorg
 
+  - gnome-session
   - gnome-shell
   - gnome-shell-extensions
-  - gnome-session
   - gnome-browser-connector
 
-  - xdg-desktop-portal-gnome
+  - dbus-x11
   - evolution-data-server
-  - mutter
-  - gjs
   - geoclue-2.0
-  - dbus-x11
+  - gjs
+  - mutter
+  - xdg-desktop-portal
+  - xdg-desktop-portal-gnome
+  - xdg-desktop-portal-gtk
diff --git a/modules/200-gnome-common.yml b/modules/200-gnome-common.yml
@@ -6,6 +6,6 @@ source:
   - heif-thumbnailer
 
   - gnome-user-docs
-  - webp-pixbuf-loader
   - rygel
+  - webp-pixbuf-loader
   - yelp
diff --git a/modules/210-libs-extra.yml b/modules/210-libs-extra.yml
@@ -10,8 +10,9 @@ source:
   - ibus-gtk3
   - ibus-gtk4
 
+  - libgdk-pixbuf2.0-bin
   - libglib2.0-bin
+  - libblockdev-crypto3
   - libpam-gnome-keyring
   - libproxy1-plugin-gsettings
   - libwmf0.2-7-gtk
-  - libgdk-pixbuf2.0-bin
diff --git a/modules/30-gnome-essentials.yml b/modules/30-gnome-essentials.yml
@@ -5,9 +5,9 @@ source:
   - nautilus
   - nautilus-share
 
-  - gnome-console
   - gnome-bluetooth
-  - gnome-online-accounts
-  - gnome-menus
   - gnome-color-manager
+  - gnome-console
   - gnome-control-center
+  - gnome-menus
+  - gnome-online-accounts
diff --git a/modules/40-gnome-appearance.yml b/modules/40-gnome-appearance.yml
@@ -3,7 +3,7 @@ type: apt
 source:
   packages:
   - adwaita-icon-theme
-
+
+  - gnome-accessibility-themes
   - gnome-backgrounds
   - gnome-themes-extra
-  - gnome-accessibility-themes
diff --git a/modules/60-media.yml b/modules/60-media.yml
@@ -5,6 +5,6 @@ source:
   - ffmpeg
 
   - gstreamer1.0-alsa
+  - gstreamer1.0-libav
   - gstreamer1.0-plugins-base-apps
   - gstreamer1.0-pulseaudio
-  - gstreamer1.0-libav
diff --git a/modules/90-3d-utils.yml b/modules/90-3d-utils.yml
@@ -2,9 +2,9 @@ name: 3d-utils
 type: apt
 source:
   packages:
-  - steam-devices
-
-  - mesa-vulkan-drivers
   - mesa-vdpau-drivers
+  - mesa-vulkan-drivers
+
+  - steam-devices
 
   - vdpau-driver-all