From c5834898fabb5b2245534e9b01fe0f47d205b0f0 Mon Sep 17 00:00:00 2001 From: albert Date: Fri, 26 Apr 2024 13:17:54 +0900 Subject: [PATCH] Testing --- flake.lock | 1 - flake.nix | 2 +- nixos/hosts/steamdeck/default.nix | 27 +++++++++++---------------- 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/flake.lock b/flake.lock index a1336af5..e2ee12ab 100644 --- a/flake.lock +++ b/flake.lock @@ -969,7 +969,6 @@ }, "original": { "owner": "Jovian-Experiments", - "ref": "development", "repo": "Jovian-NixOS", "type": "github" } diff --git a/flake.nix b/flake.nix index fc7a5d01..dc0037ef 100644 --- a/flake.nix +++ b/flake.nix @@ -48,7 +48,7 @@ # Hyprland Flake hyprland.url = "github:hyprwm/Hyprland"; # Steam Deck configs for NixOS - jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development"; + jovian.url = "github:Jovian-Experiments/Jovian-NixOS"; }; outputs = { self, nixpkgs, nixpkgs-wayland, home-manager, lanzaboote, nur, sops-nix, doom-emacs, nixos-generators, deploy-rs, ... } @inputs: let diff --git a/nixos/hosts/steamdeck/default.nix b/nixos/hosts/steamdeck/default.nix index b5c75604..a66bd0d3 100644 --- a/nixos/hosts/steamdeck/default.nix +++ b/nixos/hosts/steamdeck/default.nix @@ -1,6 +1,6 @@ -{ inputs, config, lib, username, ... }: { +{ inputs, config, lib, username, pkgs, ... }: { imports = [ - inputs.jovian.nixosModules + inputs.jovian.nixosModules.default ./disks.nix ../../common/modules/boot.nix ../../common/services/tailscale-autoconnect.nix @@ -20,18 +20,13 @@ # 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 inputs.jovaian.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; + }; }