From 7a510c5d143f4bb94cc4751c31529a3e28849e89 Mon Sep 17 00:00:00 2001 From: Alexander Heldt Date: Wed, 7 Jan 2026 14:33:17 +0100 Subject: [PATCH] pinwheel: Update `idea` after updated flake inputs --- flake.lock | 76 +++++++++++++++++++++++++ flake.nix | 5 ++ hosts/pinwheel/modules/work/default.nix | 7 ++- 3 files changed, 87 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index d4419a5..88017b1 100644 --- a/flake.lock +++ b/flake.lock @@ -86,6 +86,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1765121682, + "narHash": "sha256-4VBOP18BFeiPkyhy9o4ssBNQEvfvv1kXkasAYd0+rrA=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "65f23138d8d09a92e30f1e5c87611b23ef451bf3", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": "systems_2" @@ -104,6 +120,27 @@ "type": "github" } }, + "flake-utils_2": { + "inputs": { + "systems": [ + "nix-jetbrains-plugins", + "systems" + ] + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -221,6 +258,29 @@ "type": "github" } }, + "nix-jetbrains-plugins": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "systems": "systems_3" + }, + "locked": { + "lastModified": 1767434185, + "narHash": "sha256-S289tJM4HQQStEF9QMCtS93duiYwfecWy/zhBoEb890=", + "owner": "nix-community", + "repo": "nix-jetbrains-plugins", + "rev": "d3b3c5d901ce5980dec75f54f2ca6446f51b3451", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-jetbrains-plugins", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1767185284, @@ -300,6 +360,7 @@ "naviterm": "naviterm", "nh": "nh", "nix-gc-env": "nix-gc-env", + "nix-jetbrains-plugins": "nix-jetbrains-plugins", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs", "pppdotpm-site": "pppdotpm-site", @@ -337,6 +398,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "whib-backend": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 0f04146..190011c 100644 --- a/flake.nix +++ b/flake.nix @@ -38,6 +38,11 @@ inputs.nixpkgs.follows = "nixpkgs"; }; + nix-jetbrains-plugins = { + url = "github:nix-community/nix-jetbrains-plugins"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + naviterm = { url = "gitlab:detoxify92/naviterm"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hosts/pinwheel/modules/work/default.nix b/hosts/pinwheel/modules/work/default.nix index b63d36d..c358556 100644 --- a/hosts/pinwheel/modules/work/default.nix +++ b/hosts/pinwheel/modules/work/default.nix @@ -1,4 +1,5 @@ { + inputs, pkgs, lib, config, @@ -20,7 +21,11 @@ in # (pkgs.callPackage ./pants.nix { inherit (pkgs) stdenv.hostPlatform.system; }) # (pkgs.callPackage ./syb-cli.nix { }) - (pkgs.jetbrains.plugins.addPlugins pkgs.jetbrains.idea [ "ideavim" ]) + (inputs.nix-jetbrains-plugins.lib."${pkgs.stdenv.hostPlatform.system}".buildIdeWithPlugins + pkgs.jetbrains + "idea" + [ "IdeaVIM" ] + ) (pkgs.google-cloud-sdk.withExtraComponents [ pkgs.google-cloud-sdk.components.gke-gcloud-auth-plugin