From 5ae2196b28008c6e7e1500ec1da10bacf95f3a1d Mon Sep 17 00:00:00 2001 From: Ryan Cao <70191398+ryanccn@users.noreply.github.com> Date: Fri, 13 Oct 2023 19:27:29 +0800 Subject: [PATCH] feat(vscode): switch back to Iosevka --- flake.lock | 62 +++++++++++++++++++------------------- home/apps/vscode.nix | 12 ++++---- overlays/ryan-mono-bin.nix | 6 ++-- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/flake.lock b/flake.lock index 79d9333..31e0130 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1695300587, - "narHash": "sha256-rXSTSQ+Q/0xuTmrtdXaXyl3h5vTdccdwvUkJUD4z8+E=", + "lastModified": 1696856096, + "narHash": "sha256-3H7CjCxys3sMhtaDZoxJeW3v7NvsVkpKcygcChY0nwE=", "owner": "ryanccn", "repo": "am", - "rev": "2def1783b18d7e12b256db9f3a6a609e34b103d6", + "rev": "4220386fadf7abb0d0537569ba97e35277b274c4", "type": "github" }, "original": { @@ -91,11 +91,11 @@ ] }, "locked": { - "lastModified": 1695511445, - "narHash": "sha256-mnE14re43v3/Jc50Jv0BKPMtEk7FEtDSligP6B5HwlI=", + "lastModified": 1697165857, + "narHash": "sha256-Cho+TPHCIfx/sVo5scjNDP2XUCpUxcyKvoMlJ8w9dgQ=", "owner": "ipetkov", "repo": "crane", - "rev": "3de322e06fc88ada5e3589dc8a375b73e749f512", + "rev": "117ac48319c0dbcff5540781c7c5b18166e33f6a", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1695622936, - "narHash": "sha256-3bnz0FxC/x3K2/E2b2OBG+Iexyh/Fcpq2hZU+lxtLdA=", + "lastModified": 1697178193, + "narHash": "sha256-LBDLUWlwSDPMA1Ui9wC9YcQEnJL0UP627RoUmtz4TTo=", "owner": "nix-community", "repo": "fenix", - "rev": "4fa09c7203bef57254bb1cb1d4bab76fdae34dd5", + "rev": "ff6c27356cbde594e598e388a32d79ef79cbe1b1", "type": "github" }, "original": { @@ -170,11 +170,11 @@ "flake-compat": { "flake": false, "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "type": "github" }, "original": { @@ -208,11 +208,11 @@ ] }, "locked": { - "lastModified": 1695550077, - "narHash": "sha256-xoxR/iY69/3lTnnZDP6gf3J46DUKPcf+Y1jH03tfZXE=", + "lastModified": 1696940889, + "narHash": "sha256-p2Wic74A1tZpFcld1wSEbFQQbrZ/tPDuLieCnspamQo=", "owner": "nix-community", "repo": "home-manager", - "rev": "a88df2fb101778bfd98a17556b3a2618c6c66091", + "rev": "6bba64781e4b7c1f91a733583defbd3e46b49408", "type": "github" }, "original": { @@ -268,11 +268,11 @@ ] }, "locked": { - "lastModified": 1695424346, - "narHash": "sha256-jkjKhxaBpS7p//l90uz9lNdVK5imVe9eo+XH6zbfrJU=", + "lastModified": 1696360011, + "narHash": "sha256-HpPv27qMuPou4acXcZ8Klm7Zt0Elv9dgDvSJaomWb9Y=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "c286b23c7fd7f0622bc4af898c91f58b8d304ff1", + "rev": "8b6ea26d5d2e8359d06278364f41fbc4b903b28a", "type": "github" }, "original": { @@ -283,11 +283,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1695318763, - "narHash": "sha256-FHVPDRP2AfvsxAdc+AsgFJevMz5VBmnZglFUMlxBkcY=", + "lastModified": 1697009197, + "narHash": "sha256-viVRhBTFT8fPJTb1N3brQIpFZnttmwo3JVKNuWRVc3s=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e12483116b3b51a185a33a272bf351e357ba9a99", + "rev": "01441e14af5e29c9d27ace398e6dd0b293e25a54", "type": "github" }, "original": { @@ -304,11 +304,11 @@ ] }, "locked": { - "narHash": "sha256-fEgGb/WwElJ6GFiwa4dFMdx/8yc4A8Z8qKJZQJWNgqc=", - "rev": "4cf0278ee6818538a5f82f983565b0ebd21906b4", - "revCount": 121, + "narHash": "sha256-6gC3C0sYD9p706XZjRXvrCyH2x5vpLUKehxvbnHKZec=", + "rev": "3bde992e4dd222078ce068a9313a86ff9bafab6e", + "revCount": 130, "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.0/018a5964-350b-746e-b614-5a927a72b5c1/source.tar.gz" + "url": "https://api.flakehub.com/f/pinned/ryanccn/nyoom/0.7.1/018adbea-d60d-75ac-bc20-1696443d69c5/source.tar.gz" }, "original": { "type": "tarball", @@ -338,11 +338,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1695591009, - "narHash": "sha256-QQnECNVhYrkG5hHaMh9m0r719CQIfEVFnYNix701DUQ=", + "lastModified": 1697098808, + "narHash": "sha256-OfatUxSwuzYd17IDy9eNOedwioq0dX6mOuiTghKol3s=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "862a3004e958082d0e9cbdf1172c5fe2bab6cf2d", + "rev": "84e1d273439413ab4ca1718db0b574dffba443ce", "type": "github" }, "original": { @@ -362,11 +362,11 @@ ] }, "locked": { - "lastModified": 1695607919, - "narHash": "sha256-PU6yIbHXdm3W8bBlhO6aL+VIjK5UQCRnOvCqa1lYQ6M=", + "lastModified": 1697163235, + "narHash": "sha256-HzGr9LbTKf8x4NeDH94i1J2Cq/0CY1Qrt4z5pETk9HA=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "014e0035c262e5506f904829e6b925ee3cfdb55e", + "rev": "b48a7e5dab1b472dd9c9ee9053401489dbb4d6fc", "type": "github" }, "original": { diff --git a/home/apps/vscode.nix b/home/apps/vscode.nix index 5de441f..4b3ee15 100644 --- a/home/apps/vscode.nix +++ b/home/apps/vscode.nix @@ -83,7 +83,7 @@ in { "git.suggestSmartCommit" = false; "diffEditor.ignoreTrimWhitespace" = false; - "editor.fontFamily" = "\"CaskaydiaCove Nerd Font\", monospace"; + "editor.fontFamily" = "\"RyanMono Nerd Font\", monospace"; "editor.formatOnSave" = true; "editor.fontLigatures" = "'calt', 'ss01'"; "editor.insertSpaces" = true; @@ -95,9 +95,9 @@ in { "editor.cursorBlinking" = "phase"; "editor.inlineSuggest.enabled" = true; "workbench.editor.highlightModifiedTabs" = true; - "workbench.editor.untitled.hint" = "hidden"; + "workbench.editor.empty.hint" = "hidden"; - "terminal.integrated.fontFamily" = "\"CaskaydiaCove Nerd Font Mono\", monospace"; + "terminal.integrated.fontFamily" = "\"RyanTerm Nerd Font\", monospace"; "terminal.integrated.fontSize" = 14; "terminal.integrated.lineHeight" = 1.5; "terminal.integrated.cursorBlinking" = true; @@ -110,9 +110,9 @@ in { }; "editor.defaultFormatter" = "esbenp.prettier-vscode"; "tailwindCSS.includeLanguages" = { - typescript = "javascript"; - typescriptreact = "javascript"; - vue-html = "html"; + "typescript" = "javascript"; + "typescriptreact" = "javascript"; + "vue-html" = "html"; }; "typescript.enablePromptUseWorkspaceTsdk" = true; diff --git a/overlays/ryan-mono-bin.nix b/overlays/ryan-mono-bin.nix index 2a5b6f5..5265286 100644 --- a/overlays/ryan-mono-bin.nix +++ b/overlays/ryan-mono-bin.nix @@ -1,5 +1,5 @@ (_: prev: let - version = "2023.09.14"; + version = "2023.09.28"; mkFontVariant = { variant, @@ -35,11 +35,11 @@ in { ryan-mono-bin = mkFontVariant { variant = "ryan-mono"; - hash = "sha256-T5S9tfJZz/5YDXKTir+NHHxwyJZt+z1fkgzpT7sJyEU="; + hash = "sha256-uDr7A1gEEazQWcqpH4YTNKycX6buE8QerECCrHXVbD8="; }; ryan-term-bin = mkFontVariant { variant = "ryan-term"; - hash = "sha256-RY7l/RG35fE0AkOHSSwbw3vi2ru++J5Wo/43hmNAySg="; + hash = "sha256-91pS9CzbYKywOIrUwWJpXnl5lJKZVH4nSadCh8PQscU="; }; })