fix

pika-settings/debian/10_ubuntu-settings.gsettings-override

@@ -1,6 +1,6 @@
-###################
+############
 # global settings #
-###################
+############
 
 [org.gnome.evolution-data-server.calendar]
 notify-with-tray=false
@@ -32,7 +32,7 @@ always-show-log-out = true
 [org.gnome.shell.extensions.ding:ubuntu]
 show-trash = false
 show-volumes = false
-start-corner = 'bottom-right'
+start-corner = 'top-left'
 arrangeorder = 'DESCENDINGNAME'
 
 [org.gnome.desktop.background:ubuntu]

pika-settings/debian/90_gnome-settings.gsettings-override

@@ -0,0 +1,15 @@
+############
+# Gnome settings #
+############
+
+[org.gnome.desktop.interface]
+enable-animations = true
+font-antialiasing ='rgba'
+font-hinting = 'full'
+color-scheme = 'prefer-dark'
+
+[org.gnome.desktop.peripherals.mouse]
+accel-profile = 'flat'
+
+[org.gnome.mutter]
+check-alive-timeout = 30000

pika-settings/debian/91_pika-settings.gsettings-override

@@ -1,11 +1,13 @@
-#########################
+#################
 # PikaOS Gnome settings #
-#########################
+#################
+
+[org.pika.layouts]
+pika-theme = 2
 
 [org.gnome.desktop.background]
 picture-uri = 'file:///usr/share/backgrounds/pika/can_i_come_in__by_neytirix_ddoss9c.jpg'
 picture-uri-dark = 'file:///usr/share/backgrounds/pika/can_i_come_in__by_neytirix_ddoss9c.jpg'
-show-desktop-icons = false
 
 [org.gnome.desktop.screensaver]
 picture-uri = 'file:///usr/share/backgrounds/pika/can_i_come_in__by_neytirix_ddoss9c.jpg'
@@ -25,17 +27,11 @@ cursor-theme = 'Adwaita'
 monospace-font-name = 'Fira Mono 11'
 document-font-name = 'Roboto Slab 11'
 font-name = 'Fira Sans Semi-Light 10'
-enable-animations = true
-font-antialiasing ='rgba'
-font-hinting = 'full'
 color-scheme = 'prefer-dark'
 
 [org.gnome.shell]
 favorite-apps = ['pika-installer.desktop', 'pika-welcome-welcome.desktop', 'firefox.desktop', 'repoman.desktop', 'mintinstall.desktop', 'mintupdate.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Settings.desktop', 'org.gnome.Terminal.desktop', 'gnome-system-monitor.desktop']
 
-[org.gnome.desktop.peripherals.mouse]
-accel-profile = 'flat'
-
 [org.gnome.shell]
 enabled-extensions = ['ubuntu-appindicators@ubuntu.com', 'pika-darkmode@pika.com']
 
@@ -63,6 +59,3 @@ sunset = '/usr/lib/pika/gnome-layouts/libadwaita.sh dark'
 [org.gnome.shell.extensions.arcmenu]
 custom-menu-button-icon = '/usr/share/pixmaps/pika-mono-logo.png'
 menu-button-icon = 'Custom_Icon'
-
-[org.gnome.mutter]
-check-alive-timeout = 30000

pika-settings/debian/changelog

@@ -1,4 +1,4 @@
-pika-settings (3.0-99pika8) kinetic; urgency=low
+pika-settings (3.0-99pika9) kinetic; urgency=low
 
   * Fix darkmode themeing
 

pika-settings/debian/data/usr/share/ubuntu-wayland/applications/info.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=TeXInfo
-Comment=The viewer for TexInfo documents
-Exec=info
-Icon=dialog-information
-NoDisplay=true
-Type=Application
-Categories=Utility;Documentation;ConsoleOnly;
-Terminal=true
-X-Desktop-File-Install-Version=0.24
-X-Ubuntu-Gettext-Domain=ubuntu-default-launchers

pika-settings/debian/data/usr/share/ubuntu-wayland/applications/texdoctk.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=TeXdoctk
-Exec=texdoctk
-Type=Application
-Terminal=false
-Categories=Settings;
-NoDisplay=true
-X-Ubuntu-Gettext-Domain=ubuntu-default-launchers

