From b81460db8f6748b7757ab0a4c4ebf2486dab0d84 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Thu, 25 Jan 2024 18:52:40 +0800 Subject: [PATCH] hosts/ni: use NixOS custom desktop profile --- configs/nixos/ni/default.nix | 4 +++- configs/nixos/ni/modules/setups/desktop.nix | 10 ++++++---- configs/nixos/ni/modules/setups/gaming.nix | 3 --- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/configs/nixos/ni/default.nix b/configs/nixos/ni/default.nix index 6813bb82..9d8a3b50 100644 --- a/configs/nixos/ni/default.nix +++ b/configs/nixos/ni/default.nix @@ -1,7 +1,9 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, lib, foodogsquaredModulesPath, ... }: { imports = [ + "${foodogsquaredModulesPath}/profiles/desktop" + # Include the results of the hardware scan. ./hardware-configuration.nix ./modules diff --git a/configs/nixos/ni/modules/setups/desktop.nix b/configs/nixos/ni/modules/setups/desktop.nix index 624aef51..15c52b7e 100644 --- a/configs/nixos/ni/modules/setups/desktop.nix +++ b/configs/nixos/ni/modules/setups/desktop.nix @@ -16,13 +16,15 @@ in # Bring all of the desktop goodies. suites.desktop = { enable = true; - audio.enable = true; - fonts.enable = true; - hardware.enable = true; cleanup.enable = true; - wine.enable = true; }; + environment.systemPackages = with pkgs; [ + # Setup the WINE environment. + wineWowPackages.stable + bottles # The Windows environment package manager. + ]; + # Apparently the Emacs of 3D artists. programs.blender = { enable = true; diff --git a/configs/nixos/ni/modules/setups/gaming.nix b/configs/nixos/ni/modules/setups/gaming.nix index 10e0eba5..4e4afac3 100644 --- a/configs/nixos/ni/modules/setups/gaming.nix +++ b/configs/nixos/ni/modules/setups/gaming.nix @@ -27,9 +27,6 @@ in # This is somewhat used for streaming games from it. programs.steam.remotePlay.openFirewall = true; - # Enable the Wine setup for Linux gaming with Windows games. - suites.desktop.wine.enable = true; - # Yes... Play your Brawl Stars and Clash Royale in NixOS. :) virtualisation.waydroid.enable = true; };