From 63d12765913a5b8698cbaf4939b5b28b1b77eec0 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 3 Nov 2021 08:13:33 +1100 Subject: [PATCH 1/7] cosmic-dock: init at unstable-2021-11-03 --- .../gnome/extensions/cosmic-dock/default.nix | 31 +++++++++++++++++++ .../gnome/extensions/manuallyPackaged.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/cosmic-dock/default.nix diff --git a/pkgs/desktops/gnome/extensions/cosmic-dock/default.nix b/pkgs/desktops/gnome/extensions/cosmic-dock/default.nix new file mode 100644 index 000000000000000..97b8f76d3ccb771 --- /dev/null +++ b/pkgs/desktops/gnome/extensions/cosmic-dock/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, glib, sassc }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-cosmic-dock"; + version = "unstable-2021-11-03"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-dock"; + # from branch `master_impish` + rev = "acb33c1c25866655e11191a781055ac272acfdc3"; + sha256 = "sha256-MM5E8T6xWamfi7ABgTgG8WmuX0bvdmZHu8bmys1og2k="; + }; + + nativeBuildInputs = [ glib sassc ]; + + makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; + + passthru = { + extensionUuid = "cosmic-dock@system76.com"; + extensionPortalSlug = "cosmic-dock"; + }; + + meta = with lib; { + description = "Cosmic Dock (Pop!_OS fork of Ubuntu Dock)"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ Enzime ]; + homepage = "https://github.com/pop-os/cosmic-dock"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index a08af5734e4717c..5d9785fb8011b30 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -2,6 +2,7 @@ { "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; + "cosmic-dock@system76.com" = callPackage ./cosmic-dock { }; "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; From 64d24bd0791e29416d85a523bed0c1340ef2411a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 3 Nov 2021 08:12:59 +1100 Subject: [PATCH 2/7] cosmic-workspaces: init at unstable-2021-11-03 --- .../extensions/cosmic-workspaces/default.nix | 31 +++++++++++++++++++ .../gnome/extensions/manuallyPackaged.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/cosmic-workspaces/default.nix diff --git a/pkgs/desktops/gnome/extensions/cosmic-workspaces/default.nix b/pkgs/desktops/gnome/extensions/cosmic-workspaces/default.nix new file mode 100644 index 000000000000000..cfca88bc64abe8f --- /dev/null +++ b/pkgs/desktops/gnome/extensions/cosmic-workspaces/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-cosmic-workspaces"; + version = "unstable-2021-11-03"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-workspaces"; + # from branch `master_impish` + rev = "678b34bdcdec14471665b87092ca16f6857dac66"; + sha256 = "sha256-RhdNG9FQRat4mBNfB5G1VflzzyixXfdOUg4BfmPceCQ="; + }; + + nativeBuildInputs = [ glib ]; + + makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; + + passthru = { + extensionUuid = "cosmic-workspaces@system76.com"; + extensionPortalSlug = "cosmic-workspaces"; + }; + + meta = with lib; { + description = "Vertically stacked workspaces (Pop!_OS fork)"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ Enzime ]; + homepage = "https://github.com/pop-os/cosmic-workspaces"; + }; +} diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 5d9785fb8011b30..5dd4120a85518ba 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -3,6 +3,7 @@ "arcmenu@arcmenu.com" = callPackage ./arcmenu { }; "clock-override@gnomeshell.kryogenix.org" = callPackage ./clock-override { }; "cosmic-dock@system76.com" = callPackage ./cosmic-dock { }; + "cosmic-workspaces@system76.com" = callPackage ./cosmic-workspaces { }; "dash-to-panel@jderose9.github.com" = callPackage ./dash-to-panel { }; "drop-down-terminal@gs-extensions.zzrough.org" = callPackage ./drop-down-terminal { }; "EasyScreenCast@iacopodeenosee.gmail.com" = callPackage ./EasyScreenCast { }; From fe87d6180292bec8d09dea32da4130737cacd544 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 3 Nov 2021 19:01:16 +1100 Subject: [PATCH 3/7] pop-desktop-widget: init at unstable-2021-11-03 --- .../gnome/core/pop-desktop-widget/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/desktops/gnome/core/pop-desktop-widget/default.nix diff --git a/pkgs/desktops/gnome/core/pop-desktop-widget/default.nix b/pkgs/desktops/gnome/core/pop-desktop-widget/default.nix new file mode 100644 index 000000000000000..b6d03022a0d6c93 --- /dev/null +++ b/pkgs/desktops/gnome/core/pop-desktop-widget/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchFromGitHub, rustPlatform, lib, pkg-config, glib, gst_all_1, gtk3, libhandy }: + +stdenv.mkDerivation rec { + pname = "pop-desktop-widget"; + version = "unstable-2021-11-03"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "desktop-widget"; + rev = "1652fc89aa16dcf652422c4c3dfe1095e6286b7d"; + sha256 = "sha256-QBQBtBSj+J87yAQhYMOrJTUCee3ebJhVc4Y/7EyBDes="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-/Sa/eImZZ+XeeCJueZOEhAmz0MA9yjW58jbFmXk4HL0="; + }; + + nativeBuildInputs = [ pkg-config glib rustPlatform.cargoSetupHook rustPlatform.rust.cargo ]; + buildInputs = [ gst_all_1.gstreamer gtk3 libhandy ]; + + installFlags = [ "prefix=$(out)" "DESTDIR=" ]; + + meta = with lib; { + description = "GTK desktop settings widget for Pop!_OS"; + maintainers = with maintainers; [ Enzime ]; + license = licenses.mit; + homepage = "https://github.com/pop-os/desktop-widget"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 34cf61bff22971a..89549bfbb6f59aa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31236,6 +31236,8 @@ with pkgs; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; + pop-desktop-widget = callPackage ../desktops/gnome/core/pop-desktop-widget { }; + latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; gnome-themes-extra = gnome.gnome-themes-extra; From 1138af35dc0fe8ecbc0427dd3d721363af83dda8 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 3 Nov 2021 21:22:16 +1100 Subject: [PATCH 4/7] pop-control-center: init at unstable-2021-11-03 --- .../gnome/core/pop-control-center/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/desktops/gnome/core/pop-control-center/default.nix diff --git a/pkgs/desktops/gnome/core/pop-control-center/default.nix b/pkgs/desktops/gnome/core/pop-control-center/default.nix new file mode 100644 index 000000000000000..210869e8103cfe2 --- /dev/null +++ b/pkgs/desktops/gnome/core/pop-control-center/default.nix @@ -0,0 +1,44 @@ +{ lib, fetchFromGitHub, gnome, pop-desktop-widget, grilo }: + +gnome.gnome-control-center.overrideAttrs (old: rec { + pname = "pop-control-center"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "gnome-control-center"; + # from branch `master_impish` + rev = "2dafb76ab69cf4c93e6dd8920c0e10b7cacf0d0f"; + sha256 = "sha256-SSu3eaSB+4dZNQvsOiQiviHqM+eo4PQkNH97oG3xecc="; + }; + + buildInputs = old.buildInputs ++ [ grilo pop-desktop-widget ]; + + patches = let + patchDir = "${src}/debian/patches"; + in old.patches ++ [ + # "${patchDir}/pop/pop-allow-sound-above-100.patch" + "${patchDir}/pop/pop-mouse-accel.patch" + "${patchDir}/pop/pop-shop.patch" + # "${patchDir}/pop/pop-upgrade.patch" + # "${patchDir}/pop/pop-hidpi.patch" + # "${patchDir}/pop/system76-firmware.patch" + "${patchDir}/pop/pop-alert-sound.patch" + "${patchDir}/pop/remove-diagnostics.patch" + # "${patchDir}/pop/gsettings-desktop-schemas-version.patch" + "${patchDir}/pop/0001-mouse-Add-Disable-While-Typing-toggle-for-touchpad.patch" + "${patchDir}/pop/0001-Do-not-enforce-password-strength-requirements.patch" + "${patchDir}/pop/0002-users-Recreate-RunHandler-on-failure.patch" + "${patchDir}/pop/cc-search-locations-dialog.patch" + "${patchDir}/pop/0001-shell-Fix-bug-when-multiple-panels-use-custom-sideba.patch" + "${patchDir}/pop/pop-desktop-widget.patch" + "${patchDir}/pop/pop-no-search.patch" + "${patchDir}/pop/0001-keyboard-Pop-_OS-changes-with-support-for-multiple-b.patch" + ]; + + meta = with lib; { + description = "Modular IPC-based desktop launcher service for Pop!_OS"; + maintainers = with maintainers; [ Enzime ]; + license = licenses.gpl3; + homepage = "https://github.com/pop-os/gnome-control-center"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89549bfbb6f59aa..a44385824b5d43f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31238,6 +31238,8 @@ with pkgs; pop-desktop-widget = callPackage ../desktops/gnome/core/pop-desktop-widget { }; + pop-control-center = callPackage ../desktops/gnome/core/pop-control-center { }; + latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; gnome-themes-extra = gnome.gnome-themes-extra; From 1d3e0785f793b7e6a79269d7966c0a0545578b8f Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 3 Nov 2021 08:12:06 +1100 Subject: [PATCH 5/7] pop-cosmic: init at unstable-2021-11-03 --- .../gnome/extensions/manuallyPackaged.nix | 1 + .../gnome/extensions/pop-cosmic/default.nix | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/desktops/gnome/extensions/pop-cosmic/default.nix diff --git a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix index 5dd4120a85518ba..7b7f4e288724fbc 100644 --- a/pkgs/desktops/gnome/extensions/manuallyPackaged.nix +++ b/pkgs/desktops/gnome/extensions/manuallyPackaged.nix @@ -16,6 +16,7 @@ "no-title-bar@jonaspoehler.de" = callPackage ./no-title-bar { }; "paperwm@hedning:matrix.org" = callPackage ./paperwm { }; "pidgin@muffinmad" = callPackage ./pidgin-im-integration { }; + "pop-cosmic@system76.com" = callPackage ./pop-cosmic { }; "pop-shell@system76.com" = callPackage ./pop-shell { }; "sound-output-device-chooser@kgshank.net" = callPackage ./sound-output-device-chooser { }; "system-monitor@paradoxxx.zero.gmail.com" = callPackage ./system-monitor { }; diff --git a/pkgs/desktops/gnome/extensions/pop-cosmic/default.nix b/pkgs/desktops/gnome/extensions/pop-cosmic/default.nix new file mode 100644 index 000000000000000..8d1f4ef9f9e11fd --- /dev/null +++ b/pkgs/desktops/gnome/extensions/pop-cosmic/default.nix @@ -0,0 +1,31 @@ +{ stdenv, lib, fetchFromGitHub, glib }: + +stdenv.mkDerivation rec { + pname = "gnome-shell-extension-pop-cosmic"; + version = "unstable-2021-11-03"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic"; + # from branch `master_impish` + rev = "fbcaa2c071330a73e7b13b407e8b7fb0251eeace"; + sha256 = "sha256-hgEbGG3ZQwSCeMvu8NiPA6SdO+Y2THD/nEoTzRRxdFs="; + }; + + nativeBuildInputs = [ glib ]; + + makeFlags = [ "XDG_DATA_HOME=$(out)/share" ]; + + passthru = { + extensionUuid = "pop-cosmic@system76.com"; + extensionPortalSlug = "pop-cosmic"; + }; + + meta = with lib; { + description = "Computer Operating System Main Interface Components"; + license = licenses.gpl3Only; + platforms = platforms.linux; + maintainers = with maintainers; [ Enzime ]; + homepage = "https://github.com/pop-os/cosmic"; + }; +} From 69043baca045cf3311465ca48dd0499ae5147ea8 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Wed, 10 Nov 2021 09:06:47 +1100 Subject: [PATCH 6/7] pop-launcher: init at 1.0.3 --- .../core/pop-launcher/custom-base-path.patch | 13 ++++++++ .../gnome/core/pop-launcher/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 48 insertions(+) create mode 100644 pkgs/desktops/gnome/core/pop-launcher/custom-base-path.patch create mode 100644 pkgs/desktops/gnome/core/pop-launcher/default.nix diff --git a/pkgs/desktops/gnome/core/pop-launcher/custom-base-path.patch b/pkgs/desktops/gnome/core/pop-launcher/custom-base-path.patch new file mode 100644 index 000000000000000..2f3e1fb6ab2a6a8 --- /dev/null +++ b/pkgs/desktops/gnome/core/pop-launcher/custom-base-path.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile b/Makefile +index 433728e..065d328 100644 +--- a/Makefile ++++ b/Makefile +@@ -2,7 +2,7 @@ TARGET = debug + DEBUG ?= 0 + + ifeq ($(DESTDIR),) +-BASE_PATH = $(HOME)/.local ++BASE_PATH ?= $(HOME)/.local + LIB_PATH = $(BASE_PATH)/share + else + BASE_PATH = $(DESTDIR)/usr diff --git a/pkgs/desktops/gnome/core/pop-launcher/default.nix b/pkgs/desktops/gnome/core/pop-launcher/default.nix new file mode 100644 index 000000000000000..5a3b6cf842f1337 --- /dev/null +++ b/pkgs/desktops/gnome/core/pop-launcher/default.nix @@ -0,0 +1,33 @@ +{ stdenv, fetchFromGitHub, rustPlatform, lib, pkg-config, openssl, gtk3 }: + +stdenv.mkDerivation rec { + pname = "pop-launcher"; + version = "1.0.3"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "launcher"; + rev = version; + sha256 = "sha256-eo/4ou9cW27IxS5C5l+KV6DU1gbe+Vbv9oVTTHPx0uI="; + }; + + patches = [ ./custom-base-path.patch ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-47s9tE2SImf8VhiKUXI4Kkk0ctamVktCKQsM8WpJOJM="; + }; + + nativeBuildInputs = [ pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo ]; + buildInputs = [ openssl gtk3 ]; + + installFlags = [ "BASE_PATH=$(out)" ]; + + meta = with lib; { + description = "Modular IPC-based desktop launcher service for Pop!_OS"; + maintainers = with maintainers; [ Enzime ]; + license = licenses.mpl20; + homepage = "https://github.com/pop-os/launcher"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a44385824b5d43f..a4f2870b381280d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31240,6 +31240,8 @@ with pkgs; pop-control-center = callPackage ../desktops/gnome/core/pop-control-center { }; + pop-launcher = callPackage ../desktops/gnome/core/pop-launcher { }; + latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; gnome-themes-extra = gnome.gnome-themes-extra; From 23df5f56472414b00582fba0281021da6951fc7a Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sun, 12 Dec 2021 23:25:51 +1100 Subject: [PATCH 7/7] pop-shell-shortcuts: init at unstable-2021-10-02 --- .../core/pop-shell-shortcuts/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/desktops/gnome/core/pop-shell-shortcuts/default.nix diff --git a/pkgs/desktops/gnome/core/pop-shell-shortcuts/default.nix b/pkgs/desktops/gnome/core/pop-shell-shortcuts/default.nix new file mode 100644 index 000000000000000..27154c37c9b9fd8 --- /dev/null +++ b/pkgs/desktops/gnome/core/pop-shell-shortcuts/default.nix @@ -0,0 +1,32 @@ +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, gtk3 }: + +stdenv.mkDerivation rec { + pname = "pop-shell-shortcuts"; + version = "unstable-2021-10-02"; + + src = fetchFromGitHub { + owner = "pop-os"; + repo = "shell-shortcuts"; + rev = "005f76c8e59d924a7edb59a2d08030d439b7fd45"; + sha256 = "sha256-/o6sQ/EieIbZrD7p1dwYOQ+uBsk+zf3vjnPXOcD890Q="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-SySh4/xjP+KnuL3x+IFQUyLgpI3hyshi3h8L5m5ZXOk="; + }; + + nativeBuildInputs = [ pkg-config rustPlatform.cargoSetupHook rustPlatform.rust.cargo ]; + buildInputs = [ gtk3 ]; + + installFlags = [ "prefix=$(out)" "DESTDIR=" ]; + + meta = with lib; { + description = "Application for displaying and demoing Pop Shell shortcuts"; + license = licenses.gpl3Only; + homepage = "https://github.com/pop-os/shell-shortcuts"; + platforms = platforms.linux; + maintainers = with maintainers; [ Enzime ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4f2870b381280d..149729dc8940b9b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31242,6 +31242,8 @@ with pkgs; pop-launcher = callPackage ../desktops/gnome/core/pop-launcher { }; + pop-shell-shortcuts = callPackage ../desktops/gnome/core/pop-shell-shortcuts { }; + latte-dock = libsForQt5.callPackage ../applications/misc/latte-dock { }; gnome-themes-extra = gnome.gnome-themes-extra;