From 9946beb0fcfc6e7f5cf4986c27ce8d01ee971965 Mon Sep 17 00:00:00 2001 From: Katarina Sheremet Date: Tue, 14 Jul 2026 09:19:42 +0000 Subject: [PATCH] Fix vscode-server --- flake.lock | 119 +++++++++++++++++++++++++++++++++++++++-------------- flake.nix | 2 +- 2 files changed, 88 insertions(+), 33 deletions(-) diff --git a/flake.lock b/flake.lock index 34d3305..3ba0d6f 100644 --- a/flake.lock +++ b/flake.lock @@ -6,20 +6,22 @@ "fw_nix": "fw_nix", "git-hooks": "git-hooks_2", "home-manager": "home-manager", + "home-manager-mars": "home-manager-mars", "jail-nix": "jail-nix", "nix-homebrew": "nix-homebrew", "nixpkgs": [ "nixpkgs" ], + "nixpkgs-mars": "nixpkgs-mars", "systems": "systems_2", "vscode-server": "vscode-server" }, "locked": { - "lastModified": 1783627984, - "narHash": "sha256-0jTLPCHJtkfQcI2jo3y/mp1PpuZuvrSQgGXHgS6eQcs=", + "lastModified": 1783856399, + "narHash": "sha256-yYikOfb70Lt4hCTKALwCyEspRqj1lrDmY9CXKp1lalI=", "ref": "refs/heads/master", - "rev": "c41912da8ffc3e4a52b118441d65a4df8d25c88f", - "revCount": 578, + "rev": "91507f173dceb26226c3e5badd80323bc8660746", + "revCount": 581, "type": "git", "url": "https://github.com/dotdoom/dotfiles.git" }, @@ -48,16 +50,16 @@ "brew-src_2": { "flake": false, "locked": { - "lastModified": 1781226006, - "narHash": "sha256-w4ZTuOnhYiDxjaynrMTASzp802QblBWmo3wpB8wVN4Y=", + "lastModified": 1783446865, + "narHash": "sha256-nCrPEbQjgnSAOVWTxRXD9Yi6P3oECdtZISYcQCFI9Fs=", "owner": "Homebrew", "repo": "brew", - "rev": "109191be4988470b51a60a5ef1998520aa24c01b", + "rev": "655769712a9a9499563d9685a8488f349354492d", "type": "github" }, "original": { "owner": "Homebrew", - "ref": "6.0.1", + "ref": "6.0.9", "repo": "brew", "type": "github" } @@ -66,19 +68,20 @@ "inputs": { "nixpkgs": [ "artem_dotfiles", - "nixpkgs" + "nixpkgs-mars" ] }, "locked": { - "lastModified": 1783395956, - "narHash": "sha256-AAbexQvDoK+6GFJdhY6kqjA+6ECKRkidgWxkn4gMwAA=", + "lastModified": 1783744694, + "narHash": "sha256-2cp6N3rrwnGYLTx9l6N+NI+kwrCWxvJUbj5WJhvB29A=", "owner": "nix-darwin", "repo": "nix-darwin", - "rev": "d5bd9cd77aea4c0a8f49e7fd85545671a208ed15", + "rev": "c3e90c89649b07d1a96e4b9dd6cd0d6e44b91a74", "type": "github" }, "original": { "owner": "nix-darwin", + "ref": "nix-darwin-26.05", "repo": "nix-darwin", "type": "github" } @@ -213,11 +216,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1783627241, - "narHash": "sha256-KzrOQBguFyW5uA/NNncskOwKa83TCELK3RjT1EN09wU=", + "lastModified": 1783713126, + "narHash": "sha256-Q36Du9Ed1YwnQO1Mm9CHix/IcqAMkvSg34zExEfe8RI=", "ref": "refs/heads/main", - "rev": "3c760308b3780c4955cd2ce8e2ca046bf543817d", - "revCount": 43, + "rev": "56d3b6dfdd46efcfb0a6f4643116a8f54cf2f89e", + "revCount": 45, "type": "git", "url": "https://github.com/futureware-tech/nix.git" }, @@ -235,11 +238,11 @@ "systems": "systems_4" }, "locked": { - "lastModified": 1783713126, - "narHash": "sha256-Q36Du9Ed1YwnQO1Mm9CHix/IcqAMkvSg34zExEfe8RI=", + "lastModified": 1783867522, + "narHash": "sha256-rJUjsQbVFWWFQ7Xwt69Ad76v7OIpDXbqzW25d+I2BBs=", "ref": "refs/heads/main", - "rev": "56d3b6dfdd46efcfb0a6f4643116a8f54cf2f89e", - "revCount": 45, + "rev": "e132e29c641ee55aba9ad08507ace53e19cf2b3e", + "revCount": 47, "type": "git", "url": "https://github.com/futureware-tech/nix.git" }, @@ -344,11 +347,11 @@ ] }, "locked": { - "lastModified": 1783618078, - "narHash": "sha256-F43DGcBoIO8xOZFAfodg3jy0VghB9NGdb6xbTYAIx1A=", + "lastModified": 1783823409, + "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", "owner": "nix-community", "repo": "home-manager", - "rev": "144f4e36d0186195037da9fce80a727108978070", + "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", "type": "github" }, "original": { @@ -357,6 +360,28 @@ "type": "github" } }, + "home-manager-mars": { + "inputs": { + "nixpkgs": [ + "artem_dotfiles", + "nixpkgs-mars" + ] + }, + "locked": { + "lastModified": 1783740085, + "narHash": "sha256-qajyHfZY29G2oEQk+uHxmsJcRoBUBXP9maTpFlwP/dI=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "3cd22efe6471dc7365c822bd9ad73a21e55f38fb", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-26.05", + "repo": "home-manager", + "type": "github" + } + }, "home-manager_2": { "inputs": { "nixpkgs": [ @@ -364,11 +389,11 @@ ] }, "locked": { - "lastModified": 1783823409, - "narHash": "sha256-OI4IkRjRXa1e7hYmCGJDPDq5H/kPwhsyoS80cNUF9fI=", + "lastModified": 1783963347, + "narHash": "sha256-r376E2XpakiXwModDHIxlvB6qLq4iFVEq730vxOO4JY=", "owner": "nix-community", "repo": "home-manager", - "rev": "7566825d4652a1b885bd4ce65bd9e8def432fec9", + "rev": "a45a7c451455a51ae740ec3bce4024b312809c29", "type": "github" }, "original": { @@ -430,11 +455,11 @@ "brew-src": "brew-src_2" }, "locked": { - "lastModified": 1781389246, - "narHash": "sha256-ORqLAo/hoJdsZC7UPAuEHev6S0+XIqKEC7vjo5prz1k=", + "lastModified": 1783875858, + "narHash": "sha256-+yYNOkj/bkVQmwKH0hewqwBwAEoh4Gq2BmQPIP1jNrg=", "owner": "zhaofengli", "repo": "nix-homebrew", - "rev": "de7953a08ed4bb9245be043e468561c17b89130d", + "rev": "60641da8324e6a1af716a0340d901ccb131c91ef", "type": "github" }, "original": { @@ -459,6 +484,22 @@ "type": "github" } }, + "nixpkgs-mars": { + "locked": { + "lastModified": 1783788001, + "narHash": "sha256-ldd//kQFtHfGWLQd6deNXB6GnN6uLmwjPG6GGx/2vTA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "572a2c2b6faebd71246e3162e4217d7ca63a9300", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-screen": { "locked": { "lastModified": 1737753705, @@ -475,6 +516,22 @@ "type": "github" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1783868237, + "narHash": "sha256-MDQLbs882ugMi408mpSwa2nw2yzN43hHtOxx0zbUcZA=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "76fe02659c00bef75e12fbfdd45ca665115e9302", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-26.05-darwin", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "artem_dotfiles": "artem_dotfiles", @@ -605,9 +662,7 @@ "vscode-server_2": { "inputs": { "flake-utils": "flake-utils_2", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1770124655, diff --git a/flake.nix b/flake.nix index ff54f56..33d465a 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,7 @@ systems.url = "github:nix-systems/default"; vscode-server = { url = "github:nix-community/nixos-vscode-server"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-26.05-darwin"; }; home-manager = { url = "github:nix-community/home-manager";