5 files changed, 77 insertions, 72 deletions
diff --git a/profiles/station/mpv.nix b/profiles/station/mpv.nix
index 71b152c..8271c2f 100644
--- a/profiles/station/mpv.nix
+++ b/profiles/station/mpv.nix
@@ -5,9 +5,9 @@
 }: {
   hm = {
     programs.mpv = {
-        enable = false;
+        enable = !pkgs.stdenv.isDarwin;
         scripts = [
-            (with pkgs; stdenv.mkDerivation rec {
+            (with pkgs; stdenv.mkDerivation {
                pname = "mpv-sockets";
                version = "1.0";
 
diff --git a/profiles/station/music.nix b/profiles/station/music.nix
index 9ab9327..7503ac4 100644
--- a/profiles/station/music.nix
+++ b/profiles/station/music.nix
@@ -1,21 +1,22 @@
 { config, pkgs, lib, ... }: {
+    # TODO: what about secrets on nix-darwin...
     # secrets.mopidy.owner = lib.ivi.username;
-    # hm.home.packages = [pkgs.mpc-cli];
-    # hm.services.mopidy = {
-    #     enable = true;
-    #     extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd];
-    #     settings = {
-    #       mpd = {
-    #     enabled = true;
-    #     hostname = "127.0.0.1";
-    #     port = 6600;
-    #     max_connections = 20;
-    #     connection_timeout = 60;
-    #     };};
-    #     extraConfigFiles = [
-    #       config.secrets.mopidy.path
-    #     ];
-    # };
+    hm.home.packages = [pkgs.mpc-cli];
+    hm.services.mopidy = {
+        enable = !pkgs.stdenv.isDarwin;
+        extensionPackages = with pkgs; [mopidy-spotify mopidy-mpd];
+        settings = {
+          mpd = {
+        enabled = true;
+        hostname = "127.0.0.1";
+        port = 6600;
+        max_connections = 20;
+        connection_timeout = 60;
+        };};
+        extraConfigFiles = [
+          config.secrets.mopidy.path
+        ];
+    };
     hm.programs.ncmpcpp = {
         enable = true;
         bindings = [
diff --git a/profiles/station/nonfree.nix b/profiles/station/nonfree.nix
index 8bee42a..4f0c83c 100644
--- a/profiles/station/nonfree.nix
+++ b/profiles/station/nonfree.nix
@@ -1,4 +1,4 @@
-{pkgs, lib, ...}: {
+{pkgs, lib, ...}: with lib; {
     hm.home.packages = with pkgs; [
         teams
         discord
@@ -18,10 +18,12 @@
           "steam-run"
         ];
 
-    # programs.steam = {
-    #     enable = true;
-    #     remotePlay.openFirewall = true;
-    #     dedicatedServer.openFirewall = true;
-    # };
-    # hardware.opengl.driSupport32Bit = true;
+    programs = optionalAttrs (!pkgs.stdenv.isDarwin) {
+      steam = {
+        enable = true;
+        remotePlay.openFirewall = true;
+        dedicatedServer.openFirewall = true;
+      };
+      hardware.opengl.driSupport32Bit = true;
+    };
 }
diff --git a/profiles/station/packages.nix b/profiles/station/packages.nix
index c9d1af8..e823fb8 100644
--- a/profiles/station/packages.nix
+++ b/profiles/station/packages.nix
@@ -1,50 +1,51 @@
 {
   pkgs,
+  lib,
   ...
-}: {
+}: with lib; {
   hm = {
     home.packages = with pkgs; [
+      (nerdfonts.override {fonts = ["FiraCode"];})
+      noto-fonts
+      noto-fonts-emoji
       k9s
-      # krew
-      # dasel
-      # # initool
-      # python311Packages.editorconfig
-      # gcc
-      # # pkgsi686Linux.glibc
-      # gnumake
-      # raylib
-      # # gdb
-      # maim
-      # calcurse
-      # profanity
-      # file
-      # ueberzug
-      # mypaint
-      # lynx
-      # pstree
-      # pywal
-      # bashInteractive
-      # k9s
-      # powershell
-      # azure-cli
-      # inotify-tools
-      # alejandra
-      # statix
-      # github-cli
-      # lazygit
-      # argocd
-      # bc
-      # # sxiv
-      # nushell
-      # # sent
-      # (nerdfonts.override {fonts = ["FiraCode"];})
-      # noto-fonts
-      # noto-fonts-emoji
-      # # dmenu
-      # # librewolf
-      # # firefox-wayland
-      # # libreoffice
-      # # xclip
+      krew
+      dasel
+      python311Packages.editorconfig
+      gcc
+      gnumake
+      calcurse
+      file
+      ueberzug
+      pstree
+      pywal
+      bashInteractive
+      powershell
+      azure-cli
+      alejandra
+      statix
+      github-cli
+      lazygit
+      argocd
+      bc
+      nushell
+    ] ++ optionals (!pkgs.stdenv.isDarwin) [
+      inotify-tools
+      raylib
+      maim
+      profanity
+      mypaint
+      lynx
+      sxiv
+      sent
+      initool
+      pkgsi686Linux.glibc
+      gdb
+      dmenu
+      librewolf
+      firefox-wayland
+      libreoffice
+      xclip
     ];
   };
 }
diff --git a/profiles/station/suckless.nix b/profiles/station/suckless.nix
index f0742c4..d3941d9 100644
--- a/profiles/station/suckless.nix
+++ b/profiles/station/suckless.nix
@@ -8,7 +8,7 @@
   nixpkgs.overlays = [(import (self + "/overlays/suckless.nix") {inherit pkgs; home = config.ivi.home;})];
   hm = {
     xsession = {
-      enable = false;
+      enable = !pkgs.stdenv.isDarwin;
       initExtra = ''
       ${pkgs.xorg.xmodmap}/bin/xmodmap -e "remove mod1 = Alt_R"
       ${pkgs.xorg.xmodmap}/bin/xmodmap -e "add mod3 = Alt_R"
@@ -18,7 +18,7 @@
     '';
     };
     services.picom = {
-      enable = false;
+      enable = !pkgs.stdenv.isDarwin;
       activeOpacity = 0.99;
       inactiveOpacity = 0.7;
       opacityRules = [
@@ -37,7 +37,7 @@
       };
     };
     services.dunst = {
-      enable = false;
+      enable = !pkgs.stdenv.isDarwin;
       settings = {
         global = {
           monitor = 0;
@@ -70,10 +70,11 @@
       };
     };
     home.packages = with pkgs; [
-      # st
-      # dwm
-      # dwmblocks
       libnotify
+    ] ++ optionals (!pkgs.stdenv.isDarwin) [
+      st
+      dwm
+      dwmblocks
     ];
   };
 }