From f61b0bd536ae21d00722648007471f5188eeada7 Mon Sep 17 00:00:00 2001 From: sudosubin Date: Fri, 15 Nov 2024 16:40:22 +0900 Subject: [PATCH] feat: Update dependencies, use VSCode GitHub Copilot --- flake.lock | 30 +++++++++---------- libraries/nixpkgs/default.nix | 1 + libraries/nixpkgs/programs/clop/default.nix | 4 +-- .../nixpkgs/programs/orbstack/default.nix | 6 ++-- modules/shared/configuration.nix | 4 ++- modules/shared/programs/vscode/default.nix | 1 + 6 files changed, 25 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 710e221b..62f6184c 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1730878299, - "narHash": "sha256-0VIz/3PKaylSIoRdOE07kkT1tMXgqaybXrfIS2Xz+so=", + "lastModified": 1731642829, + "narHash": "sha256-vG+O2RZRzYZ8BUMNNJ+BLSj6PUoGW7taDQbp6QNJ3Xo=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "98e7dba87238e4fa4eac609dc44f07dab40661c4", + "rev": "f86f158efd4bab8dce3e207e4621f1df3a760b7a", "type": "github" }, "original": { @@ -59,11 +59,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -134,11 +134,11 @@ ] }, "locked": { - "lastModified": 1730944043, - "narHash": "sha256-DIYTHa57pQQc9ARiMpJWYkaoiTaQPLH7Y4qK0J10Khk=", + "lastModified": 1731548914, + "narHash": "sha256-UtYkHq8OdZcz2Q/r7gh+3HFGVgX9AFfYDrMjAVO6sj4=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "0a959b25ff573f079ed032f88d8c988561b96a96", + "rev": "00e11784c89ecd236ff045acd7a447e0fe5b80df", "type": "github" }, "original": { @@ -185,11 +185,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1730919458, - "narHash": "sha256-yMO0T0QJlmT/x4HEyvrCyigGrdYfIXX3e5gWqB64wLg=", + "lastModified": 1731403644, + "narHash": "sha256-T9V7CTucjRZ4Qc6pUEV/kpgNGzQbHWfGcfK6JJLfUeI=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "e1cc1f6483393634aee94514186d21a4871e78d7", + "rev": "f6581f1c3b137086e42a08a906bdada63045f991", "type": "github" }, "original": { @@ -200,11 +200,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730831018, - "narHash": "sha256-2S0HwIFRxYp+afuoFORcZA9TjryAf512GmE0MTfEOPU=", + "lastModified": 1731531548, + "narHash": "sha256-sz8/v17enkYmfpgeeuyzniGJU0QQBfmAjlemAUYhfy8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "8c4dc69b9732f6bbe826b5fbb32184987520ff26", + "rev": "24f0d4acd634792badd6470134c387a3b039dace", "type": "github" }, "original": { diff --git a/libraries/nixpkgs/default.nix b/libraries/nixpkgs/default.nix index 11aed629..40d1b6e1 100644 --- a/libraries/nixpkgs/default.nix +++ b/libraries/nixpkgs/default.nix @@ -39,6 +39,7 @@ in "redisinsight" "cleanshot" "slack" + "vscode-extension-github-copilot" "vscode-extension-ms-vscode-remote-remote-ssh" ]); diff --git a/libraries/nixpkgs/programs/clop/default.nix b/libraries/nixpkgs/programs/clop/default.nix index 1afd6792..43fab0a3 100644 --- a/libraries/nixpkgs/programs/clop/default.nix +++ b/libraries/nixpkgs/programs/clop/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "clop"; - version = "2.6.4"; + version = "2.6.5"; src = fetchurl { url = "https://github.com/FuzzyIdeas/Clop/releases/download/v${version}/Clop-${version}.dmg"; - sha256 = "1izr4q43f2m54l6bg4x104n4f8dd0q98dddrl9wipswjqcyca4j2"; + sha256 = "0b98h6wh6pdjlk1k0xbrcbn3gfsmfqcda974in790vjxppnvflw4"; }; sourceRoot = "Clop.app"; diff --git a/libraries/nixpkgs/programs/orbstack/default.nix b/libraries/nixpkgs/programs/orbstack/default.nix index edda97e3..e4ed7911 100644 --- a/libraries/nixpkgs/programs/orbstack/default.nix +++ b/libraries/nixpkgs/programs/orbstack/default.nix @@ -1,17 +1,17 @@ { lib, fetchurl, fetchFromGitHub, stdenvNoCC, docker, installShellFiles, _7zz }: let - version = "1.8.0_18332"; + version = "1.8.1_18374"; hdiutil = "/usr/bin/hdiutil"; sources = { "aarch64-darwin" = { url = "https://cdn-updates.orbstack.dev/arm64/OrbStack_v${version}_arm64.dmg"; - sha256 = "0dvhr9vkjxl971kvj2xdcaps7zl5jy7j37iazmvqaxcvkran3qkx"; + sha256 = "03fdakn7w279r7w315a97rdlz74x1ki4s1x108hpmqf4zikncy3m"; }; "x86_64-darwin" = { url = "https://cdn-updates.orbstack.dev/amd64/OrbStack_v${version}_amd64.dmg"; - sha256 = "1c3wnmcp0gwhw3wbnffjd04g5h23dwqddhrl93n0a6167m1nwnhq"; + sha256 = "0xj8cnp7ddgqrv803n2xk64vd3fqn92n2njz8mby7rzb6s7nag78"; }; }; diff --git a/modules/shared/configuration.nix b/modules/shared/configuration.nix index 2c5c5e63..fbe2d76f 100644 --- a/modules/shared/configuration.nix +++ b/modules/shared/configuration.nix @@ -2,8 +2,10 @@ { nix = { + optimise = { + automatic = true; + }; settings = { - auto-optimise-store = true; substituters = [ "https://cache.nixos.org" ]; diff --git a/modules/shared/programs/vscode/default.nix b/modules/shared/programs/vscode/default.nix index 56b5a8d8..ea5b0b90 100644 --- a/modules/shared/programs/vscode/default.nix +++ b/modules/shared/programs/vscode/default.nix @@ -93,6 +93,7 @@ in exiasr.hadolint foxundermoon.shell-format fwcd.kotlin + github.copilot golang.go graphql.vscode-graphql graphql.vscode-graphql-syntax