From 771fd10e7a3154e72bb26d0689f78984bbb80dfa Mon Sep 17 00:00:00 2001 From: Wittano Bonarotti Date: Sat, 3 Aug 2024 10:33:52 +0200 Subject: [PATCH] feat(ide): reduced number of installed IDEs --- flake.lock | 26 +++++++++++++------------- hosts/pc/configuration.nix | 2 +- modules/dev/ide.nix | 18 ++++-------------- 3 files changed, 18 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index 33bd4f63..bd99544a 100644 --- a/flake.lock +++ b/flake.lock @@ -24,11 +24,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1721784420, - "narHash": "sha256-bgF6fN4Qgk7NErFKGuuqWXcLORsiykTYyqMUFRiAUBY=", + "lastModified": 1722661201, + "narHash": "sha256-2JX3S1hmmUhHuyGyGWnaM4xT0SiaDdVkNzmBrEowwK0=", "owner": "catppuccin", "repo": "nix", - "rev": "8bdb55cc1c13f572b6e4307a3c0d64f1ae286a4f", + "rev": "19a0f144f0204a12a89243363efb6a493b8cfc83", "type": "github" }, "original": { @@ -382,11 +382,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1722615527, - "narHash": "sha256-/ilJ0yMre4E//HMBV33Q+0zVc3t8DD0pszV+xS0+6SA=", + "lastModified": 1722671506, + "narHash": "sha256-CBobmZuo8PpceuyvXSOV/oxnfPJNRQL0JP6smXVwzBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecf7c683c21655a2c90bec49ce726aa6615a7d28", + "rev": "caa189d71a9b658033e519b5305400c0162ebb61", "type": "github" }, "original": { @@ -444,11 +444,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1722372011, - "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", + "lastModified": 1722519197, + "narHash": "sha256-VEdJmVU2eLFtLqCjTYJd1J7+Go8idAcZoT11IewFiRg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf05eeada35e122770c5c14add958790fcfcbef5", + "rev": "05405724efa137a0b899cce5ab4dde463b4fd30b", "type": "github" }, "original": { @@ -490,8 +490,8 @@ "nixpkgs_7": { "locked": { "lastModified": 0, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", - "path": "/nix/store/d6533m6b80n3c9lia5kvaz59ad3fynwk-source", + "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", + "path": "/nix/store/z3vrsz16ypv60m2pp0gi7x7gpx40gfh1-source", "type": "path" }, "original": { @@ -516,8 +516,8 @@ "nixpkgs_9": { "locked": { "lastModified": 0, - "narHash": "sha256-2ShmEaFi0kJVOEEu5gmlykN5dwjWYWYUJmlRTvZQRpU=", - "path": "/nix/store/d6533m6b80n3c9lia5kvaz59ad3fynwk-source", + "narHash": "sha256-B2xRiC3NEJy/82ugtareBkRqEkPGpMyjaLxaR8LBxNs=", + "path": "/nix/store/z3vrsz16ypv60m2pp0gi7x7gpx40gfh1-source", "type": "path" }, "original": { diff --git a/hosts/pc/configuration.nix b/hosts/pc/configuration.nix index 32503bb7..5d534f81 100644 --- a/hosts/pc/configuration.nix +++ b/hosts/pc/configuration.nix @@ -34,7 +34,7 @@ games.enable = true; mihoyo.enable = true; }; - dev.lang.ides = [ "go" "sql" "fork" ]; + dev.lang.ides = [ "go" "fork" ]; hardware = rec { grub.enableMultiBoot = true; sound.enable = true; diff --git a/modules/dev/ide.nix b/modules/dev/ide.nix index 462b5cac..043c2dbd 100644 --- a/modules/dev/ide.nix +++ b/modules/dev/ide.nix @@ -19,6 +19,7 @@ let addProjectDirField (with unstable.jetbrains; rec { python.package = pycharm-professional; cpp.package = clion; + zig = cpp; go.package = goland; dotnet.package = rider; rust.package = rust-rover; @@ -29,20 +30,9 @@ let haskell.extraConfig = { home-manager.users.wittano.home.packages = with unstable; [ zed-editor ]; }; - fork.extraConfig = - let - jvmConfig = mkExtraConfig jvm; - cppConfig = mkExtraConfig cpp; - rustConfig = mkExtraConfig rust; - in - mkMerge [ - jvmConfig - cppConfig - rustConfig - { - home-manager.users.wittano.home.packages = with unstable; [ vscodium ]; - } - ]; + fork.extraConfig = { + home-manager.users.wittano.home.packages = with unstable; [ vscodium ]; + }; }); installedIDEs = trivial.pipe cfg.ides [