just push it ffs

base/apollo/configuration.nix

@@ -9,7 +9,7 @@
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
     ];
-
+  services.blueman.enable = true;
   programs.steam.enable = true;
   # Bootloader.
   boot.loader.systemd-boot.enable = true;

base/apollo/hardware-configuration.nix

@@ -8,6 +8,17 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
+  hardware.bluetooth = {
+    enable = true;
+    powerOnBoot = true;
+    settings = {
+      General.Experimental = true;
+    };
+    input = { 
+      General.ClassicBondedOnly = false;
+      General.UserspaceHID = true;
+    };
+  };
   boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usbhid" "usb_storage" "sd_mod" "sr_mod" ];
   boot.initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
   boot.kernelModules = [ "kvm-intel" "vfio_virqfd" "vhost-net" "v4l2loopback" ];

base/overrides.nix

@@ -6,6 +6,7 @@
          wine
          gamescope
          antimicrox
+         sc-controller
        ];
 
        extraLibraries =  pkgs: [

flake.lock

@@ -1,12 +1,27 @@
 {
   "nodes": {
+    "blender-bin": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "lastModified": 1739778001,
+        "narHash": "sha256-Pgt9FcqUJD/Mg+L2cMlvKw5z/WNDJRTg2ZvIho/2upE=",
+        "path": "/home/maya/.config/nixos/blender-bin",
+        "type": "path"
+      },
+      "original": {
+        "path": "/home/maya/.config/nixos/blender-bin",
+        "type": "path"
+      }
+    },
     "catppuccin": {
       "inputs": {
         "catppuccin-v1_1": "catppuccin-v1_1",
         "catppuccin-v1_2": "catppuccin-v1_2",
         "home-manager": "home-manager",
         "home-manager-stable": "home-manager-stable",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs_2",
         "nixpkgs-stable": "nixpkgs-stable",
         "nuscht-search": "nuscht-search"
       },
@@ -276,7 +291,7 @@
     "nixgl": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
         "lastModified": 1713543440,
@@ -294,18 +309,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734424634,
+        "lastModified": 1733808091,
-        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "narHash": "sha256-KWwINTQelKOoQgrXftxoqxmKFZb9pLVfnRvK270nkVk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "rev": "a0f3e10d94359665dba45b71b4227b0aeb851f8e",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "id": "nixpkgs",
-        "ref": "nixos-unstable",
+        "ref": "nixos-24.11",
-        "repo": "nixpkgs",
+        "type": "indirect"
-        "type": "github"
       }
     },
     "nixpkgs-lib": {
@@ -337,6 +351,22 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1734424634,
+        "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1660551188,
         "narHash": "sha256-a1LARMMYQ8DPx1BgoI/UN4bXe12hhZkCNqdxNi6uS0g=",
@@ -351,7 +381,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1736012469,
         "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=",
@@ -367,7 +397,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1737370608,
         "narHash": "sha256-hFA6SmioeqvGW/XvZa9bxniAeulksCOcj3kokdNT/YE=",
@@ -428,7 +458,7 @@
         "flake-utils": "flake-utils_3",
         "mnw": "mnw",
         "nil": "nil",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "nmd": "nmd",
         "plugin-aerial-nvim": "plugin-aerial-nvim",
         "plugin-alpha-nvim": "plugin-alpha-nvim",
@@ -3272,11 +3302,12 @@
     },
     "root": {
       "inputs": {
+        "blender-bin": "blender-bin",
         "catppuccin": "catppuccin",
         "home-manager": "home-manager_2",
         "nix-index-database": "nix-index-database",
         "nixgl": "nixgl",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nvf": "nvf"
       }
     },

home/packages.nix

@@ -3,6 +3,7 @@
     prismlauncher
     libgpod
     blender-hip
+    blender-bin.blender_3_3
     libimobiledevice
     mpc
     strawberry

home/waybar/config

@@ -9,8 +9,18 @@
     "position": "top",
     "modules-center": ["group/mpdg"],
     "modules-left": ["group/dtray"],
-    "modules-right": ["battery", "battery#bat1", "battery#bat2", "clock", "wireplumber"],
+    "modules-right": ["battery", "battery#bat1", "battery#bat2", "clock", "group/audio"],
-
+    "cava": {
+        "method": "pipewire",
+        "format-icons" : ["▁", "▂", "▃", "▄", "▅", "▆", "▇", "█" ],
+        "bar_delimiter": 0,
+        "bars": 12,
+        "stereo": false,
+        "hide_on_silence": true,
+        "input_delay": 1,
+        "autosens": 0,
+        "sensitivity": 13,
+    },
 
     "group/dtray": {
     	"orientation": "inherit",
@@ -20,6 +30,10 @@
 	},
     	"modules": ["custom/arrow", "tray"]
     },
+    "group/audio": {
+        "orientation": "inherit",
+        "modules": ["wireplumber", "cava"]
+    },
     "group/mpdg": {
       "orientation": "inherit",
       "drawer": {
@@ -57,6 +71,7 @@
     "mpd": {
       "on-click": "mpc toggle",
       "format-disconnected": "MPD seems to be down",
+      "format-stopped": "Nothing playing!",
       "format": "{title} - {album} - {artist}",
       "format-paused": "{title} - {album} - {artist}",
     },

home/waybar/style.css

@@ -9,7 +9,7 @@ window#waybar {
 	border-radius: 10px;
 }
 #clock,
-#wireplumber,
+#audio,
 #mpd,
 #battery {
 	padding: 5px; 
@@ -65,3 +65,7 @@ window#waybar {
 #battery.charging {
 	background: @mauve;
 }
+#cava {
+        margin-left: 0.2em;
+        color: @mauve;
+}