chore: merge

Author: fbosch

modules/applications/file-management.nix

@@ -5,7 +5,6 @@
       environment.systemPackages = with pkgs; [
         selectdefaultapplication
         nemo-with-extensions
-        sushi
         zip
         libwebp
         libjpeg
@@ -29,7 +28,6 @@
     in
     {
       home.packages = with pkgs; [
-        loupe
         xdg-utils
       ];
 

modules/applications/flatpak.nix

@@ -52,15 +52,10 @@
           "org.gnome.baobab"
           "org.gnome.FileRoller"
           "org.gnome.TextEditor"
-          "org.gnome.Decibels"
           "org.gnome.World.PikaBackup"
           "app.zen_browser.zen"
           "be.alexandervanhee.gradia"
-          "com.plexamp.Plexamp"
           "one.ablaze.floorp"
-          "tv.plex.PlexDesktop"
-          "com.obsproject.Studio"
-          "com.obsproject.Studio.Plugin.OBSVkCapture"
           "org.freedesktop.Platform.VulkanLayer.vkBasalt//25.08"
           "net.lutris.Lutris"
           "net.davidotek.pupgui2"

modules/applications/media.nix

@@ -0,0 +1,39 @@
+{
+  flake.modules.nixos.applications =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = with pkgs; [
+        # File previewer for Nemo file manager
+        sushi
+      ];
+    };
+
+  flake.modules.homeManager.applications =
+    { pkgs, ... }:
+    {
+      home.packages = with pkgs; [
+        # Video players
+        vlc
+
+        # Image viewers
+        loupe # GNOME image viewer
+        swayimg # Wayland image viewer
+
+        # Audio control
+        pavucontrol # PulseAudio volume control
+
+        # Media web apps
+        local.chromium-youtubemusic # YouTube Music
+        local.chromium-synologyphotos # Synology Photos
+      ];
+
+      # Flatpak media applications
+      services.flatpak.packages = [
+        "org.gnome.Decibels" # Audio player
+        "com.plexamp.Plexamp" # Music player
+        "tv.plex.PlexDesktop" # Media center
+        "com.obsproject.Studio" # Video recording/streaming
+        "com.obsproject.Studio.Plugin.OBSVkCapture" # OBS plugin
+      ];
+    };
+}

modules/applications/music.nix

@@ -10,9 +10,4 @@
       jack.enable = true;
     };
   };
-  flake.modules.homeManager.desktop = { pkgs, ... }: {
-    home.packages = with pkgs; [
-      pavucontrol
-    ];
-  };
 }

modules/applications/synology.nix

@@ -12,7 +12,8 @@
       ];
     };
 
-  flake.modules.homeManager.desktop = { pkgs, lib, ... }:
+  flake.modules.homeManager.desktop =
+    { pkgs, lib, ... }:
     let
       inherit (pkgs.stdenv.hostPlatform) system;
     in
@@ -37,7 +38,6 @@
           pkgs.wl-clip-persist
           pkgs.waybar
           pkgs.swaynotificationcenter
-          pkgs.swayimg
           pkgs.libnotify
           pkgs.swayosd
           pkgs.gsettings-desktop-schemas

modules/desktop/audio.nix

@@ -16,9 +16,10 @@ in
 
       # Home Manager SOPS module - works on both NixOS and Darwin
       secrets =
-        { config
-        , lib
-        , ...
+        {
+          config,
+          lib,
+          ...
         }:
         let
           hmConfig = config;
@@ -81,8 +82,9 @@ in
 
     # NixOS-specific SOPS module (system-level secrets)
     nixos.secrets =
-      { config
-      , ...
+      {
+        config,
+        ...
       }:
       let
         nixosConfig = config;
@@ -127,30 +129,32 @@ in
             };
           };
 
-          # Generate .smbcredentials file from SOPS secrets
-          templates."smbcredentials" = {
-            content = ''
-              username=${nixosConfig.sops.placeholder.smb-username}
-              password=${nixosConfig.sops.placeholder.smb-password}
-            '';
-            mode = "0600";
-            owner = flakeConfig.flake.meta.user.username;
-          };
+          templates = {
+            # Generate .smbcredentials file from SOPS secrets
+            "smbcredentials" = {
+              content = ''
+                username=${nixosConfig.sops.placeholder.smb-username}
+                password=${nixosConfig.sops.placeholder.smb-password}
+              '';
+              mode = "0600";
+              owner = flakeConfig.flake.meta.user.username;
+            };
 
-          templates."pihole-webpassword" = {
-            content = ''
-              FTLCONF_webserver_api_password=${nixosConfig.sops.placeholder.pihole-password}
-            '';
-            mode = "0400";
-          };
+            templates."pihole-webpassword" = {
+              content = ''
+                FTLCONF_webserver_api_password=${nixosConfig.sops.placeholder.pihole-password}
+              '';
+              mode = "0400";
+            };
 
-          # Generate nix.conf snippet with GitHub token
-          templates."nix-github-token" = {
-            content = ''
-              access-tokens = github.com=${nixosConfig.sops.placeholder.github-token}
-            '';
-            mode = "0440";
-            group = "wheel";
+            # Generate nix.conf snippet with GitHub token
+            "nix-github-token" = {
+              content = ''
+                access-tokens = github.com=${nixosConfig.sops.placeholder.github-token}
+              '';
+              mode = "0440";
+              group = "wheel";
+            };
           };
         };