Merge branch cosmic-testing

Author: sandptel

debian/control

@@ -197,49 +197,49 @@ Package: regolith-i3-control-center-regolith
 Architecture: any
 Depends: ${misc:Depends},
   regolith-wm-config,
-  regolith-control-center,
-  gnome-settings-daemon
+  cosmic-settings,
+  cosmic-session
 Provides: regolith-wm-control-center
 Conflicts: regolith-wm-gnome, regolith-i3-control-center-gnome
 Replaces: regolith-wm-gnome, regolith-i3-control-center-gnome
-Description: regolith and gnome integrations for system management
- Launch regolith settings app for system management.
+Description: regolith and cosmic integrations for system management
+ Launch cosmic settings app for system management.
 
 Package: regolith-sway-control-center-regolith
 Architecture: any
 Depends: ${misc:Depends},
   regolith-wm-config,
-  regolith-control-center,
-  gnome-settings-daemon
+  cosmic-settings,
+  cosmic-session
 Provides: regolith-wm-control-center
 Conflicts: regolith-wm-gnome, regolith-sway-control-center-gnome
 Replaces: regolith-wm-gnome, regolith-sway-control-center-gnome
-Description: regolith and gnome integrations for system management
- Launch regolith settings app for system management.
+Description: regolith and cosmic integrations for system management
+ Launch cosmic settings app for system management.
 
 Package: regolith-sway-control-center-gnome
 Architecture: any
 Depends: ${misc:Depends},
   regolith-wm-config,
-  gnome-control-center,
-  gnome-settings-daemon
+  cosmic-settings,
+  cosmic-session
 Provides: regolith-wm-control-center
 Conflicts: regolith-wm-gnome, regolith-sway-control-center-regolith
 Replaces: regolith-wm-gnome, regolith-sway-control-center-regolith
-Description: regolith and gnome integrations for system management
- Launch gnome settings app for system management.
+Description: regolith and cosmic integrations for system management
+ Launch cosmic settings app for system management.
 
 Package: regolith-i3-control-center-gnome
 Architecture: any
 Depends: ${misc:Depends},
   regolith-wm-config,
-  gnome-control-center,
-  gnome-settings-daemon
+  cosmic-settings,
+  cosmic-session
 Provides: regolith-wm-control-center
 Conflicts: regolith-wm-gnome, regolith-i3-control-center-regolith
 Replaces: regolith-wm-gnome, regolith-i3-control-center-regolith
-Description: gnome integrations for system management
- Launch gnome settings app for system management.
+Description: cosmic integrations for system management
+ Launch cosmic settings app for system management.
 
 Package: regolith-i3-next-workspace
 Architecture: any
@@ -328,7 +328,7 @@ Depends: ${misc:Depends},
   regolith-displayd (>=0.3.0),
   regolith-wm-config (>=4.6.1)
 Description: Configuration for providing functionality equivalent
-  to gnome-settings-daemon.
+  to gnome-settings-daemon using cosmic components.
 
 Package: regolith-sway-media-keys
 Architecture: any
@@ -352,13 +352,15 @@ Depends: ${misc:Depends},
     file,
     jq,
     trawlcat,
+    cosmic-bg,
     regolith-wm-config
-Description: Configuration for providing media key functionality
+Description: Configuration for providing cosmic background functionality
 
 
 Package: regolith-sway-polkit
 Architecture: any
 Depends: ${misc:Depends},
+    cosmic-osd,
     mate-polkit-bin,
     regolith-wm-config
 Conflicts: regolith-sway-polkit-xwayland
@@ -375,17 +377,17 @@ Description: Configuration for providing media key functionality
 Package: regolith-sway-gtklock
 Architecture: any
 Depends: ${misc:Depends},
-    gtklock,
-    trawlcat,
+    cosmic-session,
     regolith-wm-config,
-Description: Configuration for using gtklock as the default locker
+Description: Configuration for using cosmic-session lock as the default locker
 
 Package: regolith-sway-audio-idle-inhibit
 Architecture: any
 Depends: ${misc:Depends},
     sway-audio-idle-inhibit,
+    cosmic-idle,
     regolith-wm-config
-Description: Prevent sway from entering idle state if audio is playing
+Description: Prevent sway from entering idle state using cosmic-idle
 
 Package: regolith-sway-unclutter
 Architecture: any

debian/regolith-cosmic-idle.install

@@ -0,0 +1 @@
+usr/share/regolith/sway/config.d/82_cosmic_idle

debian/regolith-cosmic-settings-daemon.install

