New Flake Style XPS fix

This commit is contained in:
Lennart J. Kurzweg (Nx2)
2025-05-27 12:12:36 +02:00
parent ce140cf4f2
commit 68cb4377b7
52 changed files with 220 additions and 245 deletions

View File

@@ -27,14 +27,13 @@
outputs = { self, ... }@inputs: with inputs; let
system = "x86_64-linux";
# config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
config = {};
config = { allowUnfree = true; allowUnfreePredicate = pkg: builtins.elem (pkgs.lib.getName pkg) (import ./flake-modules/allowed.nix).unfree; };
hyper-base = rec {
inherit system;
user = "nx2";
domain = "nx2.site";
home = "/home/${user}"; # no tailing slash!
home = "/home/${user}/";
};
pkgs = import nixpkgs { inherit system config; } // {
@@ -43,7 +42,7 @@
version = "25.05";
};
nvidia-set = import ./flake-modules/nvidia.nix;
nvidia-base = import ./flake-modules/nvidia.nix;
secrets = import ./git-crypt/secrets.nix;
rice = import ./flake-modules/rice.nix pkgs;
@@ -53,9 +52,8 @@
inherit system;
modules = [ ./configuration.nix ];
specialArgs = let
nvidia = nvidia-set // nvidia-settings;
hyper = hyper-base // { inherit host; };
in { inherit pkgs inputs hyper rice secrets nvidia; };
hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
in { inherit pkgs inputs hyper rice secrets; };
};
make-nixos-wsl-system = host: nixpkgs.lib.nixosSystem {
inherit system;
@@ -91,9 +89,8 @@
inherit pkgs;
modules = [ ./home.nix ];
extraSpecialArgs = let
hyper = hyper-base // { inherit host; };
nvidia = nvidia-set // nvidia-settings;
in { inherit pkgs inputs hyper rice secrets nvidia; };
hyper = hyper-base // { inherit host; nvidia = nvidia-base // nvidia-settings; };
in { inherit pkgs inputs hyper rice secrets; };
};
make-shell-configuration = host: user: home-manager.lib.homeManagerConfiguration {
inherit pkgs;