New Flake Style XPS fix
This commit is contained in:
17
flake.nix
17
flake.nix
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user