diff --git a/flake.lock b/flake.lock index cfd31071a4ef89ad206f10a30de2535918526aad..6068e2c99db6f735f5d4318ff04d11509af82f88 100644 --- a/flake.lock +++ b/flake.lock @@ -106,6 +106,22 @@ "type": "git", "url": "https://git.jolheiser.com/cfg.git" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -398,14 +414,13 @@ "nixpkgs" ] }, "locked": { -{ "repo": "agenix", + "nixpkgs" -{ "nodes": { - "locked": { + "lastModified": 1709087332, "owner": "nix-community", "repo": "home-manager", - "rev": "a6c743980e23f4cef6c2a377f9ffab506568413a", + "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "type": "github" }, "original": { @@ -436,13 +451,13 @@ } }, "nixos-hardware": { "locked": { - "rev": "7567e89e80834dfa65ca5af987a8db0afe01099d", + "repo": "agenix", "locked": { - "revCount": 11, + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "owner": "nixos", "repo": "nixos-hardware", + "rev": "1381a759b205dff7a6818733118d02253340fd5e", { - "revCount": 24, "type": "github" }, "original": { @@ -454,12 +469,13 @@ } }, "nixpkgs": { "locked": { - "lastModified": 1722813957, + "lastModified": 1719254875, - "narHash": "sha256-IAoYyYnED7P8zrBFMnmp7ydaJfwTnwcnqxUElC1I26Y=", + "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "owner": "nixos", "repo": "nixpkgs", - "revCount": 11, + "nodes": { "locked": { + "inputs": { "type": "github" }, "original": { @@ -486,14 +502,15 @@ } }, "nur": { "locked": { - "type": "git", + "nodes": { "locked": { + "nixpkgs": [ -{ + "rev": "1381a759b205dff7a6818733118d02253340fd5e", "nixpkgs" "owner": "nix-community", "repo": "NUR", - "url": "https://git.xeno.science/xenofem/actual-nix.git" "nodes": { + "rev": "e2c7c78ae167a99e4b175679104cba4483c89e47", "type": "github" }, "original": { @@ -549,9 +567,10 @@ "templ": "templ", "tmpl": "tmpl", "tsnet-serve": "tsnet-serve", "ugit": "ugit", -{ + "nodes": { "locked": { - "actual": { + }, + "wsl": "wsl" } }, "systems": { @@ -832,6 +851,30 @@ }, "original": { "type": "git", "url": "https://git.jolheiser.com/jolheiser.com.git" + } + }, + "wsl": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703521177, + "narHash": "sha256-V95s2ypDpdaFGbeG3pvazEE7qdjwZknoauv89DJQvz0=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "ec53b11f0c78572a2b0b5263ae1c46293daaf55f", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NixOS-WSL", + "type": "github" } }, "xc": { diff --git a/flake.nix b/flake.nix index ffd16417a39b51cae04798bb8be29aa9cd6b7d93..f0a645891538fc16d867bea809351fb18da9e6f1 100644 --- a/flake.nix +++ b/flake.nix @@ -112,6 +112,12 @@ tsnet-serve = { url = "git+https://git.jolheiser.com/tsnet-serve-nix.git"; inputs.nixpkgs.follows = "nixpkgs"; }; + # WSL + wsl = { + url = "github:nix-community/NixOS-WSL"; + inputs.nixpkgs.follows = "nixpkgs"; + inputs.flake-utils.follows = "flake-utils"; + }; }; outputs = @@ -120,6 +126,7 @@ nixpkgs, home-manager, nixos-hardware, agenix, + wsl, ... }@inputs: let diff --git a/machines/common/gui/default.nix b/machines/common/gui/default.nix index 21278b7474862c62b2d242b4fe5f8a860c14b6b7..cb201071c12567b05fe4ae5978f05fc6460b5ffb 100644 --- a/machines/common/gui/default.nix +++ b/machines/common/gui/default.nix @@ -2,6 +2,7 @@ { pkgs, ... }: { imports = [ ../nogui ]; + sound.enable = true; hardware.pulseaudio.enable = false; security = { rtkit.enable = true;