diff --git a/home/terminal/beets.nix b/home/terminal/beets.nix
new file mode 100644
index 0000000..3bd1ea8
--- /dev/null
+++ b/home/terminal/beets.nix
@@ -0,0 +1,85 @@
+{ pkgs, lib, ... }:
+let
+  inherit (lib) concatStringsSep listToAttrs;
+  plugins = [
+    "convert"
+    "chroma"
+    "inline"
+    "fish"
+    "fetchart"
+    "lastgenre"
+    "scrub"
+    "duplicates"
+    "info"
+    "missing"
+    "unimported"
+    "badfiles"
+  ];
+in
+{
+  config = {
+    programs.beets = {
+      package = pkgs.beets.override {
+        pluginOverrides = listToAttrs (
+          map (name: {
+            value.enable = true;
+            inherit name;
+          }) plugins
+        );
+      };
+      settings = {
+        plugins = concatStringsSep " " plugins;
+        per_disc_numbering = "yes";
+        asciify_paths = true;
+        convert = {
+          auto = "yes";
+          format = "flac";
+          never_convert_lossy_files = "yes";
+        };
+        fetchart = {
+          auto = true;
+          cover_format = "jpg";
+          maxwidth = 500;
+          minwidth = 500;
+          enforce_ratio = true;
+          high_resolution = true;
+        };
+        duplicates = {
+          count = true;
+        };
+        lastgenre = {
+          auto = "yes";
+          count = 5;
+          separator = ";";
+        };
+        replace = {
+          "[\\\\/]" = "_";
+          "^\\." = "_";
+          "[\\x00-\\x1f]" = "_";
+          "\\.$" = "_";
+          "\\s+$" = "";
+          "^\\s+" = "";
+          "^-" = "_";
+        };
+        import = {
+          incremental = "yes";
+          bell = "yes";
+          languages = "en";
+        };
+        item_fields = {
+          disc_and_track = "u'%02i.%02i' % (disc, track) if disctotal > 1 else u'%02i' % (track)";
+          primary_albumartist = # python
+            ''
+              if albumartist.lower().strip().startswith(albumartists[0].lower().strip()):
+                  return albumartists[0]
+              else:
+                 return None
+            '';
+        };
+        paths = {
+          default = "%ifdef{primary_albumartist, $primary_albumartist, $albumartist}/$album%aunique{}/$disc_and_track - $artist - $title";
+        };
+      };
+    };
+  };
+}
diff --git a/home/terminal/default.nix b/home/terminal/default.nix
index 6525127..59b2e9d 100644
--- a/home/terminal/default.nix
+++ b/home/terminal/default.nix
@@ -6,5 +6,6 @@
     ./fish
     ./btop.nix
     ./hyfetch.nix
+    ./beets.nix
   ];
 }
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index 8d6cd5e..bc6b447 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -82,7 +82,7 @@
     sway.enable = true;
     hyprland.enable = true;
     pulseview.enable = true;
-
+    steam.enable = true;
     gnupg.agent = {
       enable = true;
       enableSSHSupport = true;
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index 9b87394..16be415 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -30,7 +30,7 @@
         enable = true;
         nix-direnv.enable = true;
       };
-
+      beets.enable = true;
       waybar.enable = true;
       rofi.enable = true;
       vscode.enable = true;