From ce7d04867bb129ab1cfe6d9d6a7242b45bac545f Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Tue, 5 Mar 2024 15:09:46 +0000 Subject: [PATCH] Update wsl --- flake.nix | 18 +++++++++++++++++- hosts/lucca/hardware-configuration.nix | 6 ++++-- modules/misc/nvim/lazy-lock.json | 2 +- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 956b674..bbe6dc9 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,10 @@ }; impermanence.url = "github:nix-community/impermanence"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; + nixos-wsl = { + url = "github:nix-community/NixOS-WSL"; + inputs.nixpkgs.follows = "nixpkgs"; + }; nix-index-database = { url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; @@ -125,7 +129,19 @@ }) ]; - lucca = mkSystem "lucca" "none" []; + lucca = mkSystem "lucca" "none" [ + ({pkgs, ...}: { + imports = [ + inputs.nixos-wsl.nixosModules.wsl + ]; + wsl.enable = true; + wsl.defaultUser = "zoriya"; + environment.systemPackages = with pkgs; [ + wslu + wsl-open + ]; + }) + ]; }; }; } diff --git a/hosts/lucca/hardware-configuration.nix b/hosts/lucca/hardware-configuration.nix index 5e745e2..13c4b33 100644 --- a/hosts/lucca/hardware-configuration.nix +++ b/hosts/lucca/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ lib, ... }: { imports = [ ]; @@ -11,6 +11,8 @@ boot.kernelModules = [ ]; boot.extraModulePackages = [ ]; + boot.loader.systemd-boot.enable = lib.mkForce false; + fileSystems."/mnt/wsl" = { device = "none"; fsType = "tmpfs"; @@ -32,7 +34,7 @@ }; fileSystems."/mnt/wslg/distro" = - { device = ""; + { device = "none"; fsType = "none"; options = [ "bind" ]; }; diff --git a/modules/misc/nvim/lazy-lock.json b/modules/misc/nvim/lazy-lock.json index 65e5037..4e035f4 100644 --- a/modules/misc/nvim/lazy-lock.json +++ b/modules/misc/nvim/lazy-lock.json @@ -16,7 +16,7 @@ "increment-activator": { "branch": "master", "commit": "55efcff88be45bd98cfdf7333dd718399373d10c" }, "indent-blankline.nvim": { "branch": "master", "commit": "821a7acd88587d966f7e464b0b3031dfe7f5680c" }, "lazy-lsp.nvim": { "branch": "master", "commit": "cdfeaf4f6c1714990180453723921002374a30de" }, - "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, + "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, "lsp_signature.nvim": { "branch": "master", "commit": "fed2c8389c148ff1dfdcdca63c2b48d08a50dea0" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },