Modules: Fix typos

home/modules/git/default.nix

@@ -11,7 +11,7 @@ in {
   options.modules.git = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf git.enable {
-    home.programs.git = {
+    programs.git = {
       enable = true;
 
       # userEmail = "christoph.urlacher@protonmail.com";

home/modules/mpd/default.nix

@@ -11,61 +11,81 @@ in {
   options.modules.mpd = import ./options.nix {inherit lib mylib;};
 
   config = lib.mkIf mpd.enable {
-    services.mpd = {
+    services = {
-      enable = true;
+      mpd = {
-      dataDir = "${config.home.homeDirectory}/Music/.mpd";
+        enable = true;
-      musicDirectory = "${config.home.homeDirectory}/Music";
+        dataDir = "${config.home.homeDirectory}/Music/.mpd";
-      network = {
+        musicDirectory = "${config.home.homeDirectory}/Music";
-        listenAddress = "127.0.0.1"; # Listen on all addresses: "any"
+        network = {
-        port = 6600;
+          listenAddress = "127.0.0.1"; # Listen on all addresses: "any"
+          port = 6600;
+        };
+        extraArgs = ["--verbose"];
+
+        extraConfig = ''
+          # Refresh the database whenever files in the musicDirectory change
+          auto_update "yes"
+
+          # Don't start playback after startup
+          restore_paused "yes"
+
+          # Use track tags on shuffle and album tags on album play (auto)
+          # Use album's tags (album)
+          # Use track's tags (track)
+          # replaygain "auto"
+
+          # PipeWire main output
+          audio_output {
+            type "pipewire"
+            name "PipeWire Sound Server"
+
+            # Use hardware mixer instead of software volume filter
+            # Alternative: replaygain_handler "software"
+            # mixer_type "hardware"
+            # replay_gain_handler "mixer"
+          }
+
+          # FiFo output for cava visualization
+          audio_output {
+            type   "fifo"
+            name   "my_fifo"
+            path   "/tmp/mpd.fifo"
+            format "44100:16:2"
+          }
+
+          # Pre-cache 1GB of the queue
+          # input_cache {
+          #   size "1 GB"
+          # }
+
+          # If mpd should follow symlinks pointing outside the musicDirectory
+          # follow_outside_symlinks "no"
+
+          # If mpd should follow symlinks pointing inside the musicDirectory
+          # follow_inside_symlinks "yes"
+        '';
       };
-      extraArgs = ["--verbose"];
 
-      extraConfig = ''
+      # MPD integration with mpris (used by player-ctl).
-        # Refresh the database whenever files in the musicDirectory change
+      # We want to use mpris as it also supports other players (e.g. Spotify) or browsers.
-        auto_update "yes"
+      mpd-mpris = {
+        enable = true;
+        mpd.useLocal = true;
+      };
 
-        # Don't start playback after startup
+      mpd-discord-rpc = {
-        restore_paused "yes"
+        enable = true;
 
-        # Use track tags on shuffle and album tags on album play (auto)
+        # NOTE: Bitch wants to create a default config file inside a
-        # Use album's tags (album)
+        #       read-only filesystem when changing settings here...
-        # Use track's tags (track)
+        # settings = {
-        # replaygain "auto"
+        #   hosts = "127.0.0.1:${builtins.toString config.services.mpd.network.port}";
-
+        #   format = {
-        # PipeWire main output
+        #     details = "$title";
-        audio_output {
+        #     state = "On $album by $artist";
-          type "pipewire"
+        #   };
-          name "PipeWire Sound Server"
+        # };
-
+      };
-          # Use hardware mixer instead of software volume filter (replaygain_handler "software")
-          # mixer_type "hardware"
-          # replay_gain_handler "mixer"
-        }
-
-        # FiFo output for cava visualization
-        audio_output {
-          type   "fifo"
-          name   "my_fifo"
-          path   "/tmp/mpd.fifo"
-          format "44100:16:2"
-        }
-
-        # Pre-cache 1GB of the queue
-        # input_cache {
-        #   size "1 GB"
-        # }
-
-        # follow_outside_symlinks "no" # If mpd should follow symlinks pointing outside the musicDirectory
-        # follow_inside_symlinks "yes" # If mpd should follow symlinks pointing inside the musicDirectory
-      '';
     };
   };
-
-  # MPD integration with mpris (used by player-ctl).
-  # We want to use mpris as it also supports other players (e.g. Spotify) or browsers.
-  services.mpd-mpris = {
-    enable = true;
-    mpd.useLocal = true;
-  };
 }