feat: update readme, comments & flake.lock

2026-01-11 20:40:24 +01:00 · 2023-07-09 17:03:33 +08:00
parent bacc1bf9cd
commit 7e02cc8566
6 changed files with 38 additions and 37 deletions
--- a/README.md
+++ b/README.md
@@ -4,7 +4,9 @@ This repository is home to the nix code that builds my systems.

 ## Screenshots

-![](./_img/screenshot_2023-05-07-21-21.webp)
+![](./hosts/idols/_img/nix-distributed-building.webp)
+
+![](./hosts/idols/_img/nix-distributed-building-log.webp)

 ## TODO

@@ -22,10 +24,10 @@ Nix allows for easy-to-manage, collaborative, reproducible deployments. This mea
 ```shell
 › tree hosts
 hosts
-├── harmonica  # my MacBook Pro 2020 13-inch, mainly for business.
+├── harmonica  # my MacBook Pro 2020 13-inch, for work.
 └── idols
    ├── ai         # my main computer, with NixOS + I5-13600KF + RTX 4090 GPU, for gaming & daily use.
-    ├── aquamarine # my NixOS virtual machine with R9-5900HX(8C16T), mainly for distributed building & testing.
+    ├── aquamarine # my NixOS virtual machine with R9-5900HX(8C16T), for distributed building & testing.
    ├── kana       # yet another NixOS vm on another physical machine with R5-5625U(6C12T).
    └── ruby       # another NixOS vm on another physical machine with R7-5825U(8C16T).
 ```
--- a/_img/screenshot_2023-05-07-21-21.webp
+++ b/_img/screenshot_2023-05-07-21-21.webp
--- a/flake.lock
+++ b/flake.lock
@@ -50,11 +50,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1688307440,
-        "narHash": "sha256-7PTjbN+/+b799YN7Tk2SS5Vh8A0L3gBo8hmB7Y0VXug=",
+        "lastModified": 1688882536,
+        "narHash": "sha256-JXhHLy3+OxRghen7X8no1/8Ab+NkYSxrCIB9IILKUUc=",
        "owner": "lnl7",
        "repo": "nix-darwin",
