Updated systems

This commit is contained in:
Emmet
2025-04-05 10:40:25 -05:00
parent 145505bd25
commit 13d7a83981
7 changed files with 154 additions and 80 deletions

View File

@@ -1,9 +1,13 @@
{ lib, config, pkgs, ... }:
{ lib, config, pkgs, inputs, ... }:
let
cfg = config.systemSettings.gaming;
in {
imports = [
inputs.jovian.nixosModules.default
];
options = {
systemSettings.gaming = {
enable = lib.mkEnableOption "Enable Steam and games";
@@ -11,7 +15,7 @@ in {
};
config = lib.mkIf cfg.enable {
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" "steam-unwrapped" ];
nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "steam" "steam-unwrapped" "steam-jupiter-unwrapped" ];
nixpkgs.config.packageOverrides = pkgs: {
steam = pkgs.steam.override {
extraPkgs = pkgs: with pkgs; [
@@ -63,6 +67,8 @@ in {
programs.gamemode.enable = true;
programs.gamescope.enable = true;
programs.gamescope.capSysNice = false;
jovian.decky-loader.enable = true;
jovian.hardware.has.amd.gpu = true;
programs.steam.gamescopeSession = {
enable = true;
env = {

View File

@@ -25,17 +25,17 @@ in
# Necessary packages
environment.systemPackages = with pkgs; [
jq
(sddm-chili-theme.override {
themeConfig = {
background = config.stylix.image;
ScreenWidth = 1920;
ScreenHeight = 1080;
blur = true;
recursiveBlurLoops = 3;
recursiveBlurRadius = 5;
# TODO fix icons with svgs patched from stylix colors
};})
jq
(sddm-astronaut.override {
themeConfig = {
# TODO Update Theme Config
# https://github.com/Keyitdev/sddm-astronaut-theme/blob/master/Themes/astronaut.conf
background = config.stylix.image;
ScreenWidth = 1920;
ScreenHeight = 1080;
blur = false;
};
})
];
# Display manager
@@ -43,8 +43,16 @@ in
enable = true;
wayland.enable = true;
enableHidpi = true;
theme = "chili";
package = pkgs.libsForQt5.sddm;
theme = "sddm-astronaut-theme";
package = pkgs.kdePackages.sddm;
extraPackages = with pkgs; [
(sddm-astronaut.override {
themeConfig = {
background = config.stylix.image;
ScreenWidth = 1920;
ScreenHeight = 1080;
blur = false;
};})];
};
services.upower.enable = true;

View File

@@ -37,11 +37,11 @@
pushd ${config.systemSettings.dotfilesDir} &> /dev/null;
nix flake update "''${@:2}";
popd &> /dev/null;
if [ "$#" -eq 1 ]; then
pushd ${config.systemSettings.secretsFlakeDir} &> /dev/null;
nix flake update;
popd &> /dev/null;
fi
#if [ "$#" -eq 1 ]; then
# pushd ${config.systemSettings.secretsFlakeDir} &> /dev/null;
# nix flake update;
# popd &> /dev/null;
#fi
exit 0;
elif [ "$1" = "pull" ]; then
if [ "$#" -gt 1 ]; then