albert/nix
albert/nix
1
0
Fork 0
Code Issues Pull requests Activity Actions

Test

Browse source
This commit is contained in:
albert 2024-03-20 17:26:47 +09:00
parent 99a388b850
commit 6e5ef7ddf5
No known key found for this signature in database
GPG key ID: 64F6C4EB46C4543A
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/default.nix
View file

@ -73,7 +73,7 @@
type ? "default", type ? "default",
repo ? "nixpkgs", repo ? "nixpkgs",
unfree ? false unfree ? false
}:inputs.${repo}.lib.nixosSystem { }: inputs.${repo}.lib.nixosSystem {
specialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme self; specialArgs = { inherit inputs outputs desktop hostname username hmStateVersion stateVersion gpu system theme self;
# Choose whether to pull from stable or unstable # Choose whether to pull from stable or unstable
pkgs = import inputs.${repo} { pkgs = import inputs.${repo} {
@ -132,8 +132,7 @@
gpu ? null, gpu ? null,
theme ? "stylix", theme ? "stylix",
format format
}: }: inputs.nixos-generators.nixosGenerate {
inputs.nixos-generators.nixosGenerate {
specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; }; specialArgs = { inherit inputs outputs desktop hostname username stateVersion hmStateVersion gpu system theme format; };
system = system; system = system;
format = format; format = format;

2
nixos/hosts/framework-server/containers.nix
View file

@ -3,6 +3,6 @@ let
libx = import ../../../lib {inherit self inputs outputs stateVersion hmStateVersion; }; libx = import ../../../lib {inherit self inputs outputs stateVersion hmStateVersion; };
in { in {
containers = { containers = {
rdesktop = libx.mkContainer { container = "rdesktop"; }; rdesktop = libx.mkContainer { container = "rdesktop"; desktop = "xfce";};
}; };
} }