From 72e82deb5536a88b6438a708b3e825029f621d14 Mon Sep 17 00:00:00 2001
From: spl3g <spleefer6@yandex.ru>
Date: Mon, 21 Aug 2023 09:14:28 +0000
Subject: damn

---
 pkgs/default.nix                       |  9 +++-----
 pkgs/minicava/default.nix              | 41 ++++++++++++++++++++++++++++++++++
 pkgs/sddm-sugar-dark-theme/default.nix | 28 +++++++++++++++++++++++
 pkgs/sddm-sugar-dark/default.nix       | 28 -----------------------
 4 files changed, 72 insertions(+), 34 deletions(-)
 create mode 100644 pkgs/minicava/default.nix
 create mode 100644 pkgs/sddm-sugar-dark-theme/default.nix
 delete mode 100644 pkgs/sddm-sugar-dark/default.nix

(limited to 'pkgs')

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 8580f6d..281bcf9 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1,7 +1,4 @@
-# Custom packages, that can be defined similarly to ones from nixpkgs
-# You can build them using 'nix build .#example' or (legacy) 'nix-build -A example'
-
-{ pkgs ? (import ../nixpkgs.nix) { } }: {
-  # example = pkgs.callPackage ./example { };
-  sddm-sugar-dark-theme = pkgs.libsForQt5.callPackage ./sddm-sugar-dark { };
+{ pkgs ? import <nixpkgs> { } }: {
+  sddm-sugar-dark-theme = pkgs.libsForQt5.callPackage ./sddm-sugar-dark-theme { };
+  minicava = pkgs.callPackage ./minicava { };  
 }
diff --git a/pkgs/minicava/default.nix b/pkgs/minicava/default.nix
new file mode 100644
index 0000000..800dab3
--- /dev/null
+++ b/pkgs/minicava/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, makeWrapper
+, cava
+, gnused
+}:
+
+with lib;
+
+stdenv.mkDerivation {
+  pname = "minicava";
+  version = "0.1";
+  src = fetchFromGitHub {
+    owner = "Misterio77";
+    repo = "minicava";
+    rev = "c24681fe7c91548e0fb4f55a1882b0145c48d097";
+    sha256 = "sha256-t+NHZP2I7clDHrnCDdYMaLcua7inVKm2t3aYZ3uBAlk=";
+  };
+
+  dontBuild = true;
+  dontConfigure = true;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    install -Dm 0755 minicava.sh $out/bin/minicava
+    wrapProgram $out/bin/minicava --set PATH \
+      "${makeBinPath [
+        cava
+        gnused
+      ]}"
+  '';
+
+  meta = {
+    description = "A miniature cava sound visualizer";
+    homepage = "https://github.com/Misterio77/minicava";
+    license = licenses.mit;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/sddm-sugar-dark-theme/default.nix b/pkgs/sddm-sugar-dark-theme/default.nix
new file mode 100644
index 0000000..6d06ac1
--- /dev/null
+++ b/pkgs/sddm-sugar-dark-theme/default.nix
@@ -0,0 +1,28 @@
+{ lib, stdenv, fetchFromGitHub, qtsvg, qtquickcontrols2, qtgraphicaleffects }:
+
+stdenv.mkDerivation {
+  pname = "sddm-sugar-dark-theme";
+  version = "1.2";
+
+  src = fetchFromGitHub {
+    owner = "MarianArlt";
+    repo = "sddm-sugar-dark";
+    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
+    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
+  };
+  propagatedBuildInputs = [
+    qtsvg
+    qtquickcontrols2
+    qtgraphicaleffects
+  ];
+  dontWrapQtApps = true;
+  postInstall = ''
+    mkdir -p $out/share/sddm/themes/sugar-dark
+    mv * $out/share/sddm/themes/sugar-dark/
+  '';
+  postFixup = ''
+    echo ${qtgraphicaleffects} >> $out/nix-support/propageted-user-env-packages
+    echo ${qtsvg} >> $out/nix-support/propageted-user-env-packages
+    echo ${qtquickcontrols2} >> $out/nix-support/propageted-user-env-packages
+  '';
+}
diff --git a/pkgs/sddm-sugar-dark/default.nix b/pkgs/sddm-sugar-dark/default.nix
deleted file mode 100644
index 6d06ac1..0000000
--- a/pkgs/sddm-sugar-dark/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, stdenv, fetchFromGitHub, qtsvg, qtquickcontrols2, qtgraphicaleffects }:
-
-stdenv.mkDerivation {
-  pname = "sddm-sugar-dark-theme";
-  version = "1.2";
-
-  src = fetchFromGitHub {
-    owner = "MarianArlt";
-    repo = "sddm-sugar-dark";
-    rev = "ceb2c455663429be03ba62d9f898c571650ef7fe";
-    sha256 = "0153z1kylbhc9d12nxy9vpn0spxgrhgy36wy37pk6ysq7akaqlvy";
-  };
-  propagatedBuildInputs = [
-    qtsvg
-    qtquickcontrols2
-    qtgraphicaleffects
-  ];
-  dontWrapQtApps = true;
-  postInstall = ''
-    mkdir -p $out/share/sddm/themes/sugar-dark
-    mv * $out/share/sddm/themes/sugar-dark/
-  '';
-  postFixup = ''
-    echo ${qtgraphicaleffects} >> $out/nix-support/propageted-user-env-packages
-    echo ${qtsvg} >> $out/nix-support/propageted-user-env-packages
-    echo ${qtquickcontrols2} >> $out/nix-support/propageted-user-env-packages
-  '';
-}
-- 
cgit v1.2.3