From f4cf3fc6a3e9d1b8a246b9da20e3181ce47d981a Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Fri, 13 Sep 2024 10:42:38 +0530 Subject: [PATCH] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'home-manager': 'github:nix-community/home-manager/127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6' (2024-09-06) → 'github:nix-community/home-manager/da8406a6ff556b86dc368e96ca8bd81b2704a91a' (2024-09-12) • Updated input 'nix-darwin': 'github:LnL7/nix-darwin/76559183801030451e200c90a1627c1d82bb4910' (2024-09-06) → 'github:LnL7/nix-darwin/21fe31f26473c180390cfa81e3ea81aca0204c80' (2024-09-13) • Updated input 'nixpkgs': 'github:nixos/nixpkgs/9bb1e7571aadf31ddb4af77fc64b2d59580f9a39' (2024-09-05) → 'github:nixos/nixpkgs/280db3decab4cbeb22a4599bd472229ab74d25e1' (2024-09-12) --- flake.lock | 18 +++++++++--------- homebrew.nix | 1 - nix.nix | 10 ++++------ programs/vscode.nix | 2 +- programs/vscode/extensions.nix | 28 ++++++++++++++-------------- 5 files changed, 28 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 7de7589..a6c52b8 100644 --- a/flake.lock +++ b/flake.lock @@ -104,11 +104,11 @@ ] }, "locked": { - "lastModified": 1725628988, - "narHash": "sha256-Y6TBMTGu4bddUwszGjlcOuN0soVc1Gv43hp+1sT/GNI=", + "lastModified": 1726142087, + "narHash": "sha256-uT4TRd3PgreUD5sJaNioVfMemdyWFLoPHqN4AFszGmw=", "owner": "nix-community", "repo": "home-manager", - "rev": "127ccc3eb7e36fa75e8c3fbd8a343154f66cc1c6", + "rev": "da8406a6ff556b86dc368e96ca8bd81b2704a91a", "type": "github" }, "original": { @@ -176,11 +176,11 @@ ] }, "locked": { - "lastModified": 1725628909, - "narHash": "sha256-xI0OSqPHcs/c/utJsU0Zvcp1VhejMI9mgwr68uHHlPs=", + "lastModified": 1726188813, + "narHash": "sha256-Vop/VRi6uCiScg/Ic+YlwsdIrLabWUJc57dNczp0eBc=", "owner": "LnL7", "repo": "nix-darwin", - "rev": "76559183801030451e200c90a1627c1d82bb4910", + "rev": "21fe31f26473c180390cfa81e3ea81aca0204c80", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1726142289, + "narHash": "sha256-Jks8O42La+nm5AMTSq/PvM5O+fUAhIy0Ce1QYqLkyZ4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "280db3decab4cbeb22a4599bd472229ab74d25e1", "type": "github" }, "original": { diff --git a/homebrew.nix b/homebrew.nix index 8f83ed5..ac24834 100644 --- a/homebrew.nix +++ b/homebrew.nix @@ -32,7 +32,6 @@ masApps = { Amphetamine = 937984704; Bear = 1091189122; - GarageBand = 682658836; iMovie = 408981434; Ivory = 6444602274; Keynote = 409183694; diff --git a/nix.nix b/nix.nix index be80b05..d0ae236 100644 --- a/nix.nix +++ b/nix.nix @@ -4,20 +4,18 @@ let auto-optimise-store = true; connect-timeout = 60; download-attempts = 10; - cores = 2; + cores = 4; experimental-features = [ "nix-command" "flakes" "repl-flake" ]; fallback = true; keep-outputs = true; keep-going = true; log-lines = 25; - max-jobs = 6; + max-jobs = 3; }; in { services.nix-daemon.enable = true; nix = { package = pkgs.nixFlakes; - registry.nixpkgs.flake = inputs.nixpkgs; - nixPath = [ "nixpkgs=${inputs.nixpkgs}" ]; extraOptions = '' keep-outputs = true keep-derivations = true @@ -39,7 +37,7 @@ in { distributedBuilds = true; linux-builder = { enable = true; - maxJobs = 6; + maxJobs = 3; config = ({ pkgs, ... }: { users.extraGroups.docker.members = builtins.map (i: "nixbld" + builtins.toString i) @@ -50,7 +48,7 @@ in { diskSize = 40 * 1024; memorySize = 8 * 1024; }; - cores = 12; + cores = 4; }; nix.settings = nixSettings // { sandbox = false; }; }); diff --git a/programs/vscode.nix b/programs/vscode.nix index 807cf9e..c749de3 100644 --- a/programs/vscode.nix +++ b/programs/vscode.nix @@ -9,6 +9,7 @@ let "kirozen/wordcounter" "pedrorgirardi/vscode-cljfmt" "viablelab/capitaliz" + "ms-python/python" ]; in { programs.vscode = { @@ -34,7 +35,6 @@ in { mkhl.direnv ms-python.black-formatter ms-python.debugpy - ms-python.python ms-python.vscode-pylance rust-lang.rust-analyzer skellock.just diff --git a/programs/vscode/extensions.nix b/programs/vscode/extensions.nix index a927005..2b07e65 100644 --- a/programs/vscode/extensions.nix +++ b/programs/vscode/extensions.nix @@ -20,8 +20,8 @@ { name = "vscode-markdownlint"; publisher = "davidanson"; - version = "0.55.0"; - sha256 = "00rx55aapb7w6wazc3kyl8gzvfyr5d0flrwgxfz1pffw2dywfmxj"; + version = "0.56.0"; + sha256 = "17cz1nnb94qngnq9mwzc5i78sj27ab945lap4837gn9pxlysjd11"; } { name = "mustache"; @@ -44,8 +44,8 @@ { name = "go"; publisher = "golang"; - version = "0.43.0"; - sha256 = "0nafbz1wh3azh9a372yvk7vhcy80d8r11mj0yfq37wznh3m1kwc7"; + version = "0.43.1"; + sha256 = "1dib2qp56l7awpr6a7g7lkdmsrv2zhhh5fi5hjqkbvb28rsdl3i7"; } { name = "haskell"; @@ -74,8 +74,8 @@ { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.3.3"; - sha256 = "1rhb845l32r9ncwxynngq1zji2lf487ryc54n8hw8y9hph95pw7y"; + version = "0.3.5"; + sha256 = "12sg67mn3c8mjayh9d6y8qaky00vrlnwwx58v1f1m4qrbdjqab46"; } { name = "language-haskell"; @@ -128,14 +128,14 @@ { name = "python"; publisher = "ms-python"; - version = "2024.15.2024090406"; - sha256 = "07gff474x7q12llfap9m8xiryriq43gpdprwmdh679br2xbp9dkg"; + version = "2024.15.2024091202"; + sha256 = "0w2lw6404clwihx0n77dxp2r43f3lk87nqkvlija9wq06w4fg886"; } { name = "vscode-pylance"; publisher = "ms-python"; - version = "2024.8.104"; - sha256 = "1c40cig0dv8bn072ddy73d9i6z3npxblv7znbdyxns7rlqdd39hc"; + version = "2024.9.100"; + sha256 = "004ifi68f2p91kq6h5k9i5r5lrx37v6ck10sbh95wdab86m04qfl"; } { name = "vscode-cljfmt"; @@ -146,8 +146,8 @@ { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.2101"; - sha256 = "1din257f9zlpq6avim3hxsb6fq6ls5xhnjvjxyks98wwck1m0gpg"; + version = "0.4.2108"; + sha256 = "0hjq77qv8jg3fcl8dfgpj6aplq9h66wsflrq3yg6d6mzw8zwwfh0"; } { name = "just"; @@ -200,8 +200,8 @@ { name = "material-theme"; publisher = "zhuangtongfa"; - version = "3.17.2"; - sha256 = "1myqi6fffaq7szwz70bb0b2q9npgsk1s5fpakjkzdajlablcikg2"; + version = "3.17.3"; + sha256 = "1ay471r05na6ripcgsirsa7zj16qldwvlb0mb812w4h8n2v6vdgl"; } { name = "vscode-zig";