feat: merge disparate steamdeck changes
All checks were successful
/ build-host (map[host:beefcake]) (push) Successful in 33s
/ build-host (map[host:dragon]) (push) Successful in 47s
/ build-host (map[host:flipflop]) (push) Successful in 9s
/ build-host (map[host:foxtrot]) (push) Successful in 46s
/ build-host (map[host:rascal]) (push) Successful in 10s
/ build-host (map[host:router]) (push) Successful in 23s
/ build-host (map[host:steamdeck]) (push) Successful in 44s
/ build-devshell (push) Successful in 21s
/ flake-check (push) Successful in 6m9s
All checks were successful
/ build-host (map[host:beefcake]) (push) Successful in 33s
/ build-host (map[host:dragon]) (push) Successful in 47s
/ build-host (map[host:flipflop]) (push) Successful in 9s
/ build-host (map[host:foxtrot]) (push) Successful in 46s
/ build-host (map[host:rascal]) (push) Successful in 10s
/ build-host (map[host:router]) (push) Successful in 23s
/ build-host (map[host:steamdeck]) (push) Successful in 44s
/ build-devshell (push) Successful in 21s
/ flake-check (push) Successful in 6m9s
This commit is contained in:
commit
0b07c910ef
8 changed files with 104 additions and 10 deletions
0
:p
0
:p
14
flake.nix
14
flake.nix
|
@ -54,8 +54,6 @@
|
||||||
home-manager-unstable.url = "github:nix-community/home-manager";
|
home-manager-unstable.url = "github:nix-community/home-manager";
|
||||||
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
|
||||||
hardware.url = "github:NixOS/nixos-hardware";
|
|
||||||
|
|
||||||
disko.url = "github:nix-community/disko/master";
|
disko.url = "github:nix-community/disko/master";
|
||||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
|
||||||
|
@ -70,21 +68,23 @@
|
||||||
slippi.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
slippi.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
slippi.inputs.home-manager.follows = "home-manager-unstable";
|
slippi.inputs.home-manager.follows = "home-manager-unstable";
|
||||||
|
|
||||||
|
jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development";
|
||||||
|
# jovian.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
|
||||||
|
# other inputs
|
||||||
|
hardware.url = "github:NixOS/nixos-hardware";
|
||||||
|
# nnf.url = "github:thelegy/nixos-nftables-firewall";
|
||||||
|
|
||||||
# inputs with their own cache I want to use
|
# inputs with their own cache I want to use
|
||||||
helix.url = "github:helix-editor/helix/master";
|
helix.url = "github:helix-editor/helix/master";
|
||||||
# helix.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
# helix.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
|
||||||
jovian.url = "github:Jovian-Experiments/Jovian-NixOS/development";
|
|
||||||
# jovian.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
|
||||||
|
|
||||||
ghostty.url = "github:ghostty-org/ghostty";
|
ghostty.url = "github:ghostty-org/ghostty";
|
||||||
# ghostty.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
|
# ghostty.inputs.nixpkgs-unstable.follows = "nixpkgs-unstable";
|
||||||
# ghostty.inputs.nixpkgs-stable.follows = "nixpkgs";
|
# ghostty.inputs.nixpkgs-stable.follows = "nixpkgs";
|
||||||
|
|
||||||
deploy-rs.url = "github:serokell/deploy-rs";
|
deploy-rs.url = "github:serokell/deploy-rs";
|
||||||
# deploy-rs.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
# deploy-rs.inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||||
|
|
||||||
# nnf.url = "github:thelegy/nixos-nftables-firewall";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
nixConfig = {
|
nixConfig = {
|
||||||
|
|
|
@ -25,5 +25,10 @@ rec {
|
||||||
else
|
else
|
||||||
relPath;
|
relPath;
|
||||||
|
|
||||||
inherit (import ./host.nix inputs) host stableHost steamdeckHost;
|
inherit (import ./host.nix inputs)
|
||||||
|
host
|
||||||
|
stableHost
|
||||||
|
steamdeckHost
|
||||||
|
baseHost
|
||||||
|
;
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,6 +37,7 @@ let
|
||||||
);
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
inherit baseHost;
|
||||||
stableHost = baseHost { inherit (inputs) nixpkgs home-manager; };
|
stableHost = baseHost { inherit (inputs) nixpkgs home-manager; };
|
||||||
host = baseHost {
|
host = baseHost {
|
||||||
nixpkgs = inputs.nixpkgs-unstable;
|
nixpkgs = inputs.nixpkgs-unstable;
|
||||||
|
|
|
@ -1,6 +1,11 @@
|
||||||
inputs:
|
inputs:
|
||||||
let
|
let
|
||||||
inherit (inputs.self.flakeLib) host stableHost steamdeckHost;
|
inherit (inputs.self.flakeLib)
|
||||||
|
host
|
||||||
|
stableHost
|
||||||
|
steamdeckHost
|
||||||
|
baseHost
|
||||||
|
;
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
beefcake = stableHost ./beefcake.nix { };
|
beefcake = stableHost ./beefcake.nix { };
|
||||||
|
@ -19,5 +24,25 @@ in
|
||||||
generic-headless = stableHost ./generic-headless.nix { };
|
generic-headless = stableHost ./generic-headless.nix { };
|
||||||
generic = stableHost ./generic.nix { };
|
generic = stableHost ./generic.nix { };
|
||||||
|
|
||||||
|
liveImage = baseHost rec {
|
||||||
|
nixpkgs = inputs.nixpkgs-unstable;
|
||||||
|
home-manager = inputs.home-manager-unstable;
|
||||||
|
extraModules = [
|
||||||
|
(nixpkgs + "/nixos/modules/installer/cd-dvd/installation-cd-minimal.nix")
|
||||||
|
{
|
||||||
|
system.stateVersion = "25.05";
|
||||||
|
networking.hostName = "live-nixos-lyte";
|
||||||
|
networking.networkmanager.enable = false;
|
||||||
|
|
||||||
|
lyte.shell.enable = true;
|
||||||
|
lyte.desktop.enable = true;
|
||||||
|
home-manager.users.daniel = {
|
||||||
|
lyte.shell.enable = true;
|
||||||
|
lyte.desktop.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
];
|
||||||
|
} ./live.nix { };
|
||||||
|
|
||||||
# arm-dragon = host ./dragon.nix { system = "aarch64-linux"; };
|
# arm-dragon = host ./dragon.nix { system = "aarch64-linux"; };
|
||||||
}
|
}
|
||||||
|
|
1
packages/hosts/live.nix
Normal file
1
packages/hosts/live.nix
Normal file
|
@ -0,0 +1 @@
|
||||||
|
{ ... }: { }
|
|
@ -5,8 +5,9 @@
|
||||||
}:
|
}:
|
||||||
{
|
{
|
||||||
system.stateVersion = "24.11";
|
system.stateVersion = "24.11";
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "dragon";
|
hostName = "steamdeck";
|
||||||
wifi.enable = true;
|
wifi.enable = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
61
packages/hosts/steamdeckoled.nix
Normal file
61
packages/hosts/steamdeckoled.nix
Normal file
|
@ -0,0 +1,61 @@
|
||||||
|
{
|
||||||
|
diskoConfigurations,
|
||||||
|
# hardware, # do NOT use nixos-hardware with jovian config
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
{
|
||||||
|
system.stateVersion = "24.11";
|
||||||
|
|
||||||
|
networking = {
|
||||||
|
hostName = "steamdeck";
|
||||||
|
wifi.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
boot = {
|
||||||
|
# kernelPackages = pkgs.linuxPackages_latest; # do NOT use with jovian config
|
||||||
|
loader = {
|
||||||
|
efi.canTouchEfiVariables = true;
|
||||||
|
systemd-boot.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
imports = [
|
||||||
|
(diskoConfigurations.unencrypted { disk = "/dev/nvme0n1"; })
|
||||||
|
];
|
||||||
|
|
||||||
|
lyte.desktop.enable = true;
|
||||||
|
home-manager.users.daniel = {
|
||||||
|
lyte = {
|
||||||
|
useOutOfStoreSymlinks.enable = true;
|
||||||
|
shell = {
|
||||||
|
enable = true;
|
||||||
|
learn-jujutsu-not-git.enable = true;
|
||||||
|
};
|
||||||
|
desktop.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
programs.steam.enable = true;
|
||||||
|
jovian = {
|
||||||
|
decky-loader = {
|
||||||
|
enable = true;
|
||||||
|
};
|
||||||
|
steam = {
|
||||||
|
autoStart = true;
|
||||||
|
updater = {
|
||||||
|
splash = "jovian";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
hardware = {
|
||||||
|
has.amd.gpu = true;
|
||||||
|
};
|
||||||
|
devices = {
|
||||||
|
steamdeck = {
|
||||||
|
enable = true;
|
||||||
|
autoUpdate = true;
|
||||||
|
# enableGyroDsuService = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
Loading…
Add table
Reference in a new issue