@@ -0,0 +1 @@
+/usr/share/regolith/sway/config.d/76_cosmic_settings_daemon

debian/regolith-sway-gtklock.install

@@ -1 +1 @@
-usr/share/regolith/sway/config.d/42_gtklock
+usr/share/regolith/sway/config.d/42_gtk_lock

etc/regolith/sway/config

@@ -179,6 +179,8 @@ include $HOME/.config/regolith3/common-wm/config.d/*
 # Include any user wm partials
 include $HOME/.config/regolith3/sway/config.d/*
 
+include $HOME/.config/regolith3/sway/cosmic-settings/generated-config.d/*
+
 # Start the systemd target manually is the session is not started by systemd
 # Notify systemd about successful session start otherwise
 exec --no-startup-id [ -z "${NOTIFY_SOCKET-}" ] \

scripts/regolith-sway-clamshell

@@ -25,7 +25,7 @@ get_lid_close_cmd() {
   local LOCK=$( trawlcat wm.program.lock "$DEFAULT_LOCK")
   local SLEEP=$( trawlcat wm.program.sleep "systemctl suspend" )
   local HIBERNATE=$( trawlcat wm.program.hibernate "systemctl hibernate" )
-  local SHUTDOWN=$( trawlcat wm.program.shutdown "gnome-session-quit --power-off --no-prompt")
+  local SHUTDOWN=$( trawlcat wm.program.shutdown "systemctl poweroff")
 
   case "$1" in
     "DO_NOTHING")

usr/share/regolith/i3/config.d/60_config_keybindings

@@ -1,33 +1,52 @@
-###############################################################################
+########################## Launch // File Browser // <><Shift> n ##
+set_from_resource $wm.binding.files wm.binding.files Shift+n
+set_from_resource $wm.program.files wm.program.files cosmic-files
+bindsym $mod+$wm.binding.files exec --no-startup-id $wm.program.files###################################################
 # System Management
 ###############################################################################
 
 ## Modify // Settings // <> c ##
 set_from_resource $wm.binding.settings wm.binding.settings c
-set_from_resource $wm.program.settings wm.program.settings regolith-control-center
+set_from_resource $wm.program.settings wm.program.settings cosmic-settings
 bindsym $mod+$wm.binding.settings exec --no-startup-id $wm.program.settings
 
 ## Modify // Display Settings // <> d ##
 set_from_resource $wm.binding.display wm.binding.display d
-set_from_resource $wm.program.display wm.program.display regolith-control-center display
+set_from_resource $wm.program.display wm.program.display cosmic-settings displays
 bindsym $mod+$wm.binding.display exec --no-startup-id $wm.program.display
 
 ## Modify // Wifi Settings // <> w ##
 set_from_resource $wm.binding.wifi wm.binding.wifi w
-set_from_resource $wm.program.wifi wm.program.wifi regolith-control-center wifi
+set_from_resource $wm.program.wifi wm.program.wifi cosmic-settings wireless
 bindsym $mod+$wm.binding.wifi exec --no-startup-id $wm.program.wifi
 
 ## Modify // Bluetooth Settings // <> b ##
 set_from_resource $wm.binding.bluetooth wm.binding.bluetooth b
-set_from_resource $wm.program.bluetooth wm.program.bluetooth regolith-control-center bluetooth
+set_from_resource $wm.program.bluetooth wm.program.bluetooth cosmic-settings bluetooth
 bindsym $mod+$wm.binding.bluetooth exec --no-startup-id $wm.program.bluetooth
 
+## Modify // Sound Settings // <><Shift> a ##
+set_from_resource $wm.binding.sound wm.binding.sound Shift+a
+set_from_resource $wm.program.sound wm.program.sound cosmic-settings sound
+bindsym $mod+$wm.binding.sound exec --no-startup-id $wm.program.sound
+
+## Modify // Power Settings // <><Shift> p ##
+set_from_resource $wm.binding.power wm.binding.power Shift+p
+set_from_resource $wm.program.power wm.program.power cosmic-settings power
+bindsym $mod+$wm.binding.power exec --no-startup-id $wm.program.power
+
+## Modify // Appearance Settings // <><Shift> t ##
+set_from_resource $wm.binding.appearance wm.binding.appearance Shift+t
+set_from_resource $wm.program.appearance wm.program.appearance cosmic-settings appearance
+bindsym $mod+$wm.binding.appearance exec --no-startup-id $wm.program.appearance
+
 ## Launch // File Browser // <><Shift> n ##
 set_from_resource $wm.binding.files wm.binding.files Shift+n
-set_from_resource $wm.program.files wm.program.files /usr/bin/nautilus --new-window
+set_from_resource $wm.program.files wm.program.files cosmic-files
 bindsym $mod+$wm.binding.files exec --no-startup-id $wm.program.files
 
-for_window [class="regolith-control-center"] floating enable
+for_window [class="cosmic-settings"] floating enable
 
-set_from_resource $wm.program.media-keys wm.program.media-keys /usr/libexec/gnome-flashback-media-keys
-exec --no-startup-id $wm.program.media-keys
+# cosmic alternative to be added
+# set_from_resource $wm.program.media-keys wm.program.media-keys /usr/libexec/gnome-flashback-media-keys
+# exec --no-startup-id $wm.program.media-keys

usr/share/regolith/i3/config.d/60_gnome_config_keybindings

@@ -4,30 +4,30 @@
 
 ## Modify // Settings // <> c ##
 set_from_resource $wm.binding.settings wm.binding.settings c
-set_from_resource $wm.program.settings wm.program.settings gnome-control-center
+set_from_resource $wm.program.settings wm.program.settings cosmic-settings
 bindsym $mod+$wm.binding.settings exec --no-startup-id $wm.program.settings
 
 ## Modify // Display Settings // <> d ##
 set_from_resource $wm.binding.display wm.binding.display d
-set_from_resource $wm.program.display wm.program.display gnome-control-center display
+set_from_resource $wm.program.display wm.program.display cosmic-settings displays
 bindsym $mod+$wm.binding.display exec --no-startup-id $wm.program.display
 
 ## Modify // Wifi Settings // <> w ##
 set_from_resource $wm.binding.wifi wm.binding.wifi w
-set_from_resource $wm.program.wifi wm.program.wifi gnome-control-center wifi
+set_from_resource $wm.program.wifi wm.program.wifi cosmic-settings wireless
 bindsym $mod+$wm.binding.wifi exec --no-startup-id $wm.program.wifi
 
 ## Modify // Bluetooth Settings // <> b ##
 set_from_resource $wm.binding.bluetooth wm.binding.bluetooth b
-set_from_resource $wm.program.bluetooth wm.program.bluetooth gnome-control-center bluetooth
+set_from_resource $wm.program.bluetooth wm.program.bluetooth cosmic-settings bluetooth
 bindsym $mod+$wm.binding.bluetooth exec --no-startup-id $wm.program.bluetooth
 
 ## Launch // File Browser // <><Shift> n ##
 set_from_resource $wm.binding.files wm.binding.files Shift+n
-set_from_resource $wm.program.files wm.program.files /usr/bin/nautilus --new-window
+set_from_resource $wm.program.files wm.program.files cosmic-files
 bindsym $mod+$wm.binding.files exec --no-startup-id $wm.program.files
 
-for_window [class="gnome-control-center"] floating enable
+for_window [class="cosmic-settings"] floating enable
 
-set_from_resource $wm.program.media-keys wm.program.media-keys /usr/libexec/gnome-flashback-media-keys
+set_from_resource $wm.program.media-keys wm.program.media-keys cosmic-session
 exec --no-startup-id $wm.program.media-keys

usr/share/regolith/sway/config.d/55_session_keybindings

@@ -1,4 +1,3 @@
-###############################################################################
 # Session Management
 ###############################################################################
 
@@ -24,23 +23,28 @@ bindsym $mod+$wm.binding.refresh exec $wm.program.refresh_ui
 
 ## Session // Logout // <><Shift> e ##
 set_from_resource $wm.binding.logout wm.binding.logout Shift+e
-set_from_resource $wm.program.logout wm.program.logout /usr/bin/gnome-session-quit --logout --no-prompt && swaymsg exit
+set_from_resource $wm.program.logout wm.program.logout loginctl logout && swaymsg exit
 set_from_resource $sway.prompt.logout sway.prompt.logout "swaynag -t warning -m 'Do you really want to logout?' -b 'Logout' '$wm.program.logout'"
 bindsym $mod+$wm.binding.logout exec $sway.prompt.logout 
 
 ## Session // Reboot // <><Shift> b ##
 set_from_resource $wm.binding.reboot wm.binding.reboot Shift+b
-set_from_resource $wm.program.reboot wm.program.reboot /usr/bin/gnome-session-quit --reboot --no-prompt
+set_from_resource $wm.program.reboot wm.program.reboot loginctl reboot
 set_from_resource $sway.prompt.reboot sway.prompt.reboot "swaynag -t warning -m 'Do you really want to reboot your system?' -b 'Reboot' '$wm.program.reboot'"
 bindsym $mod+$wm.binding.reboot exec $sway.prompt.reboot 
 
 ## Session // Power Down // <><Shift> p ##
 set_from_resource $wm.binding.shutdown wm.binding.shutdown Shift+p
-set_from_resource $wm.program.shutdown wm.program.shutdown /usr/bin/gnome-session-quit --power-off --no-prompt
+set_from_resource $wm.program.shutdown wm.program.shutdown loginctl poweroff
 set_from_resource $sway.prompt.shutdown sway.prompt.shutdown "swaynag -t warning -m 'Do you really want to shutdown' -b 'Shutdown' '$wm.program.shutdown'"
 bindsym $mod+$wm.binding.shutdown exec $sway.prompt.shutdown 
 
+## Session // Lock Screen // <> Escape ##
+set_from_resource $wm.binding.lock wm.binding.lock Escape
+set_from_resource $wm.program.lock wm.program.lock loginctl lock-session
+bindsym $mod+$wm.binding.lock exec $wm.program.lock
+
 ## Session // Sleep // <><Shift> s ##
 set_from_resource $wm.binding.sleep wm.binding.sleep Shift+s
-set_from_resource $wm.program.sleep wm.program.sleep systemctl suspend
+set_from_resource $wm.program.sleep wm.program.sleep loginctl suspend
 bindsym --locked $mod+$wm.binding.sleep exec $wm.program.sleep

usr/share/regolith/sway/config.d/60_config_keybindings

@@ -1,30 +1,44 @@
-###############################################################################
 # System Management
 ###############################################################################
 
 ## Modify // Settings // <> c ##
 set_from_resource $wm.binding.settings wm.binding.settings c
-set_from_resource $wm.program.settings wm.program.settings regolith-control-center
+set_from_resource $wm.program.settings wm.program.settings cosmic-settings
 bindsym $mod+$wm.binding.settings exec --no-startup-id $wm.program.settings
 
 ## Modify // Display Settings // <> d ##
 set_from_resource $wm.binding.display wm.binding.display d
-set_from_resource $wm.program.display wm.program.display regolith-control-center display
+set_from_resource $wm.program.display wm.program.display cosmic-settings displays
 bindsym $mod+$wm.binding.display exec --no-startup-id $wm.program.display
 
 ## Modify // Wifi Settings // <> w ##
 set_from_resource $wm.binding.wifi wm.binding.wifi w
-set_from_resource $wm.program.wifi wm.program.wifi regolith-control-center wifi
+set_from_resource $wm.program.wifi wm.program.wifi cosmic-settings wireless
 bindsym $mod+$wm.binding.wifi exec --no-startup-id $wm.program.wifi
 
 ## Modify // Bluetooth Settings // <> b ##
 set_from_resource $wm.binding.bluetooth wm.binding.bluetooth b
-set_from_resource $wm.program.bluetooth wm.program.bluetooth regolith-control-center bluetooth
+set_from_resource $wm.program.bluetooth wm.program.bluetooth cosmic-settings bluetooth
 bindsym $mod+$wm.binding.bluetooth exec --no-startup-id $wm.program.bluetooth
 
+## Modify // Sound Settings // <><Shift> a ##
+set_from_resource $wm.binding.sound wm.binding.sound Shift+a
+set_from_resource $wm.program.sound wm.program.sound cosmic-settings sound
+bindsym $mod+$wm.binding.sound exec --no-startup-id $wm.program.sound
+
+## Modify // Power Settings // <><Shift> p ##
+set_from_resource $wm.binding.power wm.binding.power Shift+p
+set_from_resource $wm.program.power wm.program.power cosmic-settings power
+bindsym $mod+$wm.binding.power exec --no-startup-id $wm.program.power
+
+## Modify // Appearance Settings // <><Shift> t ##
+set_from_resource $wm.binding.appearance wm.binding.appearance Shift+t
+set_from_resource $wm.program.appearance wm.program.appearance cosmic-settings appearance
+bindsym $mod+$wm.binding.appearance exec --no-startup-id $wm.program.appearance
+
 ## Launch // File Browser // <><Shift> n ##
 set_from_resource $wm.binding.files wm.binding.files Shift+n
-set_from_resource $wm.program.files wm.program.files /usr/bin/nautilus --new-window
+set_from_resource $wm.program.files wm.program.files cosmic-files
 bindsym $mod+$wm.binding.files exec --no-startup-id $wm.program.files
 
-for_window [app_id="org.regolith.Settings"] floating enable
+for_window [app_id="com.system76.CosmicSettings"] floating enable