From 3c40f43bfef58f7b0c51790ff3d538af7b526908 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 26 Apr 2024 08:31:29 +0900 Subject: [PATCH] Testing --- nixos/hosts/steamdeck/default.nix | 29 +++++++++---------- nixos/hosts/steamdeck/disks.nix | 46 +++++++++++++++---------------- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/nixos/hosts/steamdeck/default.nix b/nixos/hosts/steamdeck/default.nix index bd80843b..6233941f 100644 --- a/nixos/hosts/steamdeck/default.nix +++ b/nixos/hosts/steamdeck/default.nix @@ -1,4 +1,4 @@ -{ inputs, config, lib, pkgs, ... }: { +{ inputs, config, lib, username, ... }: { imports = [ inputs.jovian.nixosModules ./disks.nix @@ -20,17 +20,18 @@ # Set the networking hostname: networking.hostName = "steamdeck"; -# jovian = { -# decky-loader.enable = true; -# steam.enable = true; -# steam.autoStart = true; -# steam.user = username; -# steamos.useSteamOSConfig = true; -# devices.steamdeck.enable = true; -# hardwarhas.amd.gpu = true; -# }; - # environment.systemPackages = with pkgs; [ - # jupiter-dock-updater-bin - # steamdeck-firmware - #]; + jovian = { + decky-loader.enable = true; + steam.enable = true; + steam.autoStart = true; + steam.user = username; + steamos.useSteamOSConfig = true; + devices.steamdeck.enable = true; + hardwarhas.amd.gpu = true; + }; + + environment.systemPackages = with inputs.jovaian.pkgs; [ + jupiter-dock-updater-bin + steamdeck-firmware + ]; } diff --git a/nixos/hosts/steamdeck/disks.nix b/nixos/hosts/steamdeck/disks.nix index 2fd06d76..b795679f 100644 --- a/nixos/hosts/steamdeck/disks.nix +++ b/nixos/hosts/steamdeck/disks.nix @@ -49,28 +49,28 @@ }; # content }; # disko.devices.disk.nvme0 -# mmcblk0 = { -# type = "disk"; -# device = "/dev/mmcblk0"; -# content = { -# type = "gpt"; -# partitions = { -# SD_CARD = { -# start = "0%"; -# end = "100%"; -# content = { -# type = "btrfs"; -# extraArgs = [ "-f" ]; -# subvolumes = { -# "/sd_card" = { -# mountpoint = "/sd_card"; -# mountOptions = [ "compress=none" "noatime" ]; -# }; # sd_card -# }; # subvolumes -# }; # content -# }; # partition 2 (SD_CARD BTRFS) -# }; # partitions -# }; # content -# }; # disko.devices.disk.mmcblk0 + mmcblk0 = { + type = "disk"; + device = "/dev/mmcblk0p1"; + content = { + type = "gpt"; + partitions = { + SD_CARD = { + start = "0%"; + end = "100%"; + content = { + type = "btrfs"; + extraArgs = [ "-f" ]; + subvolumes = { + "/sd_card" = { + mountpoint = "/sd_card"; + mountOptions = [ "compress=none" "noatime" ]; + }; # sd_card + }; # subvolumes + }; # content + }; # partition 2 (SD_CARD BTRFS) + }; # partitions + }; # content + }; # disko.devices.disk.mmcblk0 }; # disko.devices } # root