header order changed, multimedia

hosts/miniserver/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   version = "23.11";
   myEmail = "CaptainJawZ@outlook.com";

hosts/server/configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 let
   version = "23.11";
   myEmail = "CaptainJawZ@outlook.com";

hosts/workstation/configuration.nix

@@ -20,6 +20,7 @@ in {
       fonts.enable = true;
       gaming.enable = true;
       internet.enable = true;
+      multimedia.enable = true;
       office.enable = true;
     };
     dev = {
@@ -95,44 +96,32 @@ in {
       };
       jawz = {
         packages = (with pkgs; [
-          blanket # background noise
-          pika-backup # backups
-          metadata-cleaner # remove any metadata and geolocation from files
-          # sequeler # friendly SQL client
-          # czkawka # duplicate finder
-          # celeste # sync tool for any cloud provider
-
-          easyeffects # equalizer
-          celluloid # video player
-          # cozy # audiobooks player
-          # hakuneko # manga & comic GUI downloader
-          # gnome-podcasts # podcast player
-          handbrake # video converter, may be unnecessary
-          curtail # image compressor
-          pitivi # video editor
-          identity # compare images or videos
-          gnome-obfuscate # censor private information
-          mousai # poor man shazam
-          tagger # tag music files
           obs-studio # screen recorder & streamer
-          shortwave # listen to world radio
+          pitivi # video editor
+
+          # celeste # sync tool for any cloud provider
+          # czkawka # duplicate finder
+          # sequeler # friendly SQL client
+          blanket # background noise
+          metadata-cleaner # remove any metadata and geolocation from files
+          pika-backup # backups
+          gnome-obfuscate # censor private information
 
           unstable.yt-dlp # downloads videos from most video websites
           gallery-dl # similar to yt-dlp but for most image gallery websites
 
+          (ripgrep.override { withPCRE2 = true; }) # modern grep
+          du-dust # rusty du similar to gdu
+          eza # like ls but with colors
           fd # modern find, faster searches
+          ffmpeg_5-full # not ffmpreg, the coolest video conversion tool!
           fzf # fuzzy finder! super cool and useful
           gdu # disk-space utility checker, somewhat useful
-          du-dust # rusty du similar to gdu
-          (ripgrep.override { withPCRE2 = true; }) # modern grep
-          trash-cli # oop! did not meant to delete that
-          eza # like ls but with colors
           gocryptfs # encrypted filesystem! shhh!!!
-          rmlint # probably my favourite app, amazing dupe finder that integrates well with BTRFS
           imagemagick # photoshop what??
-
+          rmlint # probably my favourite app, amazing dupe finder that integrates well with BTRFS
-          ffmpeg_5-full # not ffmpreg, the coolest video conversion tool!
           torrenttools # create torrent files from the terminal!
+          trash-cli # oop! did not meant to delete that
           vcsi # video thumbnails for torrents, can I replace it with ^?
 
           (writeScriptBin "tasks" (builtins.readFile ../../scripts/tasks.sh))

modules/apps.nix

@@ -7,6 +7,7 @@
     ./apps/fonts.nix
     ./apps/gaming.nix
     ./apps/internet.nix
+    ./apps/multimedia.nix
     ./apps/office.nix
   ];
   my = {
@@ -17,6 +18,7 @@
       fonts.enable = lib.mkDefault false;
       gaming.enable = lib.mkDefault false;
       internet.enable = lib.mkDefault false;
+      multimedia.enable = lib.mkDefault false;
       office.enable = lib.mkDefault false;
     };
   };

modules/apps/art.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, unstable, ... }:
+{ config, lib, pkgs, unstable, ... }:
 let
   unstable = import
     (builtins.fetchTarball "https://github.com/nixos/nixpkgs/tarball/master") {

modules/apps/dictionaries.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, unstable, ... }:
+{ config, lib, pkgs, unstable, ... }:
 
 {
   options.my.apps.dictionaries.enable = lib.mkEnableOption "enable";

modules/apps/fonts.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, unstable, ... }:
+{ config, lib, pkgs, unstable, ... }:
 
 {
   options.my.apps.fonts.enable = lib.mkEnableOption "enable";

modules/apps/gaming.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.my.apps.gaming.enable = lib.mkEnableOption "enable";

modules/apps/internet.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, unstable, ... }:
+{ config, lib, pkgs, unstable, ... }:
 
 {
   options.my.apps.internet.enable = lib.mkEnableOption "enable";

modules/apps/multimedia.nix

@@ -0,0 +1,20 @@
+{ config, lib, pkgs, ... }:
+
+{
+  options.my.apps.multimedia.enable = lib.mkEnableOption "enable";
+  config = lib.mkIf config.my.apps.multimedia.enable {
+    users.users.jawz.packages = with pkgs; ([
+      # cozy # audiobooks player
+      # gnome-podcasts # podcast player
+      # hakuneko # manga & comic GUI downloader
+      celluloid # video player
+      curtail # image compressor
+      easyeffects # equalizer
+      handbrake # video converter, may be unnecessary
+      identity # compare images or videos
+      mousai # poor man shazam
+      shortwave # listen to world radio
+      tagger # tag music files
+    ]);
+  };
+}

modules/apps/office.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, unstable, ... }:
+{ config, lib, pkgs, unstable, ... }:
 
 {
   options.my.apps.office.enable = lib.mkEnableOption "enable";

modules/dev/haskell.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.my.dev.haskell.enable = lib.mkEnableOption "enable";

modules/dev/nix.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.my.dev.nix.enable = lib.mkEnableOption "enable";

modules/dev/python.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.my.dev.python.enable = lib.mkEnableOption "enable";

modules/services/network.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.my.services.network.enable = lib.mkEnableOption "enable";

modules/services/nvidia.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 {
   options.my.services.nvidia.enable = lib.mkEnableOption "enable";

modules/services/printing.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 let printingDrivers = [ pkgs.hplip pkgs.hplipWithPlugin ];
 in {
   options.my.services.printing.enable = lib.mkEnableOption "enable";

modules/services/sound.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, lib, ... }:
+{ config, lib, pkgs, ... }:
 # let
 #   nixGaming = import (builtins.fetchTarball
 #     "https://github.com/fufexan/nix-gaming/archive/master.tar.gz");