From fe41f5be0f8f2a62296069aec47ee2ae4390d08c Mon Sep 17 00:00:00 2001 From: Ivan Dimitrov Date: Sat, 18 Nov 2023 10:08:36 +0200 Subject: [PATCH] fixing gaming module --- flake.nix | 11 ++--------- modules/default.nix | 4 ++-- modules/gaming/default.nix | 29 ++++++++++++----------------- nixos/default.nix | 1 + 4 files changed, 17 insertions(+), 28 deletions(-) diff --git a/flake.nix b/flake.nix index a912b21..615640d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,14 +15,7 @@ }; }; - outputs = - { self - , nixpkgs - , home-manager - , hosts - , ide - , ... - }: + outputs = { self, nixpkgs, home-manager, hosts, ide, ... }: let system = "x86_64-linux"; my-overlay = self: super: { @@ -33,7 +26,7 @@ overlays = [ my-overlay ]; }; modules = import ./modules { - inherit system pkgs ide my-overlay; + inherit system nixpkgs pkgs ide my-overlay; }; home = import ./home { inherit system pkgs modules home-manager; diff --git a/modules/default.nix b/modules/default.nix index ec61e1c..61b1637 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -1,6 +1,6 @@ -{ system, pkgs, ide, my-overlay, ... }: +{ system, nixpkgs, pkgs, ide, my-overlay, ... }: { - gaming = import ./gaming { }; + gaming = import ./gaming { inherit nixpkgs; }; dnscrypt = import ./dnscrypt; packages = import ./packages { inherit pkgs; }; programs = import ./programs { inherit pkgs; }; diff --git a/modules/gaming/default.nix b/modules/gaming/default.nix index c6c23e9..4dc3493 100644 --- a/modules/gaming/default.nix +++ b/modules/gaming/default.nix @@ -1,15 +1,16 @@ -{ config, lib, pkgs, ... }: +{ nixpkgs, ... }: { - nixpkgs.config.allowUnfreePredicate = pkg: - builtins.elem (lib.getName pkg) [ - "nvidia-settings" - "nvidia-x11" - "nvidia-persistenced" - "steam" - "steamcmd" - "steam-original" - "steam-run" - ]; + # Uses unfree shit + # nixpkgs.config.allowUnfreePredicate = pkg: + # builtins.elem (nixpkgs.lib.getName pkg) [ + # "nvidia-settings" + # "nvidia-x11" + # "nvidia-persistenced" + # "steam" + # "steamcmd" + # "steam-original" + # "steam-run" + # ]; services.xserver.videoDrivers = [ "nvidia" ]; hardware.nvidia = { @@ -25,11 +26,5 @@ programs.steam = { enable = true; }; - environment = { - systemPackages = with pkgs; [ - steamcmd - steam-tui - ]; - }; } diff --git a/nixos/default.nix b/nixos/default.nix index aa815aa..3f63ac2 100644 --- a/nixos/default.nix +++ b/nixos/default.nix @@ -5,6 +5,7 @@ ../hardware-configuration.nix ./laptop modules.dnscrypt + # modules.gaming hosts.nixosModule ]; };