Add Steam Deck (nix-deck) configuration with Jovian-NixOS and remote building

- Add Jovian-NixOS integration for Steam Deck hardware support - Create nix-deck machine configuration with SteamOS role - Add jovian-compat.nix for NixOS 25.05 compatibility (remove in 25.11+) - Create remote-build role for distributed builds - Configure zix790prors as build host - Configure nix-book and nix-deck to use remote builder with fallback - Add comprehensive setup documentation 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-17 15:42:33 -08:00
7 changed files with 49 additions and 264 deletions
--- a/flake.lock
+++ b/flake.lock
@@ -57,32 +57,11 @@
        "type": "github"
      }
    },
-    "home-manager-unstable": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1763416652,
-        "narHash": "sha256-8EBEEvtzQ11LCxpQHMNEBQAGtQiCu/pqP9zSovDSbNM=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "ea164b7c9ccdc2321379c2ff78fd4317b4c41312",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "master",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
    "jovian": {
      "inputs": {
        "nix-github-actions": "nix-github-actions",
        "nixpkgs": [
-          "nixpkgs-unstable"
+          "nixpkgs"
        ]
      },
      "locked": {
@@ -106,11 +85,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1762912391,
-        "narHash": "sha256-4hpBE7bGd24SfD28rzMdUGXsLsNEYxCCrTipFdoqoNM=",
+        "lastModified": 1759509947,
+        "narHash": "sha256-4XifSIHfpJKcCf5bZZRhj8C4aCpjNBaE3kXr02s4rHU=",
        "owner": "nix-darwin",
        "repo": "nix-darwin",
-        "rev": "d76299b2cd01837c4c271a7b5186e3d5d8ebd126",
+        "rev": "000eadb231812ad6ea6aebd7526974aaf4e79355",
        "type": "github"
      },
      "original": {
@@ -148,11 +127,11 @@
        "nixpkgs": "nixpkgs"
      },
      "locked": {
-        "lastModified": 1763385941,
-        "narHash": "sha256-99CBNgyMvg3Zu/hxqixtShevrF4Kfr/qjtizQ6oseVI=",
+        "lastModified": 1762251193,
+        "narHash": "sha256-CmSddz8e2kM+ITbYutluhKZyXXwI9Sg2lf7XXSvc8oY=",
        "owner": "nix-community",
        "repo": "NixOS-WSL",
-        "rev": "cc6483354b236c2fc95cc1d4ba1f0f40b7345e69",
+        "rev": "e001844d4553aef268f97b32d3a825b6370eed91",
        "type": "github"
      },
      "original": {
@@ -164,11 +143,11 @@
    },
    "nixpkgs": {
      "locked": {
-        "lastModified": 1762977756,
-        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
        "type": "github"
      },
      "original": {
@@ -180,11 +159,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1763283776,
-        "narHash": "sha256-Y7TDFPK4GlqrKrivOcsHG8xSGqQx3A6c+i7novT85Uk=",
+        "lastModified": 1762596750,
+        "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "50a96edd8d0db6cc8db57dab6bb6d6ee1f3dc49a",
+        "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e",
        "type": "github"
      },
      "original": {
@@ -196,11 +175,11 @@
    },
    "nixpkgs_2": {
      "locked": {
-        "lastModified": 1763049705,
-        "narHash": "sha256-A5LS0AJZ1yDPTa2fHxufZN++n8MCmtgrJDtxFxrH4S8=",
+        "lastModified": 1762498405,
+        "narHash": "sha256-Zg/SCgCaAioc0/SVZQJxuECGPJy+OAeBcGeA5okdYDc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "3acb677ea67d4c6218f33de0db0955f116b7588c",
+        "rev": "6faeb062ee4cf4f105989d490831713cc5a43ee1",
        "type": "github"
      },
      "original": {
@@ -233,41 +212,16 @@
        "type": "github"
      }
    },
-    "plasma-manager-unstable": {
-      "inputs": {
-        "home-manager": [
-          "home-manager-unstable"
-        ],
-        "nixpkgs": [
-          "nixpkgs-unstable"
-        ]
-      },
-      "locked": {
-        "lastModified": 1762784320,
-        "narHash": "sha256-odsk96Erywk5hs0dhArF38zb7Oe0q6LZ70gXbxAPKno=",
-        "owner": "nix-community",
-        "repo": "plasma-manager",
-        "rev": "7911a0f8a44c7e8b29d031be3149ee8943144321",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "plasma-manager",
-        "type": "github"
-      }
-    },
    "root": {
      "inputs": {
        "google-cookie-retrieval": "google-cookie-retrieval",
        "home-manager": "home-manager",
-        "home-manager-unstable": "home-manager-unstable",
        "jovian": "jovian",
        "nix-darwin": "nix-darwin",
        "nixos-wsl": "nixos-wsl",
        "nixpkgs": "nixpkgs_2",
        "nixpkgs-unstable": "nixpkgs-unstable",
-        "plasma-manager": "plasma-manager",
-        "plasma-manager-unstable": "plasma-manager-unstable"
+        "plasma-manager": "plasma-manager"
      }
    }
  },
--- a/flake.nix
+++ b/flake.nix
@@ -16,23 +16,12 @@
      inputs.nixpkgs.follows = "nixpkgs";
    };

