woot, got it building, on to the next step
This commit is contained in:
parent
be896b7739
commit
4053975856
9 changed files with 66 additions and 35 deletions
44
flake.lock
generated
44
flake.lock
generated
|
@ -478,6 +478,27 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"jovian": {
|
||||
"inputs": {
|
||||
"nix-github-actions": "nix-github-actions",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1749627191,
|
||||
"narHash": "sha256-bUv8CDE6Uyxak4UkOvRjx5xj6+msEHSpYGeAjkuTnTs=",
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"rev": "f31df4cb6b2eeef6cf0113edb687297be72a69df",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "Jovian-Experiments",
|
||||
"repo": "Jovian-NixOS",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"lib-aggregate": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
|
@ -533,6 +554,28 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"jovian",
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1729697500,
|
||||
"narHash": "sha256-VFTWrbzDlZyFHHb1AlKRiD/qqCJIripXKiCSFS8fAOY=",
|
||||
"owner": "zhaofengli",
|
||||
"repo": "nix-github-actions",
|
||||
"rev": "e418aeb728b6aa5ca8c5c71974e7159c2df1d8cf",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "zhaofengli",
|
||||
"ref": "matrix-name",
|
||||
"repo": "nix-github-actions",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-minecraft": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_3",
|
||||
|
@ -822,6 +865,7 @@
|
|||
"flux": "flux",
|
||||
"himmelblau": "himmelblau",
|
||||
"home-manager": "home-manager",
|
||||
"jovian": "jovian",
|
||||
"nix-minecraft": "nix-minecraft",
|
||||
"nixos-boot": "nixos-boot",
|
||||
"nixpkgs": "nixpkgs_5",
|
||||
|
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
jovian = {
|
||||
url = "github:Jovian-Experiments/Jovian-NixOS";
|
||||
inputs.nixpkgs.follows = "nixpkgs-unstable";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
modules = {
|
||||
system.audio.enable = true;
|
||||
|
||||
gaming.enable = true;
|
||||
desktop.gaming.enable = true;
|
||||
|
||||
root = {
|
||||
user = {
|
||||
|
|
|
@ -13,15 +13,6 @@
|
|||
};
|
||||
|
||||
desktop = {
|
||||
plasma = {
|
||||
enable = true;
|
||||
autoLogin = true;
|
||||
};
|
||||
|
||||
applications = {
|
||||
steam.enable = true;
|
||||
};
|
||||
|
||||
terminal = {
|
||||
default = "ghostty";
|
||||
ghostty.enable = true;
|
||||
|
|
|
@ -42,7 +42,7 @@ in rec
|
|||
})
|
||||
(filterAttrs (n: v: !elem n ["system"]) attrs)
|
||||
(import path)
|
||||
(args@{ ... }: {
|
||||
(args@{ inputs, lib, pkgs, config, options, ... }: {
|
||||
imports = mapModulesRec' ../modules/home (file: (import file (args // { user = "root"; })));
|
||||
})
|
||||
({...}: {
|
||||
|
@ -61,7 +61,7 @@ in rec
|
|||
};
|
||||
})
|
||||
]
|
||||
++ (map (user: (args@{ ... }: {
|
||||
++ (map (user: (args@{ inputs, lib, pkgs, config, options, ... }: {
|
||||
imports = mapModulesRec' ../modules/home (file: (import file (args // { inherit user; })));
|
||||
|
||||
config.modules.${user} = (import "${path}/users/${user}/default.nix" args);
|
||||
|
|
|
@ -1,14 +1,12 @@
|
|||
{ options, config, lib, pkgs, user, ... }:
|
||||
{ config, lib, pkgs, user, ... }:
|
||||
let
|
||||
inherit (lib.modules) mkIf mkForce mkMerge;
|
||||
inherit (lib) mkEnableOption mkIf mkForce mkMerge;
|
||||
|
||||
cfg = config.modules.${user}.desktop.applications.steam;
|
||||
desktop = config.modules.${user}.desktop;
|
||||
in
|
||||
{
|
||||
options.modules.${user}.desktop.applications.steam = let
|
||||
inherit (lib.options) mkEnableOption;
|
||||
in {
|
||||
options.modules.${user}.desktop.applications.steam = {
|
||||
enable = mkEnableOption "Enable steam, the game/software store";
|
||||
hardware.enable = mkEnableOption "Support for steam hardware";
|
||||
};
|
||||
|
|
|
@ -1,17 +1,10 @@
|
|||
{ config, options, lib, pkgs, user, ... }:
|
||||
{ lib, user, ... }:
|
||||
let
|
||||
inherit (builtins) isAttrs;
|
||||
inherit (lib.attrsets) attrValues;
|
||||
inherit (lib.modules) mkIf mkMerge;
|
||||
inherit (lib.my) anyAttrs countAttrs value;
|
||||
|
||||
cfg = config.modules.${user}.desktop;
|
||||
inherit (lib.types) either str;
|
||||
inherit (lib.my) mkOpt;
|
||||
in
|
||||
{
|
||||
options.modules.${user}.desktop = let
|
||||
inherit (lib.types) either str;
|
||||
inherit (lib.my) mkOpt;
|
||||
in {
|
||||
options.modules.${user}.desktop = {
|
||||
type = mkOpt (either str null) "wayland";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
{ config, lib, pkgs, user, ... }:
|
||||
let
|
||||
inherit (lib) mkIf;
|
||||
inherit (lib) mkIf mkDefault;
|
||||
inherit (lib.options) mkOption mkEnableOption;
|
||||
inherit (lib.types) nullOr enum;
|
||||
|
||||
|
@ -31,7 +31,7 @@ in {
|
|||
base16Scheme = "${pkgs.base16-schemes}/share/themes/${cfg.theme}.yaml";
|
||||
image = ./${cfg.theme}.jpg;
|
||||
polarity = cfg.polarity;
|
||||
targets.qt.platform = "kde6";
|
||||
targets.qt.platform = mkDefault "kde6";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
@ -11,10 +11,15 @@ in
|
|||
};
|
||||
|
||||
config = mkIf cfg.enable {
|
||||
jovian.steam = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
|
||||
jovian = {
|
||||
steam = {
|
||||
enable = true;
|
||||
autoStart = true;
|
||||
user = "chris";
|
||||
updater.splash = "steamos";
|
||||
desktopSession = "gamescope-wayland";
|
||||
};
|
||||
steamos.useSteamOSConfig = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue