diff --git a/flake.nix b/flake.nix index 2559f20d..09797d30 100644 --- a/flake.nix +++ b/flake.nix @@ -327,30 +327,24 @@ inherit devices inputs nixpkgs home-manager overlays nur nix-darwin; }; - homeConfigurations = let - devices = linux_devices; - in - (import ./home/linux/device.nix { - inherit devices inputs nixpkgs home-manager overlays; - }) - // { - deck = let - pkgs = import inputs.nixpkgs { - inherit overlays; - system = "x86_64-linux"; + homeConfigurations = { + deck = let + pkgs = import inputs.nixpkgs { + inherit overlays; + system = "x86_64-linux"; + }; + in + home-manager.lib.homeManagerConfiguration { + inherit pkgs; + extraSpecialArgs = { + inherit inputs; }; - in - home-manager.lib.homeManagerConfiguration { - inherit pkgs; - extraSpecialArgs = { - inherit inputs; - }; - modules = [ - {nixpkgs.config.allowUnfree = true;} - ./steamdeck - ]; - }; - }; + modules = [ + {nixpkgs.config.allowUnfree = true;} + ./steamdeck + ]; + }; + }; installerImages = let nixos = self.nixosConfigurations; diff --git a/steamdeck/default.nix b/steamdeck/default.nix index c149d58e..9dcb1e76 100644 --- a/steamdeck/default.nix +++ b/steamdeck/default.nix @@ -1,7 +1,7 @@ { pkgs, config, - home-manager, + lib, ... }: { imports = [ @@ -20,8 +20,11 @@ (nixvim.makeNixvim (import ../neovim)) ]; stateVersion = "24.11"; - activation.tailscale-service = home-manager.dag.entryAfter ["writeBoundary"] '' - ${builtins.replaceStrings (builtins.readFile ./tailscaled.service)} - ''; + activation.tailscale-service = let + tailscale_service = pkgs.writeText "tailscaled.service" (builtins.replaceStrings ["/usr/bin/tailscaled"] ["${pkgs.tailscale}/bin/tailscaled"] (builtins.readFile ./tailscaled.service)); + in + lib.hm.dag.entryAfter ["writeBoundary"] '' + run cp ${tailscale_service} /etc/systemd/system/tailscaled.service + ''; }; }