...

7 files changed, 124 insertions, 12 deletions

diff --git a/hm/soft/czkawka-v11.nix b/hm/soft/czkawka-v11.nix
new file mode 100644
index 0000000..781da99
--- /dev/null
+++ b/hm/soft/czkawka-v11.nix
@@ -0,0 +1,97 @@
+{
+  lib,
+  atk,
+  cairo,
+  callPackage,
+  fetchFromGitHub,
+  gdk-pixbuf,
+  glib,
+  gobject-introspection,
+  gtk4,
+  pango,
+  pkg-config,
+  rustPlatform,
+  stdenv,
+  testers,
+  wrapGAppsHook4,
+  xvfb-run,
+  versionCheckHook,
+}:
+
+let
+  self = rustPlatform.buildRustPackage {
+    pname = "czkawka";
+    version = "11.0.1";
+
+    src = fetchFromGitHub {
+      owner = "qarmin";
+      repo = "czkawka";
+      tag = self.version;
+      hash = "sha256-ke6N3vuKPGolfh6XpAg3/9dtwd09eX53fN2klUwwNwQ=";
+    };
+
+    cargoHash = "sha256-fx2ZH4I2WYCdMgNoKQuBBEJrPjmgTRPeVM2L+TWYn54=";
+
+    nativeBuildInputs = [
+      gobject-introspection
+      pkg-config
+      wrapGAppsHook4
+    ];
+
+    buildInputs = [
+      atk
+      cairo
+      gdk-pixbuf
+      glib
+      gtk4
+      pango
+    ];
+
+    nativeCheckInputs = [ xvfb-run ];
+
+    strictDeps = true;
+
+    doCheck = stdenv.hostPlatform.isLinux && (stdenv.hostPlatform == stdenv.buildPlatform);
+
+    checkPhase = ''
+      runHook preCheck
+      xvfb-run cargo test
+      runHook postCheck
+    '';
+
+    postInstall = ''
+      install -Dm444 -t $out/share/applications data/com.github.qarmin.czkawka.desktop
+      install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka.svg
+      install -Dm444 -t $out/share/icons/hicolor/scalable/apps data/icons/com.github.qarmin.czkawka-symbolic.svg
+      install -Dm444 -t $out/share/metainfo data/com.github.qarmin.czkawka.metainfo.xml
+    '';
+
+    nativeInstallCheckInputs = [ versionCheckHook ];
+    versionCheckProgram = "${placeholder "out"}/bin/czkawka_cli";
+    doInstallCheck = true;
+
+    passthru = {
+      tests.version = testers.testVersion {
+        package = self;
+        command = "czkawka_cli --version";
+      };
+      # Ensure you have a wrapper.nix in the same folder if using this
+      wrapper = callPackage ./wrapper.nix {
+        czkawka = self;
+      };
+    };
+
+    meta = {
+      homepage = "https://github.com/qarmin/czkawka";
+      description = "Simple, fast and easy to use app to remove unnecessary files from your computer";
+      changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md";
+      license = with lib.licenses; [ mit ];
+      mainProgram = "czkawka_gui";
+      maintainers = with lib.maintainers; [
+        yanganto
+        _0x4A6F
+      ];
+    };
+  };
+in
+self
diff --git a/hm/soft/mangohud.nix b/hm/soft/mangohud.nix
index eae15d5..335014c 100644
--- a/hm/soft/mangohud.nix
+++ b/hm/soft/mangohud.nix
@@ -7,6 +7,22 @@ in
   config = lib.mkIf cfg.enable {
     programs.mangohud = {
       enable = true;
+      settings = {
+        table_columns = 4;
+        font_scale = 1.3;
+        cellpadding_y = 0.1;
+        round_corners = 10;
+        fps_limit = 240;
+
+        gpu_temp = true;
+        gpu_core_clock = true;
+
+        cpu_temp = true;
+        cpu_mhz = true;
+
+        fps_metrics = "0.01";
+        wine = true;
+      };
     };
   };
 }
diff --git a/hm/soft/media.nix b/hm/soft/media.nix
index 89cbe13..72ddc64 100644
--- a/hm/soft/media.nix
+++ b/hm/soft/media.nix
@@ -51,7 +51,8 @@ in
       };
     };
     home.packages = with pkgs; [
-      czkawka
+      (callPackage ./czkawka-v11.nix { })
+
       nsxiv
       pinta
       ffmpeg
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index 380d0d5..7967611 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -173,7 +173,7 @@ in
         reload
         mpv-subtitle-lines
         mpv-notify-send
-        mpv-cheatsheet
+        # mpv-cheatsheet
         modernx
         memo
         autosubsync-mpv
@@ -182,9 +182,6 @@ in
       ];
     };
 
-    hm.soft = {
-      media.enable = true;
-      yt-dlp.enable = true;
-    };
+    hm.soft.yt-dlp.enable = true;
   };
 }
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index 52f6cd3..112a82b 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -1,6 +1,7 @@
 {
   inputs,
   config,
+  pkgs,
   lib,
   ...
 }:
@@ -12,6 +13,10 @@ in
 
   options.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration";
   config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      stoat-desktop
+      element-desktop
+    ];
     programs.nixcord = {
       enable = true;
       discord = {
diff --git a/hm/soft/obs.nix b/hm/soft/obs.nix
index 235187c..f28d8ec 100644
--- a/hm/soft/obs.nix
+++ b/hm/soft/obs.nix
@@ -9,6 +9,7 @@ let
 in
 {
   options.hm.soft.obs.enable = lib.mkEnableOption "enables obs video recording and clipping";
+
   config = lib.mkIf cfg.enable {
     programs.obs-studio = {
       enable = true;
@@ -16,11 +17,6 @@ in
         obs-pipewire-audio-capture
       ];
     };
-
     home.packages = [ pkgs.obs-cmd ];
-
-    home.sessionVariables = {
-      OBS_WEBSOCKET_URL = "/run/secrets/obs/password";
-    };
   };
 }
diff --git a/hm/soft/yt-dlp.nix b/hm/soft/yt-dlp.nix
index e50f313..19eeeb4 100644
--- a/hm/soft/yt-dlp.nix
+++ b/hm/soft/yt-dlp.nix
@@ -9,7 +9,7 @@ in
       enable = true;
       settings = {
         format = "bestvideo+bestaudio/best";
-        merge-output-format = "webm";
+        # merge-output-format = "webm";
         prefer-free-formats = true;
 
         paths = "~/dl/yt";