-        "rev": "b06bab83bdf285ea0ae3c8e145a081eb95959047",
+        "rev": "4e3fc1864712a534d30ef074d695e968f1fb1487",
        "type": "github"
      },
      "original": {
@@ -87,11 +87,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1688254665,
-        "narHash": "sha256-8FHEgBrr7gYNiS/NzCxIO3m4hvtLRW9YY1nYo1ivm3o=",
+        "lastModified": 1688466019,
+        "narHash": "sha256-VeM2akYrBYMsb4W/MmBo1zmaMfgbL4cH3Pu8PGyIwJ0=",
        "owner": "hercules-ci",
        "repo": "flake-parts",
-        "rev": "267149c58a14d15f7f81b4d737308421de9d7152",
+        "rev": "8e8d955c22df93dbe24f19ea04f47a74adbdc5ec",
        "type": "github"
      },
      "original": {
@@ -267,11 +267,11 @@
        "nixpkgs": "nixpkgs_5"
      },
      "locked": {
-        "lastModified": 1688348635,
-        "narHash": "sha256-6F/q2jbDoxbNvOSLKhscpMNONdC80OKX/GJw1EumERs=",
+        "lastModified": 1688608231,
+        "narHash": "sha256-RQeR/tirHIa5jhZYLCK7KnQiYTG/kq/vWdgDFLi+4+g=",
        "owner": "nix-community",
        "repo": "nix-eval-jobs",
-        "rev": "410b14bb39b73154e12b4e50ae2eb5f7c1a4967b",
+        "rev": "477d7196a493dd011f05704fc7b42cbe95f5b30d",
        "type": "github"
      },
      "original": {
@@ -303,11 +303,11 @@
        ]
      },
      "locked": {
-        "lastModified": 1688349424,
-        "narHash": "sha256-/wRCJP2d9ZmfZKrREWthpDHIx/F02Z1J2bytbC+gUiU=",
+        "lastModified": 1688738567,
+        "narHash": "sha256-yax5BYOfpE0+95kyJmEcfKEdZBaFvCENDogBB4VQB3Q=",
        "owner": "nix-community",
        "repo": "nixos-generators",
-        "rev": "cf341a2c94338eed91c35df291931ea775b31e99",
+        "rev": "9191c85aab6b1a7ad395c13d340f2aa0e3ddf552",
        "type": "github"
      },
      "original": {
@@ -334,11 +334,11 @@
    },
    "nixpkgs-darwin": {
      "locked": {
-        "lastModified": 1688463857,
-        "narHash": "sha256-2U9CjlejE2kG4YXHSlud8WpG2BhCU2YML4l/HoIH8VM=",
+        "lastModified": 1688825351,
+        "narHash": "sha256-XKrQsDLF/XvKbuF7j6ihcIpLFk2zB6yMa/RmEi5s3bc=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "fddec7bb7f4e7d409fa80601fa26f7aabf6c3596",
+        "rev": "3dce5e9104d5a1658b8edc0900c916f6b0853648",
        "type": "github"
      },
      "original": {
@@ -365,11 +365,11 @@
    },
    "nixpkgs-unstable": {
      "locked": {
-        "lastModified": 1688322751,
-        "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
+        "lastModified": 1688679045,
+        "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
+        "rev": "3c7487575d9445185249a159046cc02ff364bff8",
        "type": "github"
      },
      "original": {
@@ -387,11 +387,11 @@
        "nixpkgs": "nixpkgs_6"
      },
      "locked": {
-        "lastModified": 1688475599,
-        "narHash": "sha256-P5xzhsb3WYh1A6tCJkqTuOHdV7aR2cUUuII368Rf7EM=",
+        "lastModified": 1688890783,
+        "narHash": "sha256-mfGfmi9XCdquoCbkNEQ+TWObiYKpB/FkYEF9nikL77g=",
        "owner": "nix-community",
        "repo": "nixpkgs-wayland",
-        "rev": "3bac024f7caf077a537d979435ed6ef641d94a7b",
+        "rev": "3941f76246a0429d4b1f196f5e219138f82da64e",
        "type": "github"
      },
      "original": {
@@ -434,11 +434,11 @@
    },
    "nixpkgs_4": {
      "locked": {
-        "lastModified": 1688389917,
-        "narHash": "sha256-RKiK1QeommEsjQ8fLgxt4831x9O6n2gD7wAhVZTrr8M=",
+        "lastModified": 1688764204,
+        "narHash": "sha256-FsvK+tIvelCI0tWwlMDKfiyb7P/KfxpGbXMrdCKiT8s=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "aed4b19d312525ae7ca9bceb4e1efe3357d0e2eb",
+        "rev": "d8bb6c681cf86265fdcf3cc3119f757bbb085835",
        "type": "github"
      },
      "original": {
@@ -450,11 +450,11 @@
    },
    "nixpkgs_5": {
      "locked": {
-        "lastModified": 1688346760,
-        "narHash": "sha256-w6JFZsZ+qEJNaBrYUmqKAbA8+qXWm5pwMQHhbNfpAYE=",
+        "lastModified": 1688607075,
+        "narHash": "sha256-KDWpwZ4xl4au5R+A+Ka+uVbyiwMDVczjwRTSqBOyqWM=",
        "owner": "NixOS",
        "repo": "nixpkgs",
-        "rev": "ee5cc38432031b66e7fe395b14235eeb4b2b0d6e",
+        "rev": "ff81c24d1dd4dc3698aeb27d2cc3991124e627e6",
        "type": "github"
      },
      "original": {
@@ -466,11 +466,11 @@
    },
    "nixpkgs_6": {
      "locked": {
-        "lastModified": 1688322751,
-        "narHash": "sha256-eW62dC5f33oKZL7VWlomttbUnOTHrAbte9yNUNW8rbk=",
+        "lastModified": 1688679045,
+        "narHash": "sha256-t3xGEfYIwhaLTPU8FLtN/pLPytNeDwbLI6a7XFFBlGo=",
        "owner": "nixos",
        "repo": "nixpkgs",
-        "rev": "0fbe93c5a7cac99f90b60bdf5f149383daaa615f",
+        "rev": "3c7487575d9445185249a159046cc02ff364bff8",
        "type": "github"
      },
      "original": {
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,7 @@
  ##################################################################################################################
  # 
  # Want to know Nix in details? Looking for a beginner-friendly tutorial?
-  # Check out [NixOS & Nix Flakes - A Guide for Beginners](https://thiscute.world/en/posts/nixos-and-flake-basics/)!
+  # Check out https://github.com/ryan4yin/nixos-and-flakes-book !
  # 
  ##################################################################################################################

--- a/home/linux/i3/default.nix
+++ b/home/linux/i3/default.nix
@@ -1,7 +1,6 @@
 { pkgs, ...}: 
 {
-  # i3 配置，基于 https://github.com/endeavouros-team/endeavouros-i3wm-setup
-  # 直接从当前文件夹中读取配置文件作为配置内容
+  # i3 window manager's config, based on https://github.com/endeavouros-team/endeavouros-i3wm-setup

  imports = [
    ./x11-apps.nix
--- a/modules/nixos/hyprland.nix
+++ b/modules/nixos/hyprland.nix
@@ -73,7 +73,7 @@

    yad # a fork of zenity, for creating dialogs

-    # 用于播放系统音效
+    # audio
    mpd # for playing system sounds
    mpc-cli # command-line mpd client
    ncmpcpp # a mpd client with a UI