Jaculabilis
/
nixos-configs
1
1
Fork 0
Code Releases Activity

Compare commits

base: Jaculabilis:af6bb08705b8db6fccf6053e4ca9b56c37adcb63
Branches Tags
Jaculabilis:master
Jaculabilis:guesshtbook
Jaculabilis:syncthings
Jaculabilis:backyard
Jaculabilis:machine/workeric
Jaculabilis:machine/serveric
...
compare: Jaculabilis:1a3b50e11d9a8a769d9e4f071ed13a1a16c4bdc0
Branches Tags
Jaculabilis:master
Jaculabilis:guesshtbook
Jaculabilis:syncthings
Jaculabilis:backyard
Jaculabilis:machine/workeric
Jaculabilis:machine/serveric

2 Commits
af6bb08705 ... 1a3b50e11d

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
Show Stats Expand all files Collapse all files

11
flake.lock
View File

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

11
flake.nix
View File

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

6
machine/stagirite/default.nix
View File

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