[kodi] jellyfin > jellyfin-media-player

Add 3D printing home role with orca-slicer and openscad
Create a new home-manager role for 3D printing applications including orca-slicer for slicing and openscad-unstable for 3D modeling. Enable the role in the desktop configuration for full-featured experience.
2025-12-07 20:53:59 -08:00 · 2025-12-06 19:22:37 -08:00 · 2025-12-06 13:58:26 -08:00 · 2025-12-05 14:58:11 -08:00 · 2025-12-05 14:44:23 -08:00 · 2025-12-05 14:20:49 -08:00
7 changed files with 90 additions and 47 deletions
--- a/home/home-desktop.nix
+++ b/home/home-desktop.nix
@@ -8,6 +8,7 @@

  # Enable all desktop roles for full-featured experience
  home.roles = {
+    "3d-printing".enable = true;
    base.enable = true;
    desktop.enable = true;
    office.enable = true;
--- a/home/roles/3d-printing/default.nix
+++ b/home/roles/3d-printing/default.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.home.roles."3d-printing";
+in
+{
+  options.home.roles."3d-printing" = {
+    enable = mkEnableOption "Enable 3D printing applications and tools";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      # 3D Slicing Software
+      orca-slicer  # G-code generator for 3D printers (Bambu, Prusa, Voron, etc.)
+
+      # 3D Modeling Software
+      openscad-unstable  # 3D parametric model compiler (nightly build)
+    ];
+  };
+}
--- a/home/roles/aerospace/default.nix
+++ b/home/roles/aerospace/default.nix
@@ -298,7 +298,7 @@ in
        gaps = {
          outer = {
            top = 0;
-            bottom = 40;
+            bottom = 38;
            left = 0;
            right = 0;
          };
@@ -337,8 +337,8 @@ in
        FOCUSED=0xff285577

        # Background colors matching i3blocks bar
-        BAR_BG=0xcc000000          # Semi-transparent black
-        ITEM_BG=0xff333333         # Dark gray for inactive items
+        BAR_BG=0xff333333          # Dark gray
+        ITEM_BG=0xff333333         # Dark gray matching bar

        # Text colors
        TEXT=0xffffffff            # White text
@@ -351,29 +351,32 @@ in
        # Configure the bar appearance
        ${pkgs.sketchybar}/bin/sketchybar --bar \
            position=bottom \
-            height=32 \
+            height=30 \
            color=$BAR_BG \
            border_width=0 \
            corner_radius=0 \
            padding_left=10 \
-            padding_right=10
+            padding_right=10 \
+            shadow=off \
+            topmost=on \
+            sticky=on

        # Set default properties for all items
        # Using monospace font to match waybar's Fira Code styling
        ${pkgs.sketchybar}/bin/sketchybar --default \
            updates=when_shown \
-            icon.font="SF Mono:Regular:13.0" \
+            icon.font="Fira Code:Regular:13.0" \
            icon.color=$TEXT \
            icon.padding_left=4 \
            icon.padding_right=4 \
-            label.font="SF Mono:Regular:13.0" \
+            label.font="Fira Code:Regular:13.0" \
            label.color=$TEXT \
            label.padding_left=4 \
            label.padding_right=4 \
            padding_left=4 \
            padding_right=4 \
-            background.corner_radius=5 \
-            background.height=24
+            background.corner_radius=0 \
+            background.height=30

        # Register aerospace workspace change event
        ${pkgs.sketchybar}/bin/sketchybar --add event aerospace_workspace_change
@@ -390,11 +393,12 @@ in
            ${pkgs.sketchybar}/bin/sketchybar --add item space.$sid left \
                --subscribe space.$sid aerospace_workspace_change \
                --set space.$sid \
+                    drawing=on \
                    update_freq=2 \
                    width=32 \
                    background.color=$ITEM_BG \
-                    background.corner_radius=5 \
-                    background.height=20 \
+                    background.corner_radius=0 \
+                    background.height=30 \
                    background.drawing=on \
                    icon="$display" \
                    icon.padding_left=13 \
@@ -405,15 +409,6 @@ in
                    script="$PLUGIN_DIR/aerospace.sh $sid"
        done

-        # Separator after workspaces
-        ${pkgs.sketchybar}/bin/sketchybar --add item separator_left left \
-            --set separator_left \
-                icon="" \
-                label="" \
-                background.drawing=off \
-                padding_left=10 \
-                padding_right=10
-
        # System monitoring modules (right side)
        # Note: Items added to 'right' appear in reverse order (last added = leftmost)
        # Adding in reverse to get: disk | cpu | memory | battery | volume | calendar
@@ -425,14 +420,6 @@ in
                       background.drawing=on \
                       script="$PLUGIN_DIR/calendar.sh"

-        ${pkgs.sketchybar}/bin/sketchybar --add item separator_media right \
-            --set separator_media \
-                icon="|" \
-                label="" \
-                background.drawing=off \
-                padding_left=5 \
-                padding_right=5
-
        ${pkgs.sketchybar}/bin/sketchybar --add item volume right \
                   --set volume \
                       background.color=$ITEM_BG \
@@ -448,14 +435,6 @@ in
                       script="$PLUGIN_DIR/battery.sh" \
                   --subscribe battery system_woke power_source_change

-        ${pkgs.sketchybar}/bin/sketchybar --add item separator_sys right \
-            --set separator_sys \
-                icon="|" \
-                label="" \
-                background.drawing=off \
-                padding_left=5 \
-                padding_right=5
-
        ${pkgs.sketchybar}/bin/sketchybar --add item memory right \
                   --set memory \
                       update_freq=5 \
@@ -528,8 +507,15 @@ in
        # Get list of empty workspaces
        EMPTY_WORKSPACES=$(${pkgs.aerospace}/bin/aerospace list-workspaces --monitor all --empty)

-        # Clean up the workspace number parameter
-        WORKSPACE_NUM=$(echo "$1" | tr -d ' \n\r')
+        # Get workspace number - from $1 if provided (event-triggered), otherwise extract from $NAME (routine update)
+        # $NAME is always available (e.g., "space.1", "space.2", etc.)
+        # $1 is only available when called via event trigger with positional argument
+        if [ -n "$1" ]; then
+            WORKSPACE_NUM=$(echo "$1" | tr -d ' \n\r')
+        else
+            # Extract number from item name: "space.1" -> "1", "space.10" -> "10"
+            WORKSPACE_NUM=$(echo "$NAME" | sed 's/space\.//')
+        fi

        # Check if workspace has windows (is NOT empty)
        IS_EMPTY=false
@@ -543,37 +529,55 @@ in
            IS_FOCUSED=true
        fi

+        # Determine display value (workspace 10 displays as "0")
+        if [ "$WORKSPACE_NUM" = "10" ]; then
+            DISPLAY="0"
+        else
+            DISPLAY="$WORKSPACE_NUM"
+        fi
+
        # Determine visibility and styling
        # Always show focused workspace (even if empty) with fixed width
        # Hide non-focused empty workspaces by setting width to 0 (collapsed)
        # Show non-focused non-empty workspaces with fixed width and inactive styling

        if [ "$IS_FOCUSED" = "true" ]; then
-            # Focused workspace - always show with focused styling
+            # Focused workspace - always show with focused styling and bold font
            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
                drawing=on \
+                icon="$DISPLAY" \
                width=32 \
                icon.padding_left=13 \
                icon.padding_right=11 \
                icon.align=center \
                background.color=$FOCUSED_COLOR \
                background.drawing=on \
-                icon.color=$TEXT
+                icon.color=$TEXT \
+                icon.font="Fira Code:Bold:13.0"
        elif [ "$IS_EMPTY" = "true" ]; then
-            # Empty workspace (not focused) - hide by turning off drawing
-            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
-                drawing=off
-        else
-            # Non-empty workspace (not focused) - show with inactive styling
+            # Empty workspace (not focused) - hide by collapsing width and clearing content
+            # Using width=0 with drawing=on so updates=when_shown continues to run the script
            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
                drawing=on \
+                icon="" \
+                label="" \
+                width=0 \
+                icon.padding_left=0 \
+                icon.padding_right=0 \
+                background.drawing=off
+        else
+            # Non-empty workspace (not focused) - show with inactive styling and white text
+            ${pkgs.sketchybar}/bin/sketchybar --set space.$WORKSPACE_NUM \
+                drawing=on \
+                icon="$DISPLAY" \
                width=32 \
                icon.padding_left=13 \
                icon.padding_right=11 \
                icon.align=center \
                background.color=$ITEM_BG \
                background.drawing=on \
-                icon.color=$GRAY
+                icon.color=$TEXT \
+                icon.font="Fira Code:Regular:13.0"
        fi
      '';
    };
