diff --git a/flake.lock b/flake.lock index 4a84608..2f57ed6 100644 --- a/flake.lock +++ b/flake.lock @@ -48,6 +48,22 @@ "type": "github" } }, + "flake-compat_4": { + "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-parts": { "inputs": { "nixpkgs-lib": [ @@ -130,9 +146,27 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, + "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" + } + }, "git-hooks": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "small-nvim", @@ -242,7 +276,7 @@ }, "neovim-nightly-overlay": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "hercules-ci-effects": "hercules-ci-effects", @@ -324,19 +358,56 @@ "type": "github" } }, + "nixos-wsl": { + "inputs": { + "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1724065442, + "narHash": "sha256-8ZUoyeO7Q70bLuijVYvToBSkApw9kfc5hMykTGxB64I=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "0bec2bfb8a2d4dd16e5b012982ca95e57d50e6a2", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "main", + "repo": "NixOS-WSL", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1723586348, - "narHash": "sha256-mDVd0lc+V5Yw23xDxMvPnvfa1FiyiBCRpwtT4uujp0Q=", + "lastModified": 1723688146, + "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_2": { + "locked": { + "lastModified": 1724224976, + "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "f97145f837de6d635b7d6da9a9d5d42e323f8050", + "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "f97145f837de6d635b7d6da9a9d5d42e323f8050", "type": "github" } }, @@ -362,7 +433,8 @@ "home-manager": "home-manager", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", - "nixpkgs": "nixpkgs", + "nixos-wsl": "nixos-wsl", + "nixpkgs": "nixpkgs_2", "nur": "nur", "small-nvim": "small-nvim", "sops-nix": "sops-nix" @@ -443,9 +515,24 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "utils": { "inputs": { - "systems": "systems_2" + "systems": "systems_3" }, "locked": { "lastModified": 1710146030, diff --git a/flake.nix b/flake.nix index 401d0d0..9231c23 100644 --- a/flake.nix +++ b/flake.nix @@ -34,7 +34,7 @@ }; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/f97145f837de6d635b7d6da9a9d5d42e323f8050"; # TODO: switch back to nixos-unstable ASAP + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; flake-parts.url = "github:hercules-ci/flake-parts"; hardware.url = "github:nixos/nixos-hardware"; @@ -44,6 +44,7 @@ sops-nix.url = "github:Mic92/sops-nix"; nix-index-database.url = "github:Mic92/nix-index-database"; nix-vscode-extensions.url = "github:nix-community/nix-vscode-extensions"; + nixos-wsl.url = "github:nix-community/NixOS-WSL/main"; ## deduplication flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; diff --git a/hosts/default.nix b/hosts/default.nix index ec01d97..f793b0f 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -34,6 +34,23 @@ in { inherit specialArgs; }; + kidney = { + deployment = { + allowLocalDeployment = true; + }; + imports = lib.flatten [ + ./kidney + (modulePaths [ + "core/tools.nix" + "network/tailscale.nix" + + "programs/tools.nix" + + "nix" + "nix/gc.nix" + ]) + ]; + }; nixdesk = { deployment = { allowLocalDeployment = true; diff --git a/hosts/kidney/default.nix b/hosts/kidney/default.nix new file mode 100644 index 0000000..fa8fa87 --- /dev/null +++ b/hosts/kidney/default.nix @@ -0,0 +1,9 @@ +{lib}: { + imports = [ + ./wsl.nix + ]; + + networking.hostName = "kidney"; + + system.stateVersion = "24.05"; +} diff --git a/hosts/kidney/wsl.nix b/hosts/kidney/wsl.nix new file mode 100644 index 0000000..7bcfd3b --- /dev/null +++ b/hosts/kidney/wsl.nix @@ -0,0 +1,8 @@ +{inputs, ...}: { + imports = [ + inputs.nixos-wsl.nixosModules.default + ]; + + wsl.enable = true; + wsl.defaultUser = "xun"; +} diff --git a/system/hardware/specialisations.nix b/system/hardware/specialisations.nix deleted file mode 100644 index e27c7a6..0000000 --- a/system/hardware/specialisations.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ - specialisation = { - light = { - inheritParentConfig = true; - configuration.programs.matugen.variant = "light"; - }; - dark = { - inheritParentConfig = true; - configuration.programs.matugen.variant = "dark"; - }; - }; -}