From 804bfb7781055ae48499bae7d4b1ca5b14647a44 Mon Sep 17 00:00:00 2001
From: cspark <git@cspark.dev>
Date: Sat, 3 Aug 2024 14:20:33 +0100
Subject: [PATCH] Remove deprecated sound option, add image viewer for niri,
 add desktop files for applications

---
 global-home.nix                                    | 14 ++++----------
 .../.local/share/applications/ncmpcpp.desktop      |  8 ++++++++
 .../.local/share/applications/vieb.desktop         |  9 +++++++++
 .../.local/share/applications/yazi.desktop         | 10 ++++++++++
 modules/nixos/cspark-desktop-niri/module.nix       |  3 ++-
 5 files changed, 33 insertions(+), 11 deletions(-)
 create mode 100644 global-resources/home-manager/.local/share/applications/ncmpcpp.desktop
 create mode 100644 global-resources/home-manager/.local/share/applications/vieb.desktop
 create mode 100644 global-resources/home-manager/.local/share/applications/yazi.desktop

diff --git a/global-home.nix b/global-home.nix
index 7c6d3822..c266033b 100644
--- a/global-home.nix
+++ b/global-home.nix
@@ -58,6 +58,7 @@ in
     firefox
     librewolf
     ungoogled-chromium
+    vieb
     # emacs-gtk
     telegram-desktop
     #(discord.override {
@@ -167,16 +168,9 @@ in
     #   org.gradle.console=verbose
     #   org.gradle.daemon.idletimeout=3600000
     # '';
-      ".local/share/applications/ncmpcpp.desktop".text = ''
-	[Desktop Entry]
-	Name=NCMPCPP
-	Comment=Run ncurses music player CPP
-	Categories=Other;
-	Icon=konsole
-	Type=Application
-	Exec=$TERM -e ncmpcpp
-	Terminal=false
-      '';
+      ".local/share/applications/ncmpcpp.desktop".source = ./global-resources/home-manager/.local/share/applications/ncmpcpp.desktop; 
+      ".local/share/applications/yazi.desktop".source = ./global-resources/home-manager/.local/share/applications/yazi.desktop; 
+      ".local/share/applications/vieb.desktop".source = ./global-resources/home-manager/.local/share/applications/vieb.desktop; 
   };
 
   # Emacs Config Init Service
diff --git a/global-resources/home-manager/.local/share/applications/ncmpcpp.desktop b/global-resources/home-manager/.local/share/applications/ncmpcpp.desktop
new file mode 100644
index 00000000..eab278b9
--- /dev/null
+++ b/global-resources/home-manager/.local/share/applications/ncmpcpp.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=NCMPCPP
+Comment=Run ncurses music player CPP
+Categories=Other;
+Icon=konsole
+Type=Application
+Exec=sh -c "$TERM -e ncmpcpp"
+Terminal=false
diff --git a/global-resources/home-manager/.local/share/applications/vieb.desktop b/global-resources/home-manager/.local/share/applications/vieb.desktop
new file mode 100644
index 00000000..8a09ec33
--- /dev/null
+++ b/global-resources/home-manager/.local/share/applications/vieb.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Categories=Network;WebBrowser
+Exec=vieb --enable-features=UseOzonePlatform --ozone-platform=wayland %U
+GenericName=Web Browser
+Icon=vieb
+MimeType=text/html;application/xhtml+xml;x-scheme-handler/http;x-scheme-handler/https
+Name=Web Browser
+Type=Application
+Version=1.4
diff --git a/global-resources/home-manager/.local/share/applications/yazi.desktop b/global-resources/home-manager/.local/share/applications/yazi.desktop
new file mode 100644
index 00000000..76f71454
--- /dev/null
+++ b/global-resources/home-manager/.local/share/applications/yazi.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Yazi File Manager
+Icon=yazi
+Comment=Blazing fast terminal file manager written in Rust, based on async I/O
+Terminal=false
+Exec=sh -c "$TERM -e yazi %u"
+Type=Application
+MimeType=inode/directory
+Categories=Utility;Core;System;FileTools;FileManager;ConsoleOnly
+Keywords=File;Manager;Explorer;Browser;Launcher
diff --git a/modules/nixos/cspark-desktop-niri/module.nix b/modules/nixos/cspark-desktop-niri/module.nix
index f2b4507b..e26c6aab 100644
--- a/modules/nixos/cspark-desktop-niri/module.nix
+++ b/modules/nixos/cspark-desktop-niri/module.nix
@@ -32,6 +32,7 @@ in
       wev # Clone of X11 xev for wayland
       waybar # Status bar
 
+      swayimg # Image viewer
       lxqt.pcmanfm-qt # File Manager
       lxqt.lxqt-archiver # Archiver
       qt6Packages.qt6ct # Manage QT6 Themes
@@ -74,7 +75,7 @@ in
     services.printing.enable = true;
 
     # Enable sound with pipewire.
-    sound.enable = true;
+    # sound.enable = true; Deprecated option
     hardware.pulseaudio.enable = false;
     security.rtkit.enable = true;
     services.pipewire = {