--- a/home/roles/base-darwin/default.nix
+++ b/home/roles/base-darwin/default.nix
@@ -4,4 +4,8 @@
  imports = [
    ../aerospace
  ];
+
+  # Override to use -d instead of --delete-older-than on Darwin due to launchd bug
+  # https://github.com/nix-community/home-manager/issues/7211
+  nix.gc.options = "-d";
 }
--- a/home/roles/base/default.nix
+++ b/home/roles/base/default.nix
@@ -24,6 +24,17 @@ in
      tree
    ];

+    # Automatic garbage collection for user profile (home-manager generations).
+    # This complements system-level gc which only cleans system generations.
+    # - Linux: Uses --delete-older-than to keep 10-day rollback window
+    # - Darwin: Overridden to use -d in base-darwin role to avoid launchd bug
+    #   (https://github.com/nix-community/home-manager/issues/7211)
+    nix.gc = {
+      automatic = true;
+      randomizedDelaySec = mkIf pkgs.stdenv.isLinux "14m";
+      options = "--delete-older-than 10d";
+    };
+
    # Essential programs everyone needs
    programs.bash = {
      enable = true;
--- a/home/roles/default.nix
+++ b/home/roles/default.nix
@@ -3,6 +3,7 @@
  # Platform-specific roles are imported via base-linux or base-darwin
  # in each home configuration file
  imports = [
+    ./3d-printing
    ./base
    ./communication
    ./desktop
--- a/roles/kodi/default.nix
+++ b/roles/kodi/default.nix
@@ -32,7 +32,7 @@ in
  config = let
    kodiBasePkg = if cfg.wayland then pkgs.kodi-wayland else pkgs.kodi;
    kodiPkg = kodiBasePkg.withPackages (pkgs: with pkgs; [
-      jellyfin
+      jellyfin-media-player
      steam-launcher
      steam-library
      youtube
Author	SHA1	Message	Date
John Ogle	3029e3d9a8	[kodi] jellyfin > jellyfin-media-player	2025-12-07 20:53:59 -08:00
John Ogle	3483e26bce	Add 3D printing home role with orca-slicer and openscad Create a new home-manager role for 3D printing applications including orca-slicer for slicing and openscad-unstable for 3D modeling. Enable the role in the desktop configuration for full-featured experience.	2025-12-06 19:22:37 -08:00
John Ogle	b3add6ddf8	Add automatic garbage collection for home-manager user profiles Configure nix.gc to automatically clean up old home-manager generations weekly, which complements the existing system-level gc. Uses --delete-older-than 10d on Linux to maintain a rollback window, but overrides to -d on Darwin to work around a launchd bug where multi-part options aren't properly split into separate arguments.	2025-12-06 13:58:26 -08:00
John Ogle	89994e3fc8	Update SketchyBar styling to match Waybar appearance - Change font from SF Mono to Fira Code for consistency with Waybar - Reduce bar height from 32px to 30px - Switch to solid dark gray background (#333333) instead of semi-transparent black - Remove rounded corners on items (corner_radius 0 instead of 5) - Make item backgrounds full height (30px) to match bar height - Remove all separator items between modules for cleaner appearance - Add topmost and sticky properties to prevent window shadows from darkening bar - Adjust aerospace bottom gap from 40px to 38px to account for new bar height - Set all workspace text to white with bold font for active workspace	2025-12-05 14:58:11 -08:00
John Ogle	0e9671a45f	Fix SketchyBar workspace indicators not appearing after 25.11 upgrade Add explicit `drawing=on` to all workspace item states (initial creation, focused, non-empty, and empty) to prevent items from getting stuck with `drawing=off`. With `updates=when_shown`, items with `drawing=off` never run their update scripts, causing workspaces that start empty to never appear even when focused or given windows. Changes: - Add drawing=on to initial workspace creation (line 393) - Add drawing=on to focused workspace state (line 568) - Add drawing=on to empty workspace state (line 582) - Add drawing=on to non-empty workspace state (line 591) - Update comment for empty workspace to explain drawing=on usage This ensures workspace indicators automatically appear within 2 seconds when focused or given windows, without needing manual `sketchybar --update`. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>	2025-12-05 14:44:23 -08:00
John Ogle	f4078970b2	Merge branch '25.11' * 25.11: Simplify aerospace launchd config and remove menu bar hiding Remove mbedtls_2 workaround for dolphin packages Re-enable packages after NixOS 25.11 upgrade Add --unsupported-gpu flag to Sway for zix790prors compatibility Fix deprecated package names for NixOS 25.11 Upgrade NixOS to 25.11 and fix Jovian module organization	2025-12-05 14:20:49 -08:00
John Ogle	bc42c4dc77	Fix SketchyBar workspace indicators not reappearing The aerospace workspace plugin had two issues preventing workspace indicators from properly showing/hiding: 1. The script expected workspace number as $1 but update_freq routine calls only provide $NAME environment variable. Now extracts from either source. 2. Using drawing=off to hide workspaces was unreliable - items wouldn't consistently reappear. Now uses width=0 with cleared icon/label content to collapse items instead. Workspaces now properly appear within 2 seconds when windows are created or moved, without requiring manual sketchybar --update.	2025-12-04 16:31:44 -08:00
John Ogle	585f9ef5c7	Remove macOS menu bar hiding from aerospace SketchyBar config	2025-12-04 10:51:12 -08:00