From 53a10e993bc6aeeba53805c6f1d7207ff2f25167 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Mon, 24 Feb 2025 22:48:59 +0000 Subject: [PATCH] Fixes / changes --- flake.nix | 6 +----- modules/common-desktop/bin.nix | 1 - modules/common-desktop/desktop.nix | 1 - modules/common-desktop/steam.nix | 6 +----- modules/{common-desktop => common}/dns.nix | 0 modules/common/packages.nix | 4 +++- 6 files changed, 5 insertions(+), 13 deletions(-) delete mode 100644 modules/common-desktop/bin.nix rename modules/{common-desktop => common}/dns.nix (100%) diff --git a/flake.nix b/flake.nix index bcf577d..e4de62b 100755 --- a/flake.nix +++ b/flake.nix @@ -28,16 +28,12 @@ opt = nixpkgs.lib.optionals; dirFiles = dir: map (file: "${dir}/${file}") (builtins.attrNames (builtins.readDir dir)); }; - nixpkgs-teams = import inputs.nixpkgs-teams { - system = "x86_64-linux"; - config.allowUnfree = true; - }; system = hostname: isDesktop: with dirUtils; nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit inputs self isDesktop dirUtils nixpkgs-teams; + inherit inputs self isDesktop dirUtils; }; modules = diff --git a/modules/common-desktop/bin.nix b/modules/common-desktop/bin.nix deleted file mode 100644 index fce3166..0000000 --- a/modules/common-desktop/bin.nix +++ /dev/null @@ -1 +0,0 @@ -{environment.localBinInPath = true;} diff --git a/modules/common-desktop/desktop.nix b/modules/common-desktop/desktop.nix index 1a2b48a..f613753 100644 --- a/modules/common-desktop/desktop.nix +++ b/modules/common-desktop/desktop.nix @@ -1,6 +1,5 @@ { environment.sessionVariables.NIXOS_OZONE_WL = "1"; - environment.sessionVariables.GSK_RENDERER = "ngl"; services.xserver = { enable = true; diff --git a/modules/common-desktop/steam.nix b/modules/common-desktop/steam.nix index bf74191..dee9756 100644 --- a/modules/common-desktop/steam.nix +++ b/modules/common-desktop/steam.nix @@ -1,8 +1,4 @@ -{ - pkgs, - inputs, - ... -}: { +{pkgs, ...}: { programs.steam = { enable = true; extraCompatPackages = [pkgs.proton-ge-bin]; diff --git a/modules/common-desktop/dns.nix b/modules/common/dns.nix similarity index 100% rename from modules/common-desktop/dns.nix rename to modules/common/dns.nix diff --git a/modules/common/packages.nix b/modules/common/packages.nix index 6462967..7c12c8b 100644 --- a/modules/common/packages.nix +++ b/modules/common/packages.nix @@ -1 +1,3 @@ -{...}: {} +{ + # Todo +}