From 27670c281d28efdb19abdc29d3d86b8593669df0 Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Mon, 7 Aug 2023 07:05:13 +0000 Subject: [PATCH] Update flake for WSL system --- flake.lock | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++---- flake.nix | 15 +++++----- 2 files changed, 85 insertions(+), 14 deletions(-) diff --git a/flake.lock b/flake.lock index 7193032..cc11a21 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,27 @@ { "nodes": { + "NixOS-WSL": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1690553050, + "narHash": "sha256-pK3kF30OykL3v6P8UP6ipihlS34KoGq9SryCj3tHrFw=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "f7a95a37306c46b42e9ce751977c44c752fd5eca", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NixOS-WSL", + "type": "github" + } + }, "aurora-blog-template": { "inputs": { "nixpkgs": "nixpkgs" @@ -18,6 +40,40 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -25,11 +81,11 @@ ] }, "locked": { - "lastModified": 1691143977, - "narHash": "sha256-zXHmmghQdDLecVxFedRxSny4FtVH9lig1/BKObsHwfg=", + "lastModified": 1691312444, + "narHash": "sha256-J9e9dGwAPTX+UlAn8jehoyaEq6fwK+L+gunfx0cYT4E=", "owner": "nix-community", "repo": "home-manager", - "rev": "15043a65915bcc16ad207d65b202659e4988066b", + "rev": "903e06d734bcae48efb79b9afd51b406d2744179", "type": "github" }, "original": { @@ -55,11 +111,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1691006197, - "narHash": "sha256-DbtxVWPt+ZP5W0Usg7jAyTomIM//c3Jtfa59Ht7AV8s=", + "lastModified": 1691368598, + "narHash": "sha256-ia7li22keBBbj02tEdqjVeLtc7ZlSBuhUk+7XTUFr14=", "owner": "nixos", "repo": "nixpkgs", - "rev": "66aedfd010204949cb225cf749be08cb13ce1813", + "rev": "5a8e9243812ba528000995b294292d3b5e120947", "type": "github" }, "original": { @@ -71,12 +127,28 @@ }, "root": { "inputs": { + "NixOS-WSL": "NixOS-WSL", "aurora-blog-template": "aurora-blog-template", "home-manager": "home-manager", "nixpkgs": "nixpkgs_2", "website": "website" } }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "website": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index f157c99..912ebfc 100644 --- a/flake.nix +++ b/flake.nix @@ -12,14 +12,13 @@ flake = false; }; aurora-blog-template.url = "github:thiloho/aurora"; - # NixOS-WSL = { - # url = "github:nix-community/NixOS-WSL"; - # inputs.nixpkgs.follows = "nixpkgs"; - # }; + NixOS-WSL = { + url = "github:nix-community/NixOS-WSL"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; - # Add NixOS Wsl in case it is needed here - outputs = inputs@{ nixpkgs, home-manager, ... }: { + outputs = inputs@{ nixpkgs, home-manager, NixOS-WSL, ... }: { nixosConfigurations = let mkSystem = entrypoint: nixpkgs.lib.nixosSystem { system = "x86_64-linux"; @@ -30,7 +29,7 @@ }; } entrypoint - # NixOS-WSL.nixosModules.wsl + NixOS-WSL.nixosModules.wsl home-manager.nixosModules.home-manager { home-manager = { @@ -44,7 +43,7 @@ pc = mkSystem ./nixos-configurations/pc; laptop = mkSystem ./nixos-configurations/laptop; server = mkSystem ./nixos-configurations/server; - # wsl = mkSystem ./nixos-configurations/wsl; + wsl = mkSystem ./nixos-configurations/wsl; }; }; }