From ee228abd8465f95c58306adcd1b0916ad6f9b5a9 Mon Sep 17 00:00:00 2001 From: Kat Inskip Date: Sat, 4 Feb 2023 14:56:01 -0800 Subject: [PATCH] feat(systems/chen): initialise --- flake.lock | 59 +++++++++++++++++++++++++++----------- flake.nix | 9 ++++++ kat/shell/bitw.nix | 2 +- nixos/common/access.nix | 1 - systems/chen.nix | 63 +++++++++++++++++++++++++++++++++++++++++ 5 files changed, 116 insertions(+), 18 deletions(-) create mode 100644 systems/chen.nix diff --git a/flake.lock b/flake.lock index 800c0dda..30f81989 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ "arcexprs": { "flake": false, "locked": { - "lastModified": 1675107003, - "narHash": "sha256-ao5OLwhC7+T3O2ixRrt76gIg9uZR3c17SJL3Wvx0EpQ=", + "lastModified": 1675450557, + "narHash": "sha256-0Syp+pnuTCjAM9aJAX3DIt6qbAvp/wNeoaGeBn5zmEM=", "owner": "arcnmx", "repo": "nixexprs", - "rev": "5b7d1eb5e578da7ed36b2105f80f82f9ad11244d", + "rev": "4d4f3a24770be3e60b69cfc191b67f7a1ecbd6a8", "type": "github" }, "original": { @@ -126,11 +126,11 @@ ] }, "locked": { - "lastModified": 1675181178, - "narHash": "sha256-jymSUUjKoArptU7LJ1i4boysXptnpuETiUTenKgs2fM=", + "lastModified": 1675462931, + "narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=", "owner": "nix-community", "repo": "home-manager", - "rev": "69696fe53940562a047bf2ec675cc1dcd1bc09b3", + "rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3", "type": "github" }, "original": { @@ -188,11 +188,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1675115703, - "narHash": "sha256-4zetAPSyY0D77x+Ww9QBe8RHn1akvIvHJ/kgg8kGDbk=", + "lastModified": 1675454231, + "narHash": "sha256-5rgcWq1nFWlbR3NsLqY7i/7358uhkSeMQJ/LEHk3BWA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2caf4ef5005ecc68141ecb4aac271079f7371c44", + "rev": "06999209d7a0043d4372e38f57cffae00223d592", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "pypi-deps-db": { "flake": false, "locked": { - "lastModified": 1675156620, - "narHash": "sha256-lmnsBYJz2Fgm0WFNUgSqskpwa0ffbFOr9YGDZpUXptk=", + "lastModified": 1675544670, + "narHash": "sha256-CV3qfT4CdMR9CbyPmbJXMHNgLK0p+62nwM2/yF8QHS0=", "owner": "DavHau", "repo": "pypi-deps-db", - "rev": "2e236bb32e6e3ef13cd56fc6d9aee8c89059a1ac", + "rev": "f822ecb6e8e27ac4e1c34218536658d6be0da51f", "type": "github" }, "original": { @@ -230,11 +230,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1673786180, - "narHash": "sha256-5tu71eDtQVmVUorho/GKaCzr4cdmNpvG8ZYxMhDCVKY=", + "lastModified": 1675293936, + "narHash": "sha256-xaObOxlMiZ8noXbXWfoUJrCjVZ8oc9HBblc/MeCq7fc=", "owner": "yaxitech", "repo": "ragenix", - "rev": "92248738a21db5687744d9e7796cf2433b96a7a5", + "rev": "325733b734aa4cc4d6b19f1169e6672cad4128ca", "type": "github" }, "original": { @@ -259,7 +259,8 @@ "scalpel": "scalpel", "std": "std", "tree": "tree", - "utils": "utils" + "utils": "utils", + "wsl": "wsl" } }, "rust-overlay": { @@ -362,6 +363,32 @@ "repo": "flake-utils", "type": "github" } + }, + "wsl": { + "inputs": { + "flake-compat": [ + "flake-compat" + ], + "flake-utils": [ + "utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1675351082, + "narHash": "sha256-4Oi4k4Qp1vOvKoACHDcz0xiVj7DuMaCL57fP3W77eA0=", + "owner": "nix-community", + "repo": "NixOS-WSL", + "rev": "52cadf92e1bfdef235d5cd77b9a4b2ab848baa8a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NixOS-WSL", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 906e54e9..dcfb6233 100644 --- a/flake.nix +++ b/flake.nix @@ -36,6 +36,15 @@ url = "github:lnl7/nix-darwin/master"; inputs.nixpkgs.follows = "nixpkgs"; }; + # WSL host + wsl = { + url = "github:nix-community/NixOS-WSL"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "utils"; + flake-compat.follows = "flake-compat"; + }; + }; # flake-utils utils.url = "github:numtide/flake-utils"; # file structure -> attrset diff --git a/kat/shell/bitw.nix b/kat/shell/bitw.nix index 20e3cf8c..7c6e0887 100644 --- a/kat/shell/bitw.nix +++ b/kat/shell/bitw.nix @@ -4,7 +4,7 @@ ... }: { programs.rbw = { - enable = true; + enable = false; package = pkgs.rbw-bitw; settings = { inherit (tree.kat.user.data) email; diff --git a/nixos/common/access.nix b/nixos/common/access.nix index a26643cc..c49ffc5c 100644 --- a/nixos/common/access.nix +++ b/nixos/common/access.nix @@ -3,7 +3,6 @@ inherit (lib.lists) concatLists elem; inherit (lib.attrsets) mapAttrsToList; commonUser = { - shell = pkgs.zsh; openssh.authorizedKeys.keys = concatLists (mapAttrsToList (_: user: if elem "wheel" user.extraGroups then diff --git a/systems/chen.nix b/systems/chen.nix new file mode 100644 index 00000000..1e1c8780 --- /dev/null +++ b/systems/chen.nix @@ -0,0 +1,63 @@ +_: let + hostConfig = {tree, modulesPath, inputs, pkgs, ...}: { + imports = with tree; [ + inputs.wsl.nixosModules.wsl + "${modulesPath}/profiles/minimal.nix" + ]; + + fileSystems = { + "/" = { + device = "/dev/sdc"; + fsType = "ext4"; + }; + "/usr/lib/wsl/drivers" = { + device = "drivers"; + fsType = "9p"; + }; + "/usr/lib/wsl/lib" = { + device = "none"; + fsType = "overlay"; + }; + "/mnt/wsl" = { + device = "none"; + fsType = "tmpfs"; + }; + "/mnt/wslg" = { + device = "none"; + fsType = "tmpfs"; + }; + "/mnt/wslg/doc" = { + device = "none"; + fsType = "overlay"; + }; + "/mnt/c" = { + device = "drvfs"; + fsType = "9p"; + }; + }; + + swapDevices = [ + { device = "/dev/sdb"; } + ]; + + wsl = { + enable = true; + defaultUser = "kat"; + startMenuLaunchers = true; + wslConf.automount.root = "/mnt"; + }; + + networking = { + hostId = "dddbb888"; + useDHCP = false; + }; + + system.stateVersion = "22.05"; + }; +in { + arch = "x86_64"; + type = "NixOS"; + modules = [ + hostConfig + ]; +}