From 4142f92236d7a6809030cb23434167132e310daa Mon Sep 17 00:00:00 2001 From: Ward Nakchbandi Date: Mon, 27 Mar 2023 20:45:40 +0300 Subject: [PATCH] fix --- .../10_ubuntu-settings.gsettings-override | 93 ---------- .../90_gnome-settings.gsettings-override | 15 -- .../91_pika-settings.gsettings-override | 61 ------- pika-settings/debian/changelog | 2 +- .../debian/pika-settings.gsettings-override | 171 ++++++++++++++++++ 5 files changed, 172 insertions(+), 170 deletions(-) delete mode 100644 pika-settings/debian/10_ubuntu-settings.gsettings-override delete mode 100644 pika-settings/debian/90_gnome-settings.gsettings-override delete mode 100644 pika-settings/debian/91_pika-settings.gsettings-override create mode 100644 pika-settings/debian/pika-settings.gsettings-override diff --git a/pika-settings/debian/10_ubuntu-settings.gsettings-override b/pika-settings/debian/10_ubuntu-settings.gsettings-override deleted file mode 100644 index 3e97957..0000000 --- a/pika-settings/debian/10_ubuntu-settings.gsettings-override +++ /dev/null @@ -1,93 +0,0 @@ -############ -# global settings # -############ - -[org.gnome.evolution-data-server.calendar] -notify-with-tray=false - -[org.gnome.desktop.session] -session-name = "ubuntu" - -[org.onboard] -layout = 'Compact' -theme = 'Nightshade' -key-label-font = 'Ubuntu' -key-label-overrides = ['RWIN::super-group', 'LWIN::super-group'] -xembed-onboard = true - -[org.onboard.window] -docking-enabled = true -force-to-top = true - -[org.gnome.login-screen] -logo='/usr/share/plymouth/ubuntu-logo.png' - -################################## -# ubuntu common session settings # -################################## - -[org.gnome.shell:ubuntu] -always-show-log-out = true - -[org.gnome.shell.extensions.ding:ubuntu] -show-trash = false -show-volumes = false -start-corner = 'top-left' -arrangeorder = 'DESCENDINGNAME' - -[org.gnome.desktop.background:ubuntu] -show-desktop-icons = true - -[org.gtk.Settings.FileChooser:ubuntu] -sort-directories-first = true -startup-mode = 'cwd' - -# Mirror G-S default experience (in overrides) compared to mutter default -# as we are using a G-S mode, the default overrides aren't used. -[org.gnome.mutter:ubuntu] -attach-modal-dialogs = true -edge-tiling = true -dynamic-workspaces = true -workspaces-only-on-primary = true -focus-change-on-pointer-rest = true - -[org.gnome.desktop.peripherals.touchpad:ubuntu] -tap-to-click = true -click-method = 'default' - -[org.gnome.desktop.wm.keybindings:ubuntu] -show-desktop = ['d','d','d'] -switch-applications = ['Tab'] -switch-windows = ['Tab'] -switch-applications-backward = ['Tab'] -switch-windows-backward = ['Tab'] - -[org.gnome.nautilus.desktop:ubuntu] -home-icon-visible = false - -[org.gnome.nautilus.icon-view:ubuntu] -default-zoom-level = 'small' - -[org.gnome.shell.extensions.desktop-icons:ubuntu] -icon-size = 'small' - -[org.gnome.nautilus.preferences:ubuntu] -open-folder-on-dnd-hover = false - -[org.gnome.rhythmbox.rhythmdb:ubuntu] -monitor-library = true - -[org.gnome.rhythmbox.plugins.alternative_toolbar:ubuntu] -display-type=1 - -[org.gnome.settings-daemon.plugins.print-notifications:ubuntu] -active = false - -[org.gnome.settings-daemon.plugins.background:ubuntu] -active = false - -[org.gnome.software:ubuntu] -first-run = false - -[org.gnome.Terminal.Legacy.Settings:ubuntu] -theme-variant = 'dark' diff --git a/pika-settings/debian/90_gnome-settings.gsettings-override b/pika-settings/debian/90_gnome-settings.gsettings-override deleted file mode 100644 index ac70be7..0000000 --- a/pika-settings/debian/90_gnome-settings.gsettings-override +++ /dev/null @@ -1,15 +0,0 @@ -############ -# 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 diff --git a/pika-settings/debian/91_pika-settings.gsettings-override b/pika-settings/debian/91_pika-settings.gsettings-override deleted file mode 100644 index 3e1aef9..0000000 --- a/pika-settings/debian/91_pika-settings.gsettings-override +++ /dev/null @@ -1,61 +0,0 @@ -################# -# 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' - -[org.gnome.desktop.screensaver] -picture-uri = 'file:///usr/share/backgrounds/pika/can_i_come_in__by_neytirix_ddoss9c.jpg' - -[org.gnome.desktop.wm.preferences] -button-layout = 'appmenu:close' -titlebar-font = 'Fira Sans Semi-Bold 10' -theme = 'Orchis-Yellow-Light' - -[org.gnome.desktop.sound] -theme-name = 'pika' - -[org.gnome.desktop.interface] -gtk-theme = 'Orchis-Yellow-Light' -icon-theme = 'Papirus' -cursor-theme = 'Adwaita' -monospace-font-name = 'Fira Mono 11' -document-font-name = 'Roboto Slab 11' -font-name = 'Fira Sans Semi-Light 10' -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.shell] -enabled-extensions = ['ubuntu-appindicators@ubuntu.com', 'pika-darkmode@pika.com'] - -[org.gnome.shell.extensions.nightthemeswitcher.time] -manual-time-source = true -ondemand-button-placement = 'none' -ondemand-time = 'night' -time-source = 'ondemand' - -[org.gnome.shell.extensions.nightthemeswitcher.gtk-variants] -enabled = true -day = 'Orchis-Yellow-Light' -night = 'Orchis-Yellow-Dark' - -[org.gnome.shell.extensions.nightthemeswitcher.shell-variants] -enabled = true -day = 'Orchis-Yellow-Light' -night = 'Orchis-Yellow-Dark' - -[org.gnome.shell.extensions.nightthemeswitcher.commands] -enabled = true -sunrise = '/usr/lib/pika/gnome-layouts/libadwaita.sh' -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' diff --git a/pika-settings/debian/changelog b/pika-settings/debian/changelog index 57db0c8..7cc9d5f 100644 --- a/pika-settings/debian/changelog +++ b/pika-settings/debian/changelog @@ -1,4 +1,4 @@ -pika-settings (3.0-99pika9) kinetic; urgency=low +pika-settings (3.0-99pika10) kinetic; urgency=low * Fix darkmode themeing diff --git a/pika-settings/debian/pika-settings.gsettings-override b/pika-settings/debian/pika-settings.gsettings-override new file mode 100644 index 0000000..f241643 --- /dev/null +++ b/pika-settings/debian/pika-settings.gsettings-override @@ -0,0 +1,171 @@ +############ +# global settings # +############ + +[org.gnome.evolution-data-server.calendar] +notify-with-tray=false + +[org.gnome.desktop.session] +session-name = "ubuntu" + +[org.onboard] +layout = 'Compact' +theme = 'Nightshade' +key-label-font = 'Ubuntu' +key-label-overrides = ['RWIN::super-group', 'LWIN::super-group'] +xembed-onboard = true + +[org.onboard.window] +docking-enabled = true +force-to-top = true + +[org.gnome.login-screen] +logo='/usr/share/plymouth/ubuntu-logo.png' + +################################## +# ubuntu common session settings # +################################## + +[org.gnome.shell:ubuntu] +always-show-log-out = true + +[org.gnome.shell.extensions.ding:ubuntu] +show-trash = false +show-volumes = false +start-corner = 'top-left' +arrangeorder = 'DESCENDINGNAME' + +[org.gnome.desktop.background:ubuntu] +show-desktop-icons = true + +[org.gtk.Settings.FileChooser:ubuntu] +sort-directories-first = true +startup-mode = 'cwd' + +# Mirror G-S default experience (in overrides) compared to mutter default +# as we are using a G-S mode, the default overrides aren't used. +[org.gnome.mutter:ubuntu] +attach-modal-dialogs = true +edge-tiling = true +dynamic-workspaces = true +workspaces-only-on-primary = true +focus-change-on-pointer-rest = true + +[org.gnome.desktop.peripherals.touchpad:ubuntu] +tap-to-click = true +click-method = 'default' + +[org.gnome.desktop.wm.keybindings:ubuntu] +show-desktop = ['d','d','d'] +switch-applications = ['Tab'] +switch-windows = ['Tab'] +switch-applications-backward = ['Tab'] +switch-windows-backward = ['Tab'] + +[org.gnome.nautilus.desktop:ubuntu] +home-icon-visible = false + +[org.gnome.nautilus.icon-view:ubuntu] +default-zoom-level = 'small' + +[org.gnome.shell.extensions.desktop-icons:ubuntu] +icon-size = 'small' + +[org.gnome.nautilus.preferences:ubuntu] +open-folder-on-dnd-hover = false + +[org.gnome.rhythmbox.rhythmdb:ubuntu] +monitor-library = true + +[org.gnome.rhythmbox.plugins.alternative_toolbar:ubuntu] +display-type=1 + +[org.gnome.settings-daemon.plugins.print-notifications:ubuntu] +active = false + +[org.gnome.settings-daemon.plugins.background:ubuntu] +active = false + +[org.gnome.software:ubuntu] +first-run = false + +[org.gnome.Terminal.Legacy.Settings:ubuntu] +theme-variant = 'dark' + +############ +# 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 + +################# +# 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' + +[org.gnome.desktop.screensaver] +picture-uri = 'file:///usr/share/backgrounds/pika/can_i_come_in__by_neytirix_ddoss9c.jpg' + +[org.gnome.desktop.wm.preferences] +button-layout = 'appmenu:close' +titlebar-font = 'Fira Sans Semi-Bold 10' +theme = 'Orchis-Yellow-Light' + +[org.gnome.desktop.sound] +theme-name = 'pika' + +[org.gnome.desktop.interface] +gtk-theme = 'Orchis-Yellow-Light' +icon-theme = 'Papirus' +cursor-theme = 'Adwaita' +monospace-font-name = 'Fira Mono 11' +document-font-name = 'Roboto Slab 11' +font-name = 'Fira Sans Semi-Light 10' +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.shell] +enabled-extensions = ['ubuntu-appindicators@ubuntu.com', 'pika-darkmode@pika.com'] + +[org.gnome.shell.extensions.nightthemeswitcher.time] +manual-time-source = true +ondemand-button-placement = 'none' +ondemand-time = 'night' +time-source = 'ondemand' + +[org.gnome.shell.extensions.nightthemeswitcher.gtk-variants] +enabled = true +day = 'Orchis-Yellow-Light' +night = 'Orchis-Yellow-Dark' + +[org.gnome.shell.extensions.nightthemeswitcher.shell-variants] +enabled = true +day = 'Orchis-Yellow-Light' +night = 'Orchis-Yellow-Dark' + +[org.gnome.shell.extensions.nightthemeswitcher.commands] +enabled = true +sunrise = '/usr/lib/pika/gnome-layouts/libadwaita.sh' +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'