From 509f55db30022d5bd5a4834b0859192bb8fbd212 Mon Sep 17 00:00:00 2001 From: soraefir Date: Sat, 30 May 2026 18:03:38 +0200 Subject: [PATCH] fix build --- flake.lock | 141 ++++++++++++++++++++++-- generator.nix | 6 +- modules/nixos/tools/develop/default.nix | 1 - modules/shared/syscfg/default.nix | 2 +- 4 files changed, 134 insertions(+), 16 deletions(-) diff --git a/flake.lock b/flake.lock index f0a9838..4abc748 100644 --- a/flake.lock +++ b/flake.lock @@ -37,6 +37,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -58,6 +74,24 @@ "type": "github" } }, + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "hardware": { "locked": { "lastModified": 1779258371, @@ -129,18 +163,37 @@ "type": "github" } }, - "nixpkgs": { + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat", + "nixpkgs": "nixpkgs" + }, "locked": { - "lastModified": 1779102034, - "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "lastModified": 1777732699, + "narHash": "sha256-2uX/XtOWZ/oy2rerRynVhqVA//ZXZ3Fo60PikLHEPQc=", + "owner": "nix-community", + "repo": "nixos-wsl", + "rev": "5482f113fd31ebac131d1ebeb2ae90bf0d5e41f5", "type": "github" }, "original": { - "owner": "nixos", - "ref": "nixos-25.11", + "owner": "nix-community", + "repo": "nixos-wsl", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1776169885, + "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -161,6 +214,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1779102034, + "narHash": "sha256-vZJZjLo513IeI8hjzHFc6TDezUd4uCE2Eq4SNO3DNNg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "687f05a9184cad4eaf905c48b63649e3a86f5433", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1778869304, "narHash": "sha256-30sZNZoA1cqF5JNO9fVX+wgiQYjB7HJqqJ4ztCDeBZE=", @@ -176,10 +245,24 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1682134069, + "narHash": "sha256-TnI/ZXSmRxQDt2sjRYK/8j8iha4B4zP2cnQCZZ3vp7k=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "fd901ef4bf93499374c5af385b2943f5801c0833", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nur": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1779398206, @@ -202,9 +285,11 @@ "home-manager": "home-manager", "nix-colors": "nix-colors", "nixUnstable": "nixUnstable", - "nixpkgs": "nixpkgs", + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_2", "nur": "nur", - "sops-nix": "sops-nix" + "sops-nix": "sops-nix", + "vscode-server": "vscode-server" } }, "sops-nix": { @@ -226,6 +311,40 @@ "repo": "sops-nix", "type": "github" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "vscode-server": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1770124655, + "narHash": "sha256-yHmd2B13EtBUPLJ+x0EaBwNkQr9LTne1arLVxT6hSnY=", + "owner": "nix-community", + "repo": "nixos-vscode-server", + "rev": "92ce71c3ba5a94f854e02d57b14af4997ab54ef0", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nixos-vscode-server", + "type": "github" + } } }, "root": "root", diff --git a/generator.nix b/generator.nix index 649ff63..ef7dafc 100755 --- a/generator.nix +++ b/generator.nix @@ -16,9 +16,9 @@ inputs.sops-nix.nixosModules.sops inputs.home-manager.nixosModules.home-manager - (if (syscfg.syscfg.extra.wsl) then inputs.nixos-wsl.nixosModules.wsl else "") - (if (syscfg.syscfg.extra.wsl) then inputs.vscode-server.nixosModules.default else "") - + inputs.nixos-wsl.nixosModules.wsl + inputs.vscode-server.nixosModules.default + { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; diff --git a/modules/nixos/tools/develop/default.nix b/modules/nixos/tools/develop/default.nix index 80123ca..388120a 100644 --- a/modules/nixos/tools/develop/default.nix +++ b/modules/nixos/tools/develop/default.nix @@ -15,7 +15,6 @@ in { enableFHS = true; }; - environment.systemPackages = with pkgs; [ # android-tools diff --git a/modules/shared/syscfg/default.nix b/modules/shared/syscfg/default.nix index 865486a..99ae6b4 100644 --- a/modules/shared/syscfg/default.nix +++ b/modules/shared/syscfg/default.nix @@ -16,7 +16,7 @@ in with lib; { }; defaultUser = mkOption { type = types.str; }; make = import ./make.nix {inherit lib;}; - net = import ./net.nix {inherit lib;}; + net = import ./net.nix {inherit lib;}; users = mkOption { type = types.listOf (types.submodule { options = import ./user.nix {inherit lib;}; }); default = [ ];