From 5e108e712c4102ded503cec6ecf6d1c8e91be158 Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Sun, 12 Nov 2023 18:50:28 +0800 Subject: [PATCH] chore: update flake inputs --- flake.lock | 80 ++++++++++++++++++++++---------------------- flake.nix | 2 +- home/apps/vscode.nix | 13 +++---- 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/flake.lock b/flake.lock index 070662a..d42dd75 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1697695793, - "narHash": "sha256-2UYlOQyG/Mcm0A5hS4dMcnwvRe7XjrIxDRVj5Z6tFdw=", + "lastModified": 1699784557, + "narHash": "sha256-d7oygIOlqNdKT9BmpSaMUVh/jSDn2VDenTINP/zzzKQ=", "owner": "ryanccn", "repo": "am", - "rev": "df68dccb823403d73b8c4a7bb069ae0a1300a0a3", + "rev": "893b26b55d9c702e0273f432ddeb94cd50c4ba24", "type": "github" }, "original": { @@ -39,11 +39,11 @@ ] }, "locked": { - "lastModified": 1692225040, - "narHash": "sha256-jbQNvkgWGioiC6S39dZVyn6us8p/DlEvm5hQKEYkzDU=", + "lastModified": 1698258239, + "narHash": "sha256-qnhoYYIJ0L/P7H/f56lQUEvpzNlXh4sxuHpRERV+B44=", "owner": "zhaofengli", "repo": "attic", - "rev": "b43d12082e34bceb26038bdad0438fd68804cfcd", + "rev": "e9918bc6be268da6fa97af6ced15193d8a0421c0", "type": "github" }, "original": { @@ -54,19 +54,19 @@ }, "catppuccin": { "inputs": { - "flake-compat": [ - "flake-compat" + "home-manager": [ + "home-manager" ], "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1698002908, - "narHash": "sha256-Bge0FHsAQx1SQZyzpFl0EdgLC/RaYEToU2YVUMDlFvw=", + "lastModified": 1699141637, + "narHash": "sha256-gNW6jw/lzxIYdenbxN7ZPkdEy1dmFFXO206twDemprM=", "owner": "Stonks3141", "repo": "ctp-nix", - "rev": "5713b478b10c5ef703fd921d96ca6a3057c457b5", + "rev": "cceb51991e943e15b58d1d2483f93d5025ac1dd8", "type": "github" }, "original": { @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1697840921, - "narHash": "sha256-zXHwu104SQOxogkMgg+w22c3+zI/FvK83TAkfLmeKw0=", + "lastModified": 1699548976, + "narHash": "sha256-xnpxms0koM8mQpxIup9JnT0F7GrKdvv0QvtxvRuOYR4=", "owner": "ipetkov", "repo": "crane", - "rev": "758ae442227103fa501276e8225609a11c99718e", + "rev": "6849911446e18e520970cc6b7a691e64ee90d649", "type": "github" }, "original": { @@ -118,11 +118,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1698042153, - "narHash": "sha256-X6qAg4SAMyi0Bg6HPeHkAufmYUeW/6N+ikIIVYOBu58=", + "lastModified": 1699770036, + "narHash": "sha256-bZmI7ytPAYLpyFNgj5xirDkKuAniOkj1xHdv5aIJ5GM=", "owner": "nix-community", "repo": "fenix", - "rev": "0fbf5652c9596038c0f4784d3e93d1f1a543e24b", + "rev": "81ab0b4f7ae9ebb57daa0edf119c4891806e4d3a", "type": "github" }, "original": { @@ -147,12 +147,12 @@ ] }, "locked": { - "lastModified": 1697489714, - "narHash": "sha256-gyxlVSraZIVAyOaJk90fub4b8g1w4KXwqa1ecNAC7xA=", - "rev": "d72db6283e6b6bef7216c8586c16d9f648652400", - "revCount": 353, + "lastModified": 1699734777, + "narHash": "sha256-O0WcLEtbb5m3RA3LyWbD++fFt0Bk/pP16yhxRb+cGkM=", + "rev": "9ee4cc0ebb07d15ec31e3d66d943fbd450506abf", + "revCount": 390, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.7/018b3a46-fd61-77fb-9a59-239ed49dfff1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/fh/0.1.8/018bc01c-c990-72b1-b599-27e02ab475af/source.tar.gz" }, "original": { "type": "tarball", @@ -200,11 +200,11 @@ ] }, "locked": { - "lastModified": 1697964592, - "narHash": "sha256-fua0LKNLkYYK2Dgdm9P+VPdqrVgDXUIx+EkQAQByhuc=", + "lastModified": 1699783872, + "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=", "owner": "nix-community", "repo": "home-manager", - "rev": "219d268a69512ff520fe8da1739ac22d95d52355", + "rev": "280721186ab75a76537713ec310306f0eba3e407", "type": "github" }, "original": { @@ -220,11 +220,11 @@ ] }, "locked": { - "lastModified": 1697664192, - "narHash": "sha256-nRTG3rYEGFV2+putRiC96+kNXDyKaPJgT6K/1FWN7yo=", + "lastModified": 1698420672, + "narHash": "sha256-/TdeHMPRjjdJub7p7+w55vyABrsJlt5QkznPYy55vKA=", "owner": "nix-community", "repo": "naersk", - "rev": "636a9b5dd7f2ad7d7c3af929ecf95e4d4fab9e97", + "rev": "aeb58d5e8faead8980a807c840232697982d47b9", "type": "github" }, "original": { @@ -260,11 +260,11 @@ ] }, "locked": { - "lastModified": 1697723594, - "narHash": "sha256-W7lTC+kHGS1YCOutGpxUHF0cK66iY/GYr3INaTyVa/I=", + "lastModified": 1699704228, + "narHash": "sha256-NApWG385goidsXmsakWgFRjvbH+aw/n1CGGHn/UuXsc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "19f75c2b45fbfc307ecfeb9dadc41a4c1e4fb980", + "rev": "0f1ad801387445fdda01d080db8ecf169be8e793", "type": "github" }, "original": { @@ -275,11 +275,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1697915759, - "narHash": "sha256-WyMj5jGcecD+KC8gEs+wFth1J1wjisZf8kVZH13f1Zo=", + "lastModified": 1699601893, + "narHash": "sha256-9f008k1k5SmEAO1ldjO5sQf+oWHFkeK5jhS3Ji3vFyk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "51d906d2341c9e866e48c2efcaac0f2d70bfd43e", + "rev": "e06c716ef149f466f25e62a836c30b90476e65e5", "type": "github" }, "original": { @@ -331,11 +331,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1698006371, - "narHash": "sha256-/SkkJSywaPESyqCRIwmDNRNlons+uP8bUDCU4EjYWb4=", + "lastModified": 1699715108, + "narHash": "sha256-yPozsobJU55gj+szgo4Lpcg1lHvGQYAT6Y4MrC80mWE=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "10872952c03947124f8ccda7d7aa7930b7da32fe", + "rev": "5fcf5289e726785d20d3aa4d13d90a43ed248e83", "type": "github" }, "original": { @@ -355,11 +355,11 @@ ] }, "locked": { - "lastModified": 1697940838, - "narHash": "sha256-eyk92QqAoRNC0V99KOcKcBZjLPixxNBS0PRc4KlSQVs=", + "lastModified": 1699755324, + "narHash": "sha256-DJBtQB5VIUXJZwVrhgkKOH8g2wTJFHe+5Dc2oJjpcNs=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "a3e829c06eadf848f13d109c7648570ce37ebccd", + "rev": "d15b1b2be8daba77c80ee6716616e5c841d3ab14", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index c7e838c..fb5d5ce 100644 --- a/flake.nix +++ b/flake.nix @@ -28,7 +28,7 @@ catppuccin = { url = "github:Stonks3141/ctp-nix"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.flake-compat.follows = "flake-compat"; + inputs.home-manager.follows = "home-manager"; }; am = { diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix index 72ffded..3634ba7 100644 --- a/home/apps/vscode.nix +++ b/home/apps/vscode.nix @@ -84,20 +84,21 @@ in { "diffEditor.ignoreTrimWhitespace" = false; "editor.fontFamily" = "\"CaskaydiaCove NF\", monospace"; - "editor.formatOnSave" = true; "editor.fontLigatures" = "'calt', 'ss01'"; - "editor.insertSpaces" = true; - "editor.tabSize" = 2; - "editor.cursorSmoothCaretAnimation" = "on"; "editor.fontSize" = 16; "editor.lineHeight" = 1.5; + "editor.cursorSmoothCaretAnimation" = "on"; "editor.minimap.renderCharacters" = false; "editor.cursorBlinking" = "phase"; - "editor.inlineSuggest.enabled" = true; "workbench.editor.highlightModifiedTabs" = true; "workbench.editor.empty.hint" = "hidden"; - "terminal.integrated.fontFamily" = "\"CaskaydiaCove NFM\", monospace"; + "editor.inlineSuggest.enabled" = true; + "editor.tabSize" = 2; + "editor.insertSpaces" = true; + "editor.formatOnSave" = true; + + "terminal.integrated.fontFamily" = "\"CaskaydiaCove NFM\", monospace"; "terminal.integrated.fontSize" = 14; "terminal.integrated.lineHeight" = 1.5; "terminal.integrated.cursorBlinking" = true;