diff --git a/flake.lock b/flake.lock index bcd721c..ba798a6 100644 --- a/flake.lock +++ b/flake.lock @@ -19,6 +19,22 @@ } }, "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-compat_2": { "locked": { "lastModified": 1688025799, "narHash": "sha256-ktpB4dRtnksm9F5WawoIkEneh1nrEvuxb5lJFt1iOyw=", @@ -33,7 +49,7 @@ "type": "github" } }, - "flake-compat_2": { + "flake-compat_3": { "flake": false, "locked": { "lastModified": 1673956053, @@ -111,6 +127,24 @@ "inputs": { "systems": "systems_4" }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_5" + }, "locked": { "lastModified": 1705309234, "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", @@ -125,9 +159,9 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_5": { "inputs": { - "systems": "systems_5" + "systems": "systems_6" }, "locked": { "lastModified": 1710146030, @@ -143,7 +177,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_6": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -358,7 +392,7 @@ }, "lib-aggregate": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs-lib": "nixpkgs-lib" }, "locked": { @@ -419,7 +453,7 @@ "inputs": { "flake-parts": "flake-parts", "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -478,6 +512,27 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1716640344, + "narHash": "sha256-AZKQs+KrL70le0RZH8XqZJMc2SahU4LpfEJ2Vd5SWzM=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "020cd466170204e448b24b246045599fce69ad91", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1712163089, @@ -511,10 +566,10 @@ }, "nixpkgs-wayland": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "lib-aggregate": "lib-aggregate", "nix-eval-jobs": "nix-eval-jobs", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1716495701, @@ -579,6 +634,22 @@ } }, "nixpkgs_5": { + "locked": { + "lastModified": 1714782413, + "narHash": "sha256-tbg0MEuKaPcUrnmGCu4xiY5F+7LW2+ECPKVAJd2HLwM=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "651b4702e27a388f0f18e1b970534162dec09aff", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_6": { "locked": { "lastModified": 1716358718, "narHash": "sha256-NQbegJb2ZZnAqp2EJhWwTf6DrZXSpA6xZCEq+RGV1r0=", @@ -594,7 +665,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1715037484, "narHash": "sha256-OUt8xQFmBU96Hmm4T9tOWTu4oCswCzoVl+pxSq/kiFc=", @@ -610,7 +681,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1716330097, "narHash": "sha256-8BO3B7e3BiyIDsaKA0tY8O88rClYRTjvAp66y+VBUeU=", @@ -626,7 +697,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1714076141, "narHash": "sha256-Drmja/f5MRHZCskS6mvzFqxEaZMeciScCTFxWVLqWEY=", @@ -644,7 +715,7 @@ }, "pixi": { "inputs": { - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pixi-source": "pixi-source" }, "locked": { @@ -686,7 +757,8 @@ "lix": "lix", "lix-module": "lix-module", "nix-index-database": "nix-index-database", - "nixpkgs": "nixpkgs_5", + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_6", "nixpkgs-wayland": "nixpkgs-wayland", "pixi": "pixi", "stable": "stable", @@ -786,6 +858,21 @@ "type": "github" } }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -862,8 +949,8 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_5", + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_6", "nixpkgs": [ "zls", "nixpkgs" @@ -885,7 +972,7 @@ }, "zig2nix": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -906,7 +993,7 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_4", + "flake-utils": "flake-utils_5", "gitignore": "gitignore", "langref": "langref", "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 007ff8f..4e6fd07 100644 --- a/flake.nix +++ b/flake.nix @@ -4,6 +4,9 @@ outputs = inputs: (import ./lib inputs).oizysFlake; inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + stable.url = "github:nixos/nixpkgs/nixos-23.11"; + lix.url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; lix.flake = false; @@ -11,11 +14,7 @@ lix-module.inputs.lix.follows = "lix"; # lix-module.inputs.nixpkgs.follows = "nixpkgs"; - nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; - stable.url = "github:nixos/nixpkgs/nixos-23.11"; - - tsm.url = "github:daylinmorgan/tsm?dir=nix"; - tsm.inputs.nixpkgs.follows = "nixpkgs"; + nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; # see todo.md hyprland.url = "git+https://github.com/hyprwm/Hyprland/?submodules=1&rev=4cdddcfe466cb21db81af0ac39e51cc15f574da9"; @@ -31,8 +30,9 @@ zls.url = "github:zigtools/zls"; zls.inputs.nixpkgs.follows = "nixpkgs"; + tsm.url = "github:daylinmorgan/tsm?dir=nix"; + tsm.inputs.nixpkgs.follows = "nixpkgs"; f1multiviewer.url = "github:daylinmorgan/f1multiviewer-flake"; - pixi.url = "github:daylinmorgan/pixi-flake"; }; diff --git a/hosts/naudiz/default.nix b/hosts/naudiz/default.nix new file mode 100644 index 0000000..9a97d00 --- /dev/null +++ b/hosts/naudiz/default.nix @@ -0,0 +1,22 @@ +{ + inputs, + enabled, + ... +}: + +{ + imports = [ inputs.nixos-wsl.nixosModules.default ]; + oizys = { + nix-ld = enabled; + languages = [ + + "python" + "node" + ]; + }; + wsl.enable = true; + wsl.defaultUser = "daylin"; + + # don't delete this you foo bar + system.stateVersion = "23.11"; # Did you read the comment? +} diff --git a/modules/runes/README.md b/modules/runes/README.md index 0fa135b..211a470 100644 --- a/modules/runes/README.md +++ b/modules/runes/README.md @@ -9,9 +9,14 @@