From a1f7201c0cff4ffe757e52261be69bf65081965f Mon Sep 17 00:00:00 2001 From: Harry Ying Date: Tue, 3 Oct 2023 08:39:56 +0100 Subject: [PATCH] buildiso: flake: update --- cfgs/deck/i18n.nix | 4 +- cfgs/x1c7/default.nix | 2 +- cfgs/x1c7/i18n.nix | 4 +- cfgs/x1c7/services.nix | 6 ++ flake.lock | 225 +++++++++++++++++++++++++++++---------- modules/disko/disk.nix | 7 +- modules/home/default.nix | 2 +- 7 files changed, 188 insertions(+), 62 deletions(-) diff --git a/cfgs/deck/i18n.nix b/cfgs/deck/i18n.nix index 4a36027..60fc53b 100644 --- a/cfgs/deck/i18n.nix +++ b/cfgs/deck/i18n.nix @@ -1,8 +1,8 @@ { pkgs, lib, config, ... }: { # Set your time zone. - # time.timeZone = "Europe/London"; + time.timeZone = "Europe/London"; # time.timeZone = "Asia/Shanghai"; - time.timeZone = null; + # time.timeZone = null; # Select internationalisation properties. console = { diff --git a/cfgs/x1c7/default.nix b/cfgs/x1c7/default.nix index 726d0cd..01db273 100644 --- a/cfgs/x1c7/default.nix +++ b/cfgs/x1c7/default.nix @@ -84,7 +84,7 @@ }; # Fonts - fonts.fonts = with pkgs; [ + fonts.packages = with pkgs; [ noto-fonts noto-fonts-cjk noto-fonts-emoji diff --git a/cfgs/x1c7/i18n.nix b/cfgs/x1c7/i18n.nix index ac09147..1b34453 100644 --- a/cfgs/x1c7/i18n.nix +++ b/cfgs/x1c7/i18n.nix @@ -1,8 +1,8 @@ { pkgs, lib, config, ... }: { # Set your time zone. - # time.timeZone = "Europe/London"; + time.timeZone = "Europe/London"; # time.timeZone = "Asia/Shanghai"; - time.timeZone = null; + # time.timeZone = null; # Select internationalisation properties. console = { diff --git a/cfgs/x1c7/services.nix b/cfgs/x1c7/services.nix index 7a90f04..4251d0e 100644 --- a/cfgs/x1c7/services.nix +++ b/cfgs/x1c7/services.nix @@ -63,6 +63,12 @@ package = pkgs.wireshark-qt; }; + # IPFS service + services.kubo = { + enable = true; + settings.Addresses.API = [ "/ip4/127.0.0.1/tcp/5001" ]; + }; + # Required to enable completion somehow. programs.zsh.enable = true; diff --git a/flake.lock b/flake.lock index 7347447..60089a1 100644 --- a/flake.lock +++ b/flake.lock @@ -9,11 +9,11 @@ ] }, "locked": { - "lastModified": 1690228878, - "narHash": "sha256-9Xe7JV0krp4RJC9W9W9WutZVlw6BlHTFMiUP/k48LQY=", + "lastModified": 1695384796, + "narHash": "sha256-TYlE4B0ktPtlJJF9IFxTWrEeq+XKG8Ny0gc2FGEAdj0=", "owner": "ryantm", "repo": "agenix", - "rev": "d8c973fd228949736dedf61b7f8cc1ece3236792", + "rev": "1f677b3e161d3bdbfd08a939e8f25de2568e0ef4", "type": "github" }, "original": { @@ -31,11 +31,11 @@ ] }, "locked": { - "lastModified": 1678316176, - "narHash": "sha256-89Nl3waiqYwej7Y6kUkDinaYnGcch6CLrDlIXYq0OqY=", + "lastModified": 1690899771, + "narHash": "sha256-a9lfz8wG7bm6hrT/EIPer9MEX1sBMjd04NfnwhzOiCU=", "owner": "LEXUGE", "repo": "emacs.d", - "rev": "e5e38e4b62f77feefc4652aabff905c79b47bf1c", + "rev": "6202d9925a63f8e2f74c8667bd6309b818a50882", "type": "github" }, "original": { @@ -44,6 +44,39 @@ "type": "github" } }, + "crane": { + "inputs": { + "flake-compat": [ + "lanzaboote", + "flake-compat" + ], + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ], + "rust-overlay": [ + "lanzaboote", + "rust-overlay" + ] + }, + "locked": { + "lastModified": 1688772518, + "narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=", + "owner": "ipetkov", + "repo": "crane", + "rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, "darwin": { "inputs": { "nixpkgs": [ @@ -95,11 +128,11 @@ ] }, "locked": { - "lastModified": 1690278259, - "narHash": "sha256-0Ujy0ZD1Yg5+QDaEnk4TeYhIZ6AckRORrXLGsAEhFKE=", + "lastModified": 1696266752, + "narHash": "sha256-wJnMDFM21+xXdsXSs6pXMElbv4YfqmQslcPApRuaYKs=", "owner": "nix-community", "repo": "disko", - "rev": "5b19fb2e74df312751cecbf0f668217eb59d9170", + "rev": "646ee25c25fffee122a66282861f5f56ad3e0fd9", "type": "github" }, "original": { @@ -111,14 +144,15 @@ "emacs-overlay": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1668599879, - "narHash": "sha256-tbJcsUqMGqoGKyXKKK7jrTTqYjY5+eiYiiECqfkCwQ8=", + "lastModified": 1690886209, + "narHash": "sha256-Rtp3tsi6IaO4xQ8nDJCprMDeO1g/j1kNu7ByRv53vlU=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "69a81fdf4f4b3bfcb227a23a0926f5663b355d19", + "rev": "427290aa4ff074cfe31f3abd439bb9d1d24f6fc8", "type": "github" }, "original": { @@ -181,12 +215,15 @@ } }, "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -196,12 +233,15 @@ } }, "flake-utils_2": { + "inputs": { + "systems": "systems_2" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -212,7 +252,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems" + "systems": "systems_3" }, "locked": { "lastModified": 1681202837, @@ -230,7 +270,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_5" }, "locked": { "lastModified": 1689068808, @@ -248,14 +288,14 @@ }, "flake-utils_5": { "inputs": { - "systems": "systems_4" + "systems": "systems_6" }, "locked": { - "lastModified": 1687171271, - "narHash": "sha256-BJlq+ozK2B1sJDQXS3tzJM5a+oVZmi1q0FlBK/Xqv7M=", + "lastModified": 1692799911, + "narHash": "sha256-3eihraek4qL744EvQXsK1Ha6C3CR7nnT8X2qWap4RNk=", "owner": "numtide", "repo": "flake-utils", - "rev": "abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c", + "rev": "f9e7cf818399d17d347f847525c5a5a8032e4e44", "type": "github" }, "original": { @@ -314,11 +354,11 @@ ] }, "locked": { - "lastModified": 1690303752, - "narHash": "sha256-2YiwFHQERGoaORNORmsdmVlPD8CVVwlwbV2+f77sFhg=", + "lastModified": 1696145345, + "narHash": "sha256-3dM7I/d4751SLPJah0to1WBlWiyzIiuCEUwJqwBdmr4=", "owner": "nix-community", "repo": "home-manager", - "rev": "ba2c0737cc848db03470828fdb5e86df75ed42a8", + "rev": "6f9b5b83ad1f470b3d11b8a9fe1d5ef68c7d0e30", "type": "github" }, "original": { @@ -329,11 +369,11 @@ }, "impermanence": { "locked": { - "lastModified": 1684264534, - "narHash": "sha256-K0zr+ry3FwIo3rN2U/VWAkCJSgBslBisvfRIPwMbuCQ=", + "lastModified": 1694622745, + "narHash": "sha256-z397+eDhKx9c2qNafL1xv75lC0Q4nOaFlhaU1TINqb8=", "owner": "nix-community", "repo": "impermanence", - "rev": "89253fb1518063556edd5e54509c30ac3089d5e6", + "rev": "e9643d08d0d193a2e074a19d4d90c67a874d932e", "type": "github" }, "original": { @@ -345,11 +385,11 @@ "jovian": { "flake": false, "locked": { - "lastModified": 1690158936, - "narHash": "sha256-g1Fy+6fTV18n7i2IOjc8S2DidCgnW65gLgmPaJ1WmI8=", + "lastModified": 1696061591, + "narHash": "sha256-fqbuMDAmLW9d2flWy14+3bvLW/QzLRs++BksXvlDDsE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "f64c5540ba8106a87dff9648db675a55e982fe9c", + "rev": "399187a234cfc9c312f830fc44017beb0106f0d5", "type": "github" }, "original": { @@ -360,20 +400,22 @@ }, "lanzaboote": { "inputs": { + "crane": "crane", "flake-compat": "flake-compat", "flake-parts": "flake-parts", "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ], - "pre-commit-hooks-nix": "pre-commit-hooks-nix" + "pre-commit-hooks-nix": "pre-commit-hooks-nix", + "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1689889377, - "narHash": "sha256-ChBawisTCY3Cl06CSG+QNC2ES+G0ASiOxtOVif9uP/0=", + "lastModified": 1696021232, + "narHash": "sha256-YtbcN4I5S85XRdYFnORCJfbd5z6l8uVp8r3wI48vPs0=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e7246c6bce1733d373059e6342f67fd53f90c198", + "rev": "8154cef11cdde65a7a1f75319c95dfe038b2df46", "type": "github" }, "original": { @@ -384,19 +426,37 @@ }, "nixpkgs": { "locked": { - "lastModified": 1668531822, - "narHash": "sha256-rNt2SphDCQTbAgWBX9ZCMIn5ISxeb0l6b6kRLvzbFVo=", + "lastModified": 1690789960, + "narHash": "sha256-3K+2HuyGTiJUSZNJxXXvc0qj4xFx1FHC/ItYtEa7/Xs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "97b8d9459f7922ce0e666113a1e8e6071424ae16", + "rev": "fb942492b7accdee4e6d17f5447091c65897dde4", "type": "github" }, "original": { - "id": "nixpkgs", - "type": "indirect" + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" } }, "nixpkgs-stable": { + "locked": { + "lastModified": 1690726002, + "narHash": "sha256-cACz6jCJZtsZHGCJAN4vMobxzH5s6FCOTZHMrh/Hu0M=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "391e8db1f06c3f74c2d313a73135515023af3993", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_2": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -430,11 +490,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1690179384, - "narHash": "sha256-+arbgqFTAtoeKtepW9wCnA0njCOyoiDFyl0Q0SBSOtE=", + "lastModified": 1696019113, + "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b12803b6d90e2e583429bb79b859ca53c348b39a", + "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", "type": "github" }, "original": { @@ -453,11 +513,11 @@ ] }, "locked": { - "lastModified": 1687440270, - "narHash": "sha256-aOAXvfVn+MBSkU+xlQEiyoGpRaF6NvQdpWIhw5OH/Dc=", + "lastModified": 1693539235, + "narHash": "sha256-ACmCq1+RnVq+EB7yeN6fThUR3cCJZb6lKEfv937WG84=", "owner": "berberman", "repo": "nvfetcher", - "rev": "44196458acc2c28c32e456c50277d6148e71e708", + "rev": "2bcf73dea96497ac9c36ed320b457caa705f9485", "type": "github" }, "original": { @@ -481,7 +541,7 @@ "lanzaboote", "nixpkgs" ], - "nixpkgs-stable": "nixpkgs-stable" + "nixpkgs-stable": "nixpkgs-stable_2" }, "locked": { "lastModified": 1689668210, @@ -531,6 +591,31 @@ "type": "github" } }, + "rust-overlay_2": { + "inputs": { + "flake-utils": [ + "lanzaboote", + "flake-utils" + ], + "nixpkgs": [ + "lanzaboote", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1694657451, + "narHash": "sha256-cRZa9ZmUi0EFKcmzpsOXLVhiMQD8XLrku8v+U1YiGm8=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "7c4f46f0b3597e3c4663285e6794194e55574879", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, @@ -606,9 +691,39 @@ "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" + } + }, + "systems_7": { + "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_4" }, "locked": { "lastModified": 1685518550, @@ -626,14 +741,14 @@ }, "utils_2": { "inputs": { - "systems": "systems_5" + "systems": "systems_7" }, "locked": { - "lastModified": 1689068808, - "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { diff --git a/modules/disko/disk.nix b/modules/disko/disk.nix index b1d8b83..5e98f0c 100644 --- a/modules/disko/disk.nix +++ b/modules/disko/disk.nix @@ -43,20 +43,25 @@ content = { type = "btrfs"; subvolumes = { - # Mountpoints inferred from subvolume name + # Mountpoints now must be explicitly stated "/persist" = { + mountpoint = "/persist"; mountOptions = [ "compress=zstd" "noatime" ]; }; "/persist/home" = { + mountpoint = "/persist/home"; mountOptions = [ "compress=zstd" "noatime" ]; }; "/nix" = { + mountpoint = "/nix"; mountOptions = [ "compress=zstd" "noatime" ]; }; "/tmp" = { + mountpoint = "/tmp"; mountOptions = [ "compress=zstd" "noatime" ]; }; "/.snapshots" = { + mountpoint = "/.snapshots"; mountOptions = [ "compress=zstd" "noatime" ]; }; }; diff --git a/modules/home/default.nix b/modules/home/default.nix index 330fb46..1fb1339 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -178,7 +178,7 @@ in ]; }; # Timezone and location - "org/gnome/desktop/datetime".automatic-timezone = true; + # "org/gnome/desktop/datetime".automatic-timezone = true; "org/gnome/system/location".enabled = true; } c.extraDconf);