From 4413ba7adf425846fda3535ad6bc43adb313207a Mon Sep 17 00:00:00 2001 From: Alex Bates Date: Wed, 22 Apr 2026 14:32:23 +0100 Subject: [PATCH] pin watchman to cached nixpkgs, remove intellij and ollama from merlon --- flake.lock | 87 ++++++++++------------------------ flake.nix | 5 +- hosts/merlon/configuration.nix | 2 - modules/home/git.nix | 7 ++- modules/home/intellij.nix | 20 -------- 5 files changed, 31 insertions(+), 90 deletions(-) delete mode 100644 modules/home/intellij.nix diff --git a/flake.lock b/flake.lock index 4f3178b..46f7f48 100644 --- a/flake.lock +++ b/flake.lock @@ -208,22 +208,6 @@ } }, "flake-compat_2": { - "flake": false, - "locked": { - "lastModified": 1767039857, - "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", - "owner": "NixOS", - "repo": "flake-compat", - "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { "flake": false, "locked": { "lastModified": 1747046372, @@ -319,7 +303,7 @@ }, "flake-utils": { "inputs": { - "systems": "systems_6" + "systems": "systems_5" }, "locked": { "lastModified": 1731533236, @@ -358,7 +342,7 @@ }, "flake-utils_3": { "inputs": { - "systems": "systems_9" + "systems": "systems_8" }, "locked": { "lastModified": 1681202837, @@ -491,11 +475,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1776351423, - "narHash": "sha256-JySMZu8hLD8kV2HerIZ6uZyrijc7SUaGhRAKH63X6R4=", + "lastModified": 1776917308, + "narHash": "sha256-ih1+piERuN4l8/ixqbHiT+AR28YFMLA2MMkJIrtfsRQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "1fb51dbe453f1c8ec5b7133df561512e43dc7cc2", + "rev": "03a2450015a30bab3be98ba90a8e66cd665724dc", "type": "github" }, "original": { @@ -622,7 +606,7 @@ "type": "github" } }, - "nix-jetbrains-plugins": { + "nix-minecraft": { "inputs": { "flake-compat": "flake-compat_2", "nixpkgs": [ @@ -630,28 +614,6 @@ ], "systems": "systems_4" }, - "locked": { - "lastModified": 1772266606, - "narHash": "sha256-oY2w5MGPY/MHbgo47Wxzo8K/uHcCYKPcOnDKMbpWW1I=", - "owner": "nix-community", - "repo": "nix-jetbrains-plugins", - "rev": "3034024962516d52a638134efaed55acdbbf8dc1", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nix-jetbrains-plugins", - "type": "github" - } - }, - "nix-minecraft": { - "inputs": { - "flake-compat": "flake-compat_3", - "nixpkgs": [ - "nixpkgs" - ], - "systems": "systems_5" - }, "locked": { "lastModified": 1772592046, "narHash": "sha256-+Lyl+mGVd0t2nlR6ODK/gvUHzMtF5qLlbTK+x5tCenU=", @@ -749,6 +711,22 @@ "type": "github" } }, + "nixpkgs-watchman": { + "locked": { + "lastModified": 1774078191, + "narHash": "sha256-nyxxxW1/2ouu9dU0I02ul5pHrmUrE1JVFhfFlmYe3Lw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09061f748ee21f68a089cd5d91ec1859cd93d0be", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "09061f748ee21f68a089cd5d91ec1859cd93d0be", + "type": "github" + } + }, "nixpkgs_2": { "locked": { "lastModified": 1762363567, @@ -787,7 +765,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_7" + "systems": "systems_6" }, "locked": { "lastModified": 1772402258, @@ -856,10 +834,10 @@ "minegrub-world-sel-theme": "minegrub-world-sel-theme", "niri": "niri", "nix-darwin": "nix-darwin", - "nix-jetbrains-plugins": "nix-jetbrains-plugins", "nix-minecraft": "nix-minecraft", "nixgl": "nixgl", "nixpkgs": "nixpkgs_3", + "nixpkgs-watchman": "nixpkgs-watchman", "nixvim": "nixvim", "noctalia": "noctalia", "starship-jj": "starship-jj", @@ -891,7 +869,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_8" + "systems": "systems_7" }, "locked": { "lastModified": 1771062192, @@ -1027,21 +1005,6 @@ "type": "github" } }, - "systems_9": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 400b472..00f0031 100644 --- a/flake.nix +++ b/flake.nix @@ -68,14 +68,11 @@ url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; - nix-jetbrains-plugins = { - url = "github:nix-community/nix-jetbrains-plugins"; - inputs.nixpkgs.follows = "nixpkgs"; - }; starship-jj = { url = "gitlab:lanastara_foss/starship-jj"; inputs.nixpkgs.follows = "nixpkgs"; }; + nixpkgs-watchman.url = "github:NixOS/nixpkgs/09061f748ee21f68a089cd5d91ec1859cd93d0be"; }; outputs = diff --git a/hosts/merlon/configuration.nix b/hosts/merlon/configuration.nix index ff3baa8..a197c6c 100644 --- a/hosts/merlon/configuration.nix +++ b/hosts/merlon/configuration.nix @@ -23,7 +23,6 @@ in ../../modules/system/gc.nix ../../modules/system/nixvim.nix ../../modules/system/tailscale.nix - ../../modules/system/ollama.nix inputs.minegrub-world-sel-theme.nixosModules.default inputs.minecraft-plymouth-theme.nixosModules.default inputs.disko.nixosModules.disko @@ -55,7 +54,6 @@ in users.bates64 = { imports = [ ../../modules/home/profiles/desktop.nix - ../../modules/home/intellij.nix ../../modules/home/discord-rpc.nix ]; services.discord-rpc = { diff --git a/modules/home/git.nix b/modules/home/git.nix index 2a25acf..dc8fe80 100644 --- a/modules/home/git.nix +++ b/modules/home/git.nix @@ -1,4 +1,7 @@ -{ lib, pkgs, ... }: +{ lib, pkgs, inputs, ... }: +let + pkgs-watchman = import inputs.nixpkgs-watchman { inherit (pkgs) system; }; +in { programs.git = { enable = true; @@ -106,5 +109,5 @@ }; }; - home.packages = [ pkgs.watchman ]; # for programs.jujutsu.settings.fsmonitor.backend + home.packages = [ pkgs-watchman.watchman ]; # for programs.jujutsu.settings.fsmonitor.backend } diff --git a/modules/home/intellij.nix b/modules/home/intellij.nix deleted file mode 100644 index a112c27..0000000 --- a/modules/home/intellij.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ pkgs, inputs, ... }: -let - inherit (inputs.nix-jetbrains-plugins.lib) buildIdeWithPlugins; - - # https://plugins.jetbrains.com/ - plugins = [ - "com.intellij.plugins.vscodekeymap" - "com.github.catppuccin.jetbrains" - "com.github.catppuccin.jetbrains_icons" - "com.github.copilot" - "com.intellij.plugins.watcher" - "com.intellij.uiDesigner" - ]; -in -{ - home.packages = [ - pkgs.jetbrains.jdk-no-jcef - (buildIdeWithPlugins pkgs "idea" plugins) - ]; -} -- 2.51.2