-    home-manager-unstable = {
-      url = "github:nix-community/home-manager/master";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-    };
-
    plasma-manager = {
      url = "github:nix-community/plasma-manager";
      inputs.nixpkgs.follows = "nixpkgs";
      inputs.home-manager.follows = "home-manager";
    };

-    plasma-manager-unstable = {
-      url = "github:nix-community/plasma-manager";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
-      inputs.home-manager.follows = "home-manager-unstable";
-    };
-
    google-cookie-retrieval = {
      url = "git+https://git.johnogle.info/johno/google-cookie-retrieval.git";
      inputs.nixpkgs.follows = "nixpkgs";
@@ -40,7 +29,7 @@

    jovian = {
      url = "github:Jovian-Experiments/Jovian-NixOS";
-      inputs.nixpkgs.follows = "nixpkgs-unstable";
+      inputs.nixpkgs.follows = "nixpkgs";
    };
  };

@@ -49,6 +38,7 @@
      ./roles
    ] ++ [
      inputs.home-manager.nixosModules.home-manager
+      ./roles/jovian-compat.nix  # Compatibility shim for Jovian on stable NixOS
      inputs.jovian.nixosModules.jovian
      {
        nixpkgs.overlays = [
@@ -58,8 +48,6 @@
              config.allowUnfree = true;
            };
            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
          })
        ];
        home-manager.useGlobalPkgs = true;
@@ -72,34 +60,6 @@
        };
      }
    ];
-    # Modules for unstable-based systems (like nix-deck)
-    nixosModulesUnstable = [
-      ./roles
-    ] ++ [
-      inputs.home-manager-unstable.nixosModules.home-manager
-      inputs.jovian.nixosModules.jovian
-      {
-        nixpkgs.overlays = [
-          (final: prev: {
-            unstable = import nixpkgs-unstable {
-              system = prev.system;
-              config.allowUnfree = true;
-            };
-            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
-          })
-        ];
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.sharedModules = [
-          inputs.plasma-manager-unstable.homeModules.plasma-manager
-        ];
-        home-manager.extraSpecialArgs = {
-          globalInputs = inputs;
-        };
-      }
-    ];
    darwinModules = [
      ./roles/darwin.nix
    ] ++ [
@@ -112,8 +72,6 @@
              config.allowUnfree = true;
            };
            custom = prev.callPackage ./packages {};
-            # Compatibility: bitwarden renamed to bitwarden-desktop in unstable
-            bitwarden-desktop = prev.bitwarden-desktop or prev.bitwarden;
          })
        ];
        home-manager.useGlobalPkgs = true;
@@ -191,10 +149,10 @@
      ];
    };

