From bc94adbc3288c0090cd0055d8070f1f3375bc1b1 Mon Sep 17 00:00:00 2001 From: sstent Date: Sun, 19 Feb 2023 14:26:51 -0500 Subject: [PATCH] sync --- hosts/wsl2/default.nix | 27 +++++++-------------------- result | 2 +- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/hosts/wsl2/default.nix b/hosts/wsl2/default.nix index ddc98ba..4a99748 100644 --- a/hosts/wsl2/default.nix +++ b/hosts/wsl2/default.nix @@ -1,32 +1,13 @@ { lib, pkgs, config, modulesPath, ... }: { - system.stateVersion = "22.05"; # Enable nix flakes nix.package = pkgs.nixFlakes; nix.extraOptions = '' experimental-features = nix-command flakes ''; - systemd.services.nixs-wsl-systemd-fix = { - description = "Fix the /dev/shm symlink to be a mount"; - unitConfig = { - DefaultDependencies = "no"; - Before = "sysinit.target"; - ConditionPathExists = "/dev/shm"; - ConditionPathIsSymbolicLink = "/dev/shm"; - ConditionPathIsMountPoint = "/run/shm"; - }; - serviceConfig = { - Type = "oneshot"; - ExecStart = [ - "${pkgs.coreutils-full}/bin/rm /dev/shm" - "/run/wrappers/bin/mount --bind -o X-mount.mkdir /run/shm /dev/shm" - ]; - }; - wantedBy = [ "sysinit.target" ]; - }; - + system.stateVersion = "22.11"; wsl = { enable = true; @@ -34,6 +15,12 @@ defaultUser = "sstent"; startMenuLaunchers = true; interop.preserveArgvZero = true; + + # Enable native Docker support + # docker-native.enable = true; + + # Enable integration with Docker Desktop (needs to be installed) + # docker-desktop.enable = true; }; mymods = { diff --git a/result b/result index 9bcb8df..7a8035c 120000 --- a/result +++ b/result @@ -1 +1 @@ -/nix/store/gcif5m5129qmsf525m75dhhjqz4xfsh8-nixos-hyperv-23.05.20230213.545c7a3-x86_64-linux \ No newline at end of file +/nix/store/sr4j46b5wdy43am97p4v46rhr1lc8wq2-tarball \ No newline at end of file