pika-settings/debian/data/usr/share/ubuntu/applications/info.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=TeXInfo
-Comment=The viewer for TexInfo documents
-Exec=info
-Icon=dialog-information
-NoDisplay=true
-Type=Application
-Categories=Utility;Documentation;ConsoleOnly;
-Terminal=true
-X-Desktop-File-Install-Version=0.24
-X-Ubuntu-Gettext-Domain=ubuntu-default-launchers

pika-settings/debian/data/usr/share/ubuntu/applications/texdoctk.desktop

@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=TeXdoctk
-Exec=texdoctk
-Type=Application
-Terminal=false
-Categories=Settings;
-NoDisplay=true
-X-Ubuntu-Gettext-Domain=ubuntu-default-launchers

pika-settings/debian/pika-settings.install

@@ -0,0 +1,2 @@
+usr
+etc

pika-settings/debian/rules

@@ -1,15 +1,7 @@
 #!/usr/bin/make -f
 
-export PKG_ROOT = debian/pika-settings
+override_dh_installgsettings:
+	dh_installgsettings --priority=50
 
 %:
 	dh $@
-	
-override_dh_install:
-	dh_install
-	mkdir -p $(PKG_ROOT)
-	mkdir -p $(PKG_ROOT)/usr/share
-	cp -r debian/data/usr $(PKG_ROOT)/
-	cp -r debian/data/etc $(PKG_ROOT)/
-	ln -sf /usr/share/ubuntu $(PKG_ROOT)/usr/share/pika
-	ln -sf /usr/share/ubuntu-wayland $(PKG_ROOT)/usr/share/pika-wayland

pika-settings/etc/xdg/autostart/pika-theme.desktop

@@ -0,0 +1,4 @@
+[Desktop Entry]
+Type=Application
+Name=Pika Theme Setup
+Exec=pika-theme-setup

pika-settings/usr/bin/pika-theme-setup

@@ -0,0 +1,23 @@
+#! /bin/bash
+if dconf read /org/pika/layouts/pika-theme | grep 2
+then
+dconf write /org/pika/layouts/pika-theme 1
+dconf write /org/gnome/desktop/wm/preferences/titlebar-font "'Fira Sans Semi-Bold 10'"
+dconf write /org/gnome/desktop/sound/theme-name "'pika'"
+dconf write /org/gnome/desktop/interface/icon-theme "'Papirus'"
+dconf write /org/gnome/desktop/interface/monospace-font-name "'Fira Mono 11'"
+dconf write /org/gnome/desktop/interface/document-font-name "'Roboto Slab 11'"
+dconf write /org/gnome/desktop/interface/font-name "'Fira Sans Semi-Light 10'"
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/enabled true
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunrise "'/usr/lib/pika/gnome-layouts/libadwaita.sh'"
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/commands/sunset "'/usr/lib/pika/gnome-layouts/libadwaita.sh dark'"
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/day "'Orchis-Yellow-Light'"
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/gtk-variants/night "'Orchis-Yellow-Dark'"
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/day "'Orchis-Yellow-Light'"
+dconf write /org/gnome/shell/extensions/nightthemeswitcher/shell-variants/night "'Orchis-Yellow-Dark'"
+echo '#! /bin/bash' > $HOME/.config/pika_theme || touch $HOME/.config/pika_theme && echo '#! /bin/bash' > $HOME/.config/pika_theme
+echo 'KVANTUM_THEME_DARK=Orchis-dark' >> $HOME/.config/pika_theme
+echo 'KVANTUM_THEME_LIGHT=Orchis' >> $HOME/.config/pika_theme
+echo 'GTK_THEME_PATH_DARK=/usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Dark >> $HOME/.config/pika_theme
+echo 'GTK_THEME_PATH_LIGHT=/usr/share/themes/$(dconf read /org/gnome/desktop/interface/gtk-theme | 'sed \"s+\'++\"' | 'sed \"s+\'++\"' | 'sed \"s+-Dark++\"' | 'sed \"s+-Light++\"')'-Light >> $HOME/.config/pika_theme
+fi