From f349d132bfcb90632d4865c9fece5d392c1fec9e Mon Sep 17 00:00:00 2001 From: Thomas Syms Date: Tue, 11 Jun 2024 15:53:34 -0300 Subject: [PATCH] Wrapped vscode in flags for cleaner scaling --- flake.lock | 414 +---------------------- home/applications/vscode/default.nix | 19 +- home/applications/vscode/extensions.lock | 24 +- 3 files changed, 34 insertions(+), 423 deletions(-) diff --git a/flake.lock b/flake.lock index 71e65ab..5499f3b 100644 --- a/flake.lock +++ b/flake.lock @@ -151,38 +151,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_4": { "flake": false, "locked": { "lastModified": 1673956053, @@ -198,97 +166,6 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_6": { - "flake": false, - "locked": { - "lastModified": 1673956053, - "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1717285511, - "narHash": "sha256-iKzJcpdXih14qYVcZ9QC9XuZYnPc6T8YImb6dX166kw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "2a55567fcf15b1b1c7ed712a2c6fadaec7412ea8", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_2": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_2" - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nixos-cli", - "zignix", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712014858, - "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "flake-utils": { "inputs": { "systems": "systems" @@ -307,36 +184,6 @@ "type": "github" } }, - "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "locked": { - "lastModified": 1659877975, - "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "fromYaml": { "flake": false, "locked": { @@ -411,45 +258,6 @@ "type": "github" } }, - "libgit2": { - "flake": false, - "locked": { - "lastModified": 1697646580, - "narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=", - "owner": "libgit2", - "repo": "libgit2", - "rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5", - "type": "github" - }, - "original": { - "owner": "libgit2", - "repo": "libgit2", - "type": "github" - } - }, - "nix": { - "inputs": { - "flake-compat": "flake-compat_4", - "flake-parts": "flake-parts_3", - "libgit2": "libgit2", - "nixpkgs": "nixpkgs_3", - "nixpkgs-regression": "nixpkgs-regression", - "pre-commit-hooks": "pre-commit-hooks" - }, - "locked": { - "lastModified": 1714168167, - "narHash": "sha256-4AwaLB/gTRgvZG4FmFY6OY52yeLAnj0a6rtJCz7TRXA=", - "owner": "nixos", - "repo": "nix", - "rev": "2f678331d59451dd6f1d9512cb6d92e4ecb9750f", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nix", - "type": "github" - } - }, "nix-ld": { "inputs": { "nixpkgs": [ @@ -490,27 +298,6 @@ "type": "github" } }, - "nixos-cli": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_2", - "zignix": "zignix" - }, - "locked": { - "lastModified": 1717718578, - "narHash": "sha256-+Tlch/wGxGntH7EGRyMm33RfLO0r7UHCSscEx88lLQM=", - "owner": "water-sucks", - "repo": "nixos", - "rev": "75a191bdaa17e95ecda35cd571446837a4ec82e2", - "type": "github" - }, - "original": { - "owner": "water-sucks", - "repo": "nixos", - "type": "github" - } - }, "nixos-hardware": { "locked": { "lastModified": 1717995329, @@ -542,117 +329,7 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "lastModified": 1717284937, - "narHash": "sha256-lIbdfCsf8LMFloheeE6N31+BMIeixqyQWbSr2vk79EQ=", - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/eb9ceca17df2ea50a250b6b27f7bf6ab0186f198.tar.gz" - } - }, - "nixpkgs-lib_2": { - "locked": { - "dir": "lib", - "lastModified": 1711703276, - "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1717646450, - "narHash": "sha256-KE+UmfSVk5PG8jdKdclPVcMrUB8yVZHbsjo7ZT1Bm3c=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "818dbe2f96df233d2041739d6079bb616d3e5597", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1709083642, - "narHash": "sha256-7kkJQd4rZ+vFrzWu8sTRtta5D1kBG0LSRYAfhtmMlSo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "b550fe4b4776908ac2a861124307045f8e717c8e", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "release-23.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { - "locked": { - "lastModified": 1714213793, - "narHash": "sha256-Yg5D5LhyAZvd3DZrQQfJAVK8K3TkUYKooFtH1ulM0mw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d6f6eb2a984f2ba9a366c31e4d36d65465683450", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1702350026, - "narHash": "sha256-A+GNZFZdfl4JdDphYKBJ5Ef1HOiFsP18vQe9mqjmUis=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "9463103069725474698139ab10f17a9d125da859", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-23.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1717786204, "narHash": "sha256-4q0s6m0GUcN7q+Y2DqD27iLvbcd1G50T2lv08kKxkSI=", @@ -668,7 +345,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_3": { "locked": { "lastModified": 1714912032, "narHash": "sha256-clkcOIkg8G4xuJh+1onLG4HPMpbtzdLv4rHxFzgsH9c=", @@ -699,55 +376,14 @@ "type": "github" } }, - "pre-commit-hooks": { - "inputs": { - "flake-compat": [ - "nixos-cli", - "zignix", - "nix" - ], - "flake-utils": "flake-utils_2", - "gitignore": [ - "nixos-cli", - "zignix", - "nix" - ], - "nixpkgs": [ - "nixos-cli", - "zignix", - "nix", - "nixpkgs" - ], - "nixpkgs-stable": [ - "nixos-cli", - "zignix", - "nix", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712897695, - "narHash": "sha256-nMirxrGteNAl9sWiOhoN5tIHyjBbVi5e2tgZUgZlK3Y=", - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "rev": "40e6053ecb65fcbf12863338a6dcefb3f55f1bf8", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "pre-commit-hooks.nix", - "type": "github" - } - }, "root": { "inputs": { "disko": "disko", "home-manager": "home-manager", "nix-ld": "nix-ld", "nix-vscode-extensions": "nix-vscode-extensions", - "nixos-cli": "nixos-cli", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_2", "nur": "nur", "stylix": "stylix" } @@ -761,10 +397,10 @@ "base16-kitty": "base16-kitty", "base16-tmux": "base16-tmux", "base16-vim": "base16-vim", - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_2", "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1718013167, @@ -794,48 +430,6 @@ "repo": "default", "type": "github" } - }, - "zig-overlay": { - "inputs": { - "flake-compat": "flake-compat_5", - "flake-utils": "flake-utils_3", - "nixpkgs": "nixpkgs_5" - }, - "locked": { - "lastModified": 1714133353, - "narHash": "sha256-oDA4fGiFPxwiLHTJjY2hWn06Dg4yFW+EH/U9FTL8oRY=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "751dd89e227c60e89c6362fc5cdd5cb814e3f1ba", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zignix": { - "inputs": { - "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_2", - "nix": "nix", - "nixpkgs": "nixpkgs_4", - "zig-overlay": "zig-overlay" - }, - "locked": { - "lastModified": 1714783512, - "narHash": "sha256-Io9ZWYb+SamNzjeUWAHuBxhJZXu4TksNjMnKUAOFSHI=", - "owner": "water-sucks", - "repo": "zignix", - "rev": "31c699f40892ea0ffb144bd8513ae75755a8f0bf", - "type": "github" - }, - "original": { - "owner": "water-sucks", - "repo": "zignix", - "type": "github" - } } }, "root": "root", diff --git a/home/applications/vscode/default.nix b/home/applications/vscode/default.nix index 858a932..acaecfc 100644 --- a/home/applications/vscode/default.nix +++ b/home/applications/vscode/default.nix @@ -16,7 +16,24 @@ in { programs.vscode = { enable = true; - package = pkgs.vscodium; + package = pkgs.symlinkJoin { + name = "vscodium"; + pname = "vscodium"; + version = "1.0"; + paths = [pkgs.vscodium]; + + buildInputs = [pkgs.makeWrapper]; + + postBuild = '' + wrapProgram $out/bin/codium \ + --set-exec codium \ + --add-flags "--enable-features=UseOzonePlatform" \ + --add-flags "--enable-features=WaylandWindowDecorations" \ + --add-flags "--ozone-platform=wayland" \ + --add-flags "--disable-features=WaylandFractionalScaleV1" + ''; + }; + enableUpdateCheck = false; enableExtensionUpdateCheck = false; extensions = with plugins; [ diff --git a/home/applications/vscode/extensions.lock b/home/applications/vscode/extensions.lock index 7663f26..dca52a9 100644 --- a/home/applications/vscode/extensions.lock +++ b/home/applications/vscode/extensions.lock @@ -43,8 +43,8 @@ merge "github"."copilot" = vscode-utils.extensionFromVscodeMarketplace { name = "copilot"; publisher = "github"; - version = "1.200.922"; - sha256 = "1dvznp3g84n2ff847hln041aydashk77knsyx9ps2vgim15wcn6l"; + version = "1.200.925"; + sha256 = "10nmgk110j1s5k2cp5ndd127qx198rvn4p1ldgv382jdp6mma3fg"; }; "github"."copilot-chat" = vscode-utils.extensionFromVscodeMarketplace { name = "copilot-chat"; @@ -229,8 +229,8 @@ merge "arnoudkooicom"."sn-scriptsync" = vscode-utils.extensionFromVscodeMarketplace { name = "sn-scriptsync"; publisher = "arnoudkooicom"; - version = "3.3.3"; - sha256 = "0hq02p1180s2pn3xbj9gc0wgrl6v2yfc34qj0zfkbgskszpgzb1m"; + version = "3.3.4"; + sha256 = "0244vpz47cn68i5sfai6bvn8z9ff6cq1yp1lr43gm2ac3m5d16fx"; }; "kamadorueda"."alejandra" = vscode-utils.extensionFromVscodeMarketplace { name = "alejandra"; @@ -250,8 +250,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.1991"; - sha256 = "14p5hggysrlhxv3iirfqxdhlh4cy9v8bh2bqwhbp9sy43phdnd3g"; + version = "0.4.1994"; + sha256 = "047q5cvfn45mjw88nnk7yjv8ikavbwsi5ys4dwp9cbrqzc835y3n"; arch = "linux-x64"; }; })) @@ -266,8 +266,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.1991"; - sha256 = "0y8447gqz7i89qhgnba4dw5wk96pzyk3shz98h8ffclbnrxmg30w"; + version = "0.4.1994"; + sha256 = "18xr052d2k442kk1cs1dww472459zx22y2xjxlib4xarf9sx9400"; arch = "linux-arm64"; }; })) @@ -282,8 +282,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.1991"; - sha256 = "1a61rphbyd5wxfkkin3128l37g0b22f75qw3fbnky8qx8z3jp98a"; + version = "0.4.1994"; + sha256 = "0jvdjvkq50v1gyrdlr6052zyfmwslx2sva4czv5fng1y5v226pm6"; arch = "darwin-x64"; }; })) @@ -298,8 +298,8 @@ merge "rust-lang"."rust-analyzer" = vscode-utils.extensionFromVscodeMarketplace { name = "rust-analyzer"; publisher = "rust-lang"; - version = "0.4.1991"; - sha256 = "12lmi4byj5f7iqjm4qwsk9k4l1lshyg5lqc1ziwjklfhabj1hjzc"; + version = "0.4.1994"; + sha256 = "0cdx0bwcbbb4z9l60xiq4jl8cq82hlc9jh24spydg2giknvvvgcq"; arch = "darwin-arm64"; }; })