diff --git a/overlays/default.nix b/overlays/default.nix index 8719bb5..f456a19 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,6 +3,7 @@ rec { all = [ scripts themes + (import ../pkgs) new-packages lib_extended disko @@ -33,14 +34,12 @@ rec { } ); - new-packages = ( - final: prev: { - dhist = inputs.dhist.packages.${prev.system}.dhist; - demoji = inputs.demoji.packages.${prev.system}.default; - tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; - wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; - } - ); + new-packages = final: prev: { + dhist = inputs.dhist.packages.${prev.system}.dhist; + demoji = inputs.demoji.packages.${prev.system}.default; + tlauncher = inputs.tlauncher.packages.${prev.system}.tlauncher; + wl-crosshair = inputs.wl-crosshair.packages.${prev.system}.default; + }; lib_extended = ( final: prev: { diff --git a/pkgs/default.nix b/pkgs/default.nix new file mode 100644 index 0000000..43bf28e --- /dev/null +++ b/pkgs/default.nix @@ -0,0 +1,7 @@ +final: prev: +let + inherit (final) callPackage; +in +{ + draw-on-your-screen2 = callPackage ./draw-on-your-screen2 { }; +} diff --git a/pkgs/draw-on-your-screen2/default.nix b/pkgs/draw-on-your-screen2/default.nix new file mode 100644 index 0000000..8c9466c --- /dev/null +++ b/pkgs/draw-on-your-screen2/default.nix @@ -0,0 +1,21 @@ +{ fetchFromGitHub, stdenv }: + +stdenv.mkDerivation { + pname = "draw-on-your-screen"; + version = "unstable-2024-06-18"; + + src = fetchFromGitHub { + owner = "zhrexl"; + repo = "DrawOnYourScreen2"; + rev = "9b5c6633a1c2b8c5b35bac45276ad1302542ab9b"; + hash = "sha256-J4ljx3HBe+86PGOIIgabtj8AuUAf88/bpTfRXowUng4="; + }; + + installPhase = '' + mkdir -p $out/share/gnome-shell/extensions/draw-on-your-screen2@zhrexl.github.com + cp -r ./* $out/share/gnome-shell/extensions/draw-on-your-screen2@zhrexl.github.com + + mkdir -p $out/share/glib-2.0/ + cp -r ./schemas/ $out/share/glib-2.0/ + ''; +} diff --git a/user/gnome.nix b/user/gnome.nix index 443f1fe..ae43e76 100644 --- a/user/gnome.nix +++ b/user/gnome.nix @@ -40,6 +40,8 @@ lib.mkIf (config.my.desktop == "gnome") { libsForQt5.qtstyleplugin-kvantum qt6Packages.qt6ct qt6Packages.qtstyleplugin-kvantum + + draw-on-your-screen2 ]; services.gpg-agent.pinentryPackage = pkgs.pinentry-gnome3;