docs: Update README finally

modules/home/programs/wayland/waybar/default.nix

@@ -46,7 +46,6 @@ in {
               "pulseaudio"
               "cpu"
               "memory"
-              "idle_inhibitor"
             ];
           modules-center =
             []
@@ -55,6 +54,7 @@ in {
             ]);
           modules-right =
             [
+              "mpd"
               "custom/notifications"
               "tray"
             ]
@@ -117,15 +117,6 @@ in {
             tooltip = true;
           };
 
-          "idle_inhibitor" = {
-            format = "{icon}";
-            format-icons = {
-              activated = "";
-              deactivated = "";
-            };
-            tooltip = "true";
-          };
-
           "niri/workspaces" = lib.mkIf niri.enable (let
             niriMsg = msg: "${lib.getExe niri.package} msg action ${msg}";
           in {
@@ -139,6 +130,16 @@ in {
             on-scroll-down = niriMsg "focus-workspace-down";
           });
 
+          "mpd" = {
+            format = "{stateIcon} {title} - {artist}  ({elapsedTime:%M:%S}/{totalTime:%M:%S})";
+            format-disconnected = "󰝛";
+            format-stopped = "";
+            state-icons = {
+              paused = "";
+              playing = "";
+            };
+          };
+
           "custom/notifications" = let
             swaync-client =
               lib.getExe' config.services.swaync.package "swaync-client";
@@ -234,6 +235,38 @@ in {
             background: transparent;
           }
 
+          tooltip {
+            background: @base00;
+            border: 1px solid @base08;
+            border-radius: 12px;
+          }
+
+          tooltip label {
+            color: @base08;
+          }
+
+          #custom-startmenu {
+            color: @base0B;
+            background: @base02;
+            font-size: 28px;
+            margin: 0;
+            padding: 0 30px 0 15px;
+            border-radius: 0 0 40px 0;
+          }
+
+          #window,
+          #pulseaudio,
+          #cpu,
+          #memory {
+            font-weight: bold;
+            margin: 4px 0;
+            margin-left: 7px;
+            padding: 0 18px;
+            background: @base04;
+            color: @base00;
+            border-radius: 24px 10px 24px 10px;
+          }
+
           #workspaces {
             color: @base00;
             background: @base01;
@@ -274,39 +307,14 @@ in {
             transition: ${transition};
           }
 
-          tooltip {
+          #mpd,
-            background: @base00;
+          #network,
-            border: 1px solid @base08;
+          #battery,
-            border-radius: 12px;
+          #custom-notifications,
-          }
+          #tray,
-
+          #custom-exit {
-          tooltip label {
-            color: @base08;
-          }
-
-          #window, #pulseaudio, #cpu, #memory, #idle_inhibitor {
             font-weight: bold;
-            margin: 4px 0;
+            background: @base0D;
-            margin-left: 7px;
-            padding: 0 18px;
-            background: @base04;
-            color: @base00;
-            border-radius: 24px 10px 24px 10px;
-          }
-
-          #custom-startmenu {
-            color: @base0B;
-            background: @base02;
-            font-size: 28px;
-            margin: 0;
-            padding: 0 30px 0 15px;
-            border-radius: 0 0 40px 0;
-          }
-
-          #network, #battery, #custom-notifications,
-          #tray, #custom-exit {
-            font-weight: bold;
-            background: @base07;
             color: @base00;
             margin: 4px 0;
             margin-right: 7px;

modules/nixos/services/mopidy/default.nix

@@ -14,7 +14,8 @@ in {
 
       extensionPackages = with pkgs; [
         mopidy-mpd
-        mopidy-jellyfin
+        # TODO: Enable once we have secrets (requires password in config)
+        # mopidy-jellyfin
       ];
 
       configuration =

readme.md

@@ -23,15 +23,15 @@ publicly released, therefore things are likely to break.
 
 - [Snowfall Lib](https://snowfall.org/guides/lib/quickstart/)
 - [Home Manager](https://nix-community.github.io/home-manager/)
-- [Rose Pine](https://codewith.babesonthe.net/punkfairie/rose-pine-nix)
+- [Stylix](https://codewith.babesonthe.net/punkfairie/rose-pine-nix)
 
 ## 🐣 Outputs
 
 - _systems:_ System config
+  - _systems/x86_64-linux/nyx:_ My main desktop, running NixOS.
   - _systems/aarch64-darwin/mairley:_ My Macbook Air 2022ish. Main laptop.
 - _homes:_ Home manager config
-  - _homes/x86_64-linux/marley@nyx:_ My main desktop. Currently running Arch Linux
+  - _homes/x86_64-linux/marley@nyx:_ Home configuration for nyx.
-    but will be switched to NixOS once I've finished migrating my dotfiles.
   - _homes/aarch64-darwin/marley@mairley:_ Home configuration for mairley.
 - _modules:_ Most config is done here. The file structure is pretty
   self-explanatory.
@@ -41,16 +41,14 @@ publicly released, therefore things are likely to break.
     - _modules/{home,nixos,darwin}/\<category>/base:_ These are not subject to the
       above, they simply denote options that apply to the whole category.
 - _packages_
+  <!-- TODO: Make the package download the ROM? -->
+  - _packages/CEmu-TI-84-Plus-CE:_ CEmu wrapped to include my config. I believe
+    it still needs the ROM downloaded separately to function.
   - _packages/figlet-xero-fonts:_ Adding in [xero's custom fonts](https://github.com/xero/figlet-fonts/).
+  - _packages/phpstorm-with-node:_ PHPStorm wrapped to give it access to NodeJS.
 
 ## 🫶 Credits
 
-- [jakehamilton/config](https://github.com/jakehamilton/config)
+- [jakehamilton/config](https://github.com/jakehamilton/config) - the general
+  structure of my config was heavily inspired by jakehamilton's.
 - [the nix logo used in this readme](https://lix.systems/)
-
-## ✅ Todo - Preparing to Switch to NixOS
-
-- [x] Migrate Chezmoi dotfiles
-- [x] Migrate ~/.config dotfiles
-- [ ] Migrate ~ dotfiles
-- [ ] Check for any personal files not in ~/data