1
1
Fork 0

Compare commits

...

2 Commits

Author SHA1 Message Date
Jaculabilis 1a3b50e11d Disable start menu launchers and restore upstream input 2022-12-21 18:19:58 +00:00
Tim Van Baak b6f3abccbe Move nixos-wsl module import to flake def
This avoids having to use specialArgs to pass it down to the configuration file to import there
2022-12-21 18:18:25 +00:00
3 changed files with 13 additions and 15 deletions

View File

@ -40,16 +40,15 @@
]
},
"locked": {
"lastModified": 1671498165,
"narHash": "sha256-BznhoEdQN9dzN0/2CpmvMlrVezZbca3i6KB5rr/3QBE=",
"owner": "Jaculabilis",
"lastModified": 1671480147,
"narHash": "sha256-IzWdZL8jMNtyKsXXJjn2L4MsBeR52WBdhciPw4latHU=",
"owner": "nix-community",
"repo": "NixOS-WSL",
"rev": "088e331ab2d4588b3b54b17b47569807e83d8ad9",
"rev": "577d7919e4380e6905e69d4a5f8f48a41ca37187",
"type": "github"
},
"original": {
"owner": "Jaculabilis",
"ref": "skip-copy",
"owner": "nix-community",
"repo": "NixOS-WSL",
"type": "github"
}

View File

@ -1,12 +1,11 @@
{
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs?ref=refs/tags/22.11";
#nixos-wsl.url = "github:nix-community/NixOS-WSL";
nixos-wsl.url = "github:Jaculabilis/NixOS-WSL/skip-copy";
nixos-wsl.url = "github:nix-community/NixOS-WSL";
nixos-wsl.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = { self, nixpkgs, nixos-wsl }@attrs: {
outputs = { self, nixpkgs, nixos-wsl }: {
nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem {
system = "aarch64-linux";
modules = [ ./machine/catacomb ];
@ -17,8 +16,10 @@
};
nixosConfigurations.stagirite = nixpkgs.lib.nixosSystem {
system = "x86_64-linux";
specialArgs = attrs;
modules = [ ./machine/stagirite ];
modules = [
nixos-wsl.nixosModules.wsl
./machine/stagirite
];
};
};
}

View File

@ -1,4 +1,4 @@
{ lib, pkgs, config, modulesPath, nixos-wsl, ... }:
{ lib, pkgs, config, modulesPath, ... }:
with lib;
let
@ -7,15 +7,13 @@ in
{
imports = [
"${modulesPath}/profiles/minimal.nix"
nixos-wsl.nixosModules.wsl
];
wsl = {
enable = true;
wslConf.automount.root = "/mnt";
defaultUser = "nixos";
startMenuLaunchers = true;
startMenuLaunchers = false;
};
system.stateVersion = "21.11";