-    # Steam Deck configuration (using unstable for better Jovian compatibility)
-    nixosConfigurations.nix-deck = nixpkgs-unstable.lib.nixosSystem rec {
+    # Steam Deck configuration
+    nixosConfigurations.nix-deck = nixpkgs.lib.nixosSystem rec {
      system = "x86_64-linux";
-      modules = nixosModulesUnstable ++ [
+      modules = nixosModules ++ [
        ./machines/nix-deck/configuration.nix
        {
          home-manager.users.johno = import ./home/home-desktop.nix;
--- a/home/modules/i3+sway/default.nix
+++ b/home/modules/i3+sway/default.nix
@@ -105,134 +105,12 @@ in {
  };

  config = {
-    # i3blocks configuration file
-    home.file.".config/i3blocks/config".text = ''
-      # i3blocks config - replicating waybar setup
-      separator_block_width=15
-      markup=pango
-
-      [disk]
-      command=df -h / | awk 'NR==2 {print "💾 " $5}'
-      interval=30
-      separator=true
-
-      [cpu]
-      command=top -bn1 | grep "Cpu(s)" | sed "s/.*, *\([0-9.]*\)%* id.*/\1/" | awk '{print "🧠 " int(100 - $1) "%"}'
-      interval=2
-      separator=true
-
-      [memory]
-      command=free | awk 'NR==2 {printf "🐏 %.0f%%\n", $3*100/$2}'
-      interval=5
-      separator=true
-
-      [pulseaudio]
-      command=${pkgs.writeShellScript "i3blocks-pulseaudio" ''
-        volume=$(pactl get-sink-volume @DEFAULT_SINK@ | grep -Po '\d+%' | head -1)
-        muted=$(pactl get-sink-mute @DEFAULT_SINK@ | grep -o 'yes')
-        if [ "$muted" = "yes" ]; then
-          echo "🔇"
-        else
-          vol_num=''${volume%\%}
-          if [ $vol_num -le 33 ]; then
-            echo "🔈 $volume"
-          elif [ $vol_num -le 66 ]; then
-            echo "🔉 $volume"
-          else
-            echo "🔊 $volume"
-          fi
-        fi
-      ''}
-      interval=1
-      signal=10
-      separator=true
-
-      [backlight]
-      command=${pkgs.writeShellScript "i3blocks-backlight" ''
-        if command -v brightnessctl &>/dev/null; then
-          brightnessctl g | awk -v max=$(brightnessctl m) '{printf "☀️ %.0f%%\n", ($1/max)*100}'
-        fi
-      ''}
-      interval=1
-      separator=true
-
-      [network]
-      command=${pkgs.writeShellScript "i3blocks-network" ''
-        if iwgetid -r &>/dev/null; then
-          ssid=$(iwgetid -r)
-          signal=$(grep "^\s*w" /proc/net/wireless | awk '{print int($3 * 100 / 70)}')
-          echo "📶 $ssid ($signal%)"
-        else
-          ip=$(ip -4 addr show | grep -oP '(?<=inet\s)\d+(\.\d+){3}' | grep -v '127.0.0.1' | head -1)
-          if [ -n "$ip" ]; then
-            echo "🔌 $ip"
-          else
-            echo "❌"
-          fi
-        fi
-      ''}
-      interval=5
-      separator=true
-
-      [battery]
-      command=${pkgs.writeShellScript "i3blocks-battery" ''
-        if [ -d /sys/class/power_supply/BAT0 ]; then
-          capacity=$(cat /sys/class/power_supply/BAT0/capacity)
-          status=$(cat /sys/class/power_supply/BAT0/status)
-
-          if [ "$status" = "Charging" ]; then
-            echo "⚡ $capacity%"
-          else
-            echo "🔋 $capacity%"
-          fi
-        fi
-      ''}
-      interval=10
-      separator=true
-
-      [time]
-      command=date '+%Y-%m-%d %H:%M'
-      interval=1
-      separator=false
-    '';
-
    xsession.windowManager.i3 = let
      base_i3_config = recursiveUpdate shared_config {
        bars = [{
          position = "bottom";
-          statusCommand = "${pkgs.i3blocks}/bin/i3blocks";
+          statusCommand = "${pkgs.i3status}/bin/i3status";
          trayOutput = "primary";  # Enable system tray on primary output
-          fonts = {
-            names = [ "Fira Code" "monospace" ];
-            size = 11.0;
-          };
-          colors = {
-            background = "#000000";
-            statusline = "#ffffff";
-            separator = "#666666";
-
-            # Workspace button colors (matching waybar)
-            focusedWorkspace = {
-              border = "#285577";
-              background = "#285577";
-              text = "#ffffff";
-            };
-            activeWorkspace = {
-              border = "#5f676a";
-              background = "#5f676a";
-              text = "#ffffff";
-            };
-            inactiveWorkspace = {
-              border = "#222222";
-              background = "#222222";
-              text = "#888888";
-            };
-            urgentWorkspace = {
-              border = "#900000";
-              background = "#900000";
-              text = "#ffffff";
-            };
-          };
        }];
        keybindings = shared_config.keybindings // {
          "${shared_config.modifier}+d" = "exec rofi -show drun";
@@ -437,5 +315,7 @@ in {
        sidebar-mode = true;
      };
    };
+
+    programs.i3status.enable = true;
  };
 }
--- a/home/roles/desktop/default.nix
+++ b/home/roles/desktop/default.nix
@@ -13,7 +13,7 @@ in
  config = mkIf cfg.enable {
    home.packages = with pkgs; [
      # Desktop applications
-      bitwarden-desktop
+      bitwarden
      dunst
      keepassxc
      unstable.ghostty
--- a/machines/nix-deck/hardware-configuration.nix
+++ b/machines/nix-deck/hardware-configuration.nix
@@ -1,35 +1,26 @@
-# Hardware configuration for Steam Deck (nix-deck)
-# Generated from nixos-generate-config on 2025-11-17
+# This is a placeholder hardware configuration for the Steam Deck.
+# Run `nixos-generate-config --show-hardware-config` on the actual device
+# to generate the real hardware configuration, then merge the jovian settings below.

 { config, lib, pkgs, modulesPath, ... }:

 {
-  imports = [
-    (modulesPath + "/installer/scan/not-detected.nix")
-  ];
+  imports = [ ];

-  # Steam Deck specific hardware configuration (Jovian)
+  # Steam Deck specific hardware configuration
  jovian.devices.steamdeck = {
    enable = true;
    autoUpdate = false;  # Set to true if you want automatic firmware updates
  };

-  # Kernel modules detected by nixos-generate-config
-  boot.initrd.availableKernelModules = [
-    "nvme"
-    "xhci_pci"
-    "usb_storage"
-    "uas"
-    "usbhid"
-    "sd_mod"
-    "sdhci_pci"
-  ];
-  boot.initrd.kernelModules = [ ];
-  boot.kernelModules = [ "kvm-amd" ];
-  boot.extraModulePackages = [ ];
+  # TODO: Replace this with actual hardware configuration from the Steam Deck
+  # Run `nixos-generate-config --show-hardware-config` on the device and merge it here
+
+  # Minimal placeholder configuration to allow flake to build
+  boot.initrd.availableKernelModules = [ ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];

-  # IMPORTANT: Update these filesystem configurations based on your actual partition layout
-  # The configuration below is a placeholder - adjust according to how you partitioned the disk
  fileSystems."/" = {
    device = "/dev/disk/by-label/nixos";
    fsType = "ext4";
@@ -40,12 +31,7 @@
    fsType = "vfat";
  };

-  swapDevices = [{
-    device = "/swapfile";
-    size = 8192;  # 8GB swap file
-  }];
+  swapDevices = [ ];

-  # AMD CPU microcode updates
  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }
--- a/machines/zix790prors/configuration.nix
+++ b/machines/zix790prors/configuration.nix
@@ -59,9 +59,18 @@ with lib;
  '';

  hardware.nvidia = {
+    # Modesetting is required.
    modesetting.enable = true;
+    
+    # Enable the Nvidia settings menu,
+    # accessible via `nvidia-settings`.
    nvidiaSettings = true;
+    
+    # Optionally, you may need to select the appropriate driver version for your specific GPU.
    package = pkgs.linuxPackages.nvidiaPackages.stable;
+    
+    # Use open source kernel modules (recommended for RTX/GTX 16xx and newer)
+    # Set to false if you have an older GPU
    open = true;
    
    # For gaming performance
--- a/roles/desktop/gaming.nix
+++ b/roles/desktop/gaming.nix
@@ -19,10 +19,8 @@ in

    (mkIf (cfg.enable && cfg.gaming.emulation) {
      environment.systemPackages = with pkgs; [
-        dolphin-emu
-        dolphin-emu-primehack
-        retroarch-full
        ryubing
+        dolphin-emu
      ];
      # TODO: Remove me once dolphin-emu and dolphin-emu-primehack update
      #       dependencies to mbedtls from mbedtls_2 (which is currently)