From c88bbea690aa8882b37b883f4945857d16671e4a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Fri, 28 Feb 2025 11:17:13 -0500 Subject: [PATCH] Fix vscodium extensions --- flake.lock | 141 ++++++++++++++++++++------- modules/common-desktop/vscodium.nix | 22 +++++ wrappers/common-desktop/todo.nix | 2 + wrappers/common-desktop/vscodium.nix | 22 ----- 4 files changed, 128 insertions(+), 59 deletions(-) create mode 100644 wrappers/common-desktop/todo.nix delete mode 100644 wrappers/common-desktop/vscodium.nix diff --git a/flake.lock b/flake.lock index b47c28f..5dc54f8 100644 --- a/flake.lock +++ b/flake.lock @@ -100,7 +100,6 @@ } }, "flake-compat": { - "flake": false, "locked": { "lastModified": 1733328505, "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", @@ -133,6 +132,28 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -183,11 +204,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -240,11 +261,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1740177427, - "narHash": "sha256-1xUiN0Yvvl/r+XyyXiJHxw64FwUGBfKF+XA7Ugm8ElU=", + "lastModified": 1740699498, + "narHash": "sha256-r9hkKzX99CGiP1ZqH0e+SWKK4CMsRNRLyotuwrUjhTI=", "owner": "nix-community", "repo": "home-manager", - "rev": "9f74e14a2d9af4c6f2024cca7813b830b020f45e", + "rev": "b71edac7a3167026aabea82a54d08b1794088c21", "type": "github" }, "original": { @@ -260,11 +281,11 @@ ] }, "locked": { - "lastModified": 1737630279, - "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", + "lastModified": 1740347597, + "narHash": "sha256-st5q9egkPGz8TUcVVlIQX7y6G3AzHob+6M963bwVq74=", "owner": "nix-community", "repo": "home-manager", - "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", + "rev": "12e26a74e5eb1a31e13daaa08858689e25ebd449", "type": "github" }, "original": { @@ -279,11 +300,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1740162289, - "narHash": "sha256-jYhBd5VR2BKo75qDUQaWrhHVC5GJPJraTbGJVVQkfgM=", + "lastModified": 1740552472, + "narHash": "sha256-KiGmSYyO9MJJqYD7nbQ0NQgsAR2VVY/wRra0Bob4KtE=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "8172a58da94446a15ad5801a6d091a8d13f88e6c", + "rev": "452fbd6a30f128dddf26c63f727cf685b5af5658", "type": "github" }, "original": { @@ -294,11 +315,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1739736696, + "narHash": "sha256-zON2GNBkzsIyALlOCFiEBcIjI4w38GYOb+P+R4S8Jsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "d74a2335ac9c133d6bbec9fc98d91a77f1604c1f", "type": "github" }, "original": { @@ -322,11 +343,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739451785, - "narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=", + "lastModified": 1740019556, + "narHash": "sha256-vn285HxnnlHLWnv59Og7muqECNMS33mWLM14soFIv2g=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9", + "rev": "dad564433178067be1fbdfcce23b546254b6d641", "type": "github" }, "original": { @@ -338,11 +359,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1739866667, - "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "nixos", "repo": "nixpkgs", - "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { @@ -354,11 +375,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1736798957, - "narHash": "sha256-qwpCtZhSsSNQtK4xYGzMiyEDhkNzOCz/Vfu4oL2ETsQ=", + "lastModified": 1740367490, + "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9abb87b552b7f55ac8916b6fc9e5cb486656a2f3", + "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05", "type": "github" }, "original": { @@ -368,6 +389,29 @@ "type": "github" } }, + "nur": { + "inputs": { + "flake-parts": "flake-parts_2", + "nixpkgs": [ + "stylix", + "nixpkgs" + ], + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1740408283, + "narHash": "sha256-2xECnhgF3MU9YjmvOkrRp8wRFo2OjjewgCtlfckhL5s=", + "owner": "nix-community", + "repo": "NUR", + "rev": "496a4a11162bdffb9a7b258942de138873f019f7", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "NUR", + "type": "github" + } + }, "programsdb": { "inputs": { "nixpkgs": [ @@ -376,11 +420,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1740139556, - "narHash": "sha256-yFZza77iQ3ijTcRfmciCCiPw1MkdxK1ndmlGw/jZa6o=", + "lastModified": 1740736352, + "narHash": "sha256-E9nELhEPfvduzLmLOIplttTi44GhEv6Kup3yTtDYYf8=", "owner": "wamserma", "repo": "flake-programs-sqlite", - "rev": "94bbdee1c5add27443f097272b79230503e8b81c", + "rev": "c31d1f3726a951815f27dc2db631c14fd958efe8", "type": "github" }, "original": { @@ -413,6 +457,7 @@ "gnome-shell": "gnome-shell", "home-manager": "home-manager_2", "nixpkgs": "nixpkgs_4", + "nur": "nur", "systems": "systems", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -421,11 +466,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1740167553, - "narHash": "sha256-/tbaAA3PUfPbmOqxztKQKITBnJmgtqh/mVG6ygwpTXU=", + "lastModified": 1740734415, + "narHash": "sha256-QRux8OnLOvHoMB6jRlQgfffj9y3JEGSdWclB4blGLWM=", "owner": "danth", "repo": "stylix", - "rev": "917e07af1451d7765be57c8b31bb3372c7b821a7", + "rev": "c74352a1459ac0d350b22a3a45bbaa18ab7b7e2d", "type": "github" }, "original": { @@ -486,11 +531,11 @@ "tinted-schemes": { "flake": false, "locked": { - "lastModified": 1737565458, - "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "lastModified": 1740351358, + "narHash": "sha256-Hdk850xgAd3DL8KX0AbyU7tC834d3Lej1jOo3duWiOA=", "owner": "tinted-theming", "repo": "schemes", - "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "rev": "a1bc2bd89e693e7e3f5764cfe8114e2ae150e184", "type": "github" }, "original": { @@ -502,11 +547,11 @@ "tinted-tmux": { "flake": false, "locked": { - "lastModified": 1735737224, - "narHash": "sha256-FO2hRBkZsjlIRqzNHCPc/52yxg11kHGA8MEtSun9RwE=", + "lastModified": 1740272597, + "narHash": "sha256-/etfUV3HzAaLW3RSJVwUaW8ULbMn3v6wbTlXSKbcoWQ=", "owner": "tinted-theming", "repo": "tinted-tmux", - "rev": "aead506a9930c717ebf81cc83a2126e9ca08fa64", + "rev": "b6c7f46c8718cc484f2db8b485b06e2a98304cd0", "type": "github" }, "original": { @@ -531,6 +576,28 @@ "type": "github" } }, + "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "stylix", + "nur", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1733222881, + "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "49717b5af6f80172275d47a418c9719a31a78b53", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, "utils": { "locked": { "lastModified": 1678901627, diff --git a/modules/common-desktop/vscodium.nix b/modules/common-desktop/vscodium.nix index 7988e04..4d17512 100644 --- a/modules/common-desktop/vscodium.nix +++ b/modules/common-desktop/vscodium.nix @@ -3,6 +3,28 @@ pkgs, ... }: { + environment.systemPackages = with pkgs; [ + (vscode-with-extensions.override { + vscode = vscodium; + vscodeExtensions = with vscode-extensions; [ + mkhl.direnv + eamodio.gitlens + dart-code.flutter + jnoortheen.nix-ide + timonwong.shellcheck + usernamehw.errorlens + ritwickdey.liveserver + dbaeumer.vscode-eslint + esbenp.prettier-vscode + oderwat.indent-rainbow + astro-build.astro-vscode + pkief.material-icon-theme + streetsidesoftware.code-spell-checker + arcticicestudio.nord-visual-studio-code + ]; + }) + ]; + systemd.tmpfiles.settings.vscodium = { "/home/quadradical/.config/VSCodium/User/settings.json"."f+".argument = builtins.toJSON { "dart.debugExternalPackageLibraries" = true; diff --git a/wrappers/common-desktop/todo.nix b/wrappers/common-desktop/todo.nix new file mode 100644 index 0000000..da0be91 --- /dev/null +++ b/wrappers/common-desktop/todo.nix @@ -0,0 +1,2 @@ +{pkgs, ...}: { +} diff --git a/wrappers/common-desktop/vscodium.nix b/wrappers/common-desktop/vscodium.nix deleted file mode 100644 index 74a374b..0000000 --- a/wrappers/common-desktop/vscodium.nix +++ /dev/null @@ -1,22 +0,0 @@ -{pkgs, ...}: { - wrappers.vscodium = { - basePackage = pkgs.vscodium; - - pathAdd = with pkgs.vscode-extensions; [ - mkhl.direnv - eamodio.gitlens - dart-code.flutter - jnoortheen.nix-ide - timonwong.shellcheck - usernamehw.errorlens - ritwickdey.liveserver - dbaeumer.vscode-eslint - esbenp.prettier-vscode - oderwat.indent-rainbow - astro-build.astro-vscode - pkief.material-icon-theme - streetsidesoftware.code-spell-checker - arcticicestudio.nord-visual-studio-code - ]; - }; -}