From 068a46a9bf6772e81037b9116d9946cf09cbf292 Mon Sep 17 00:00:00 2001 From: kenji Date: Thu, 31 Jul 2025 07:07:46 -0500 Subject: [PATCH] added mkOverride --- config.nix | 2 +- hosts/hakase/configuration.nix | 10 +++++----- packages/hypridle/home.nix | 2 +- packages/steam/jovian.nix | 3 ++- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/config.nix b/config.nix index cc91f16..3f2c931 100644 --- a/config.nix +++ b/config.nix @@ -17,7 +17,7 @@ nixos = { Hostname = "hakase"; Timezone = "America/Chicago"; - enableSteamOS = true; + enableSteamOS = false; Boot = { mode = "systemd"; # systemd or grub diff --git a/hosts/hakase/configuration.nix b/hosts/hakase/configuration.nix index 0261757..2c06426 100644 --- a/hosts/hakase/configuration.nix +++ b/hosts/hakase/configuration.nix @@ -96,13 +96,13 @@ }; services = { - displayManager.sessionPackages = lib.mkIf (!myConfig.nixos.enableSteamOS) [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland]; - getty.autologinUser = lib.mkIf (!myConfig.nixos.enableSteamOS) "${myConfig.essentials.Username}"; - greetd = lib.mkIf (!myConfig.nixos.enableSteamOS) { + displayManager.sessionPackages = [inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland]; + getty.autologinUser = lib.mkDefault "${myConfig.essentials.Username}"; + greetd = { enable = true; settings.default_session = { - user = "${myConfig.essentials.Username}"; - command = "Hyprland"; + user = lib.mkOverride 10 "${myConfig.essentials.Username}"; + command = lib.mkDefault "Hyprland"; }; }; seatd.enable = true; diff --git a/packages/hypridle/home.nix b/packages/hypridle/home.nix index 01ea574..fc64038 100644 --- a/packages/hypridle/home.nix +++ b/packages/hypridle/home.nix @@ -1,6 +1,6 @@ {...}: { services.hypridle = { - enable = true; + enable = false; settings = { general = { lock_cmd = "pidof hyprlock || hyprlock"; # avoid starting multiple hyprlock instances. diff --git a/packages/steam/jovian.nix b/packages/steam/jovian.nix index 3763b1b..52dc438 100644 --- a/packages/steam/jovian.nix +++ b/packages/steam/jovian.nix @@ -2,6 +2,7 @@ inputs, pkgs, myConfig, + lib, ... }: { imports = [ @@ -13,7 +14,7 @@ }; # environment.systemPackages = with pkgs; [inputs.jovian.packages.${system}.default]; jovian.steam.enable = true; - jovian.steam.autoStart = true; + jovian.steam.autoStart = myConfig.nixos.enableSteamOS; jovian.steam.desktopSession = "hyprland"; jovian.steam.user = "${myConfig.essentials.Username}"; jovian.hardware.has.amd.gpu = true;