mmm

home-manager/modules/packages.nix

@@ -31,65 +31,16 @@ with pkgs; let
       west
       pyelftools
     ]);
-in {
-  imports = [
-    ./modules/yabai/yabai.nix
-    ./modules/skhd/skhd.nix
-  ];
-
-  nixpkgs.overlays = [
-    (final: prev: {
-      maven363 = prev.maven.overrideAttrs (old: rec {
-        pname = "apache-maven";
-        version = "3.6.3";
-        src = prev.pkgs.fetchurl {
-          url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
-          sha256 = "sha256-Jq2R11GzqaUwh676dD9OFqF3QdORWyGc90ESv4ekOMU=";
-        };
-      });
-    })
-  ];
-  nixpkgs.config.permittedInsecurePackages = [
-    "hadoop-3.3.1"
-    "libressl-3.4.3"
-  ];
-  nix = {
-    configureBuildUsers = true;
-    settings = {
-      substituters = [
-        "https://cache.nixos.org/"
-        "https://cache.iog.io"
-        "https://haskell-language-server.cachix.org"
-        "https://nix-community.cachix.org"
-      ];
-      trusted-users = ["@admin"];
-      trusted-public-keys = [
-        "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="
-        "hydra.iohk.io:f/Ea+s+dFdN+3Y/G+FDgSq+a5NEWhJGzdjvKNGv0/EQ="
-        "haskell-language-server.cachix.org-1:juFfHrwkOxqIOZShtC4YC1uT1bBcq2RSvC7OMKx0Nz8="
-        "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      ];
-
-      experimental-features = ["ca-derivations" "nix-command" "flakes"];
-
-      keep-outputs = true;
-      keep-derivations = true;
-
-      auto-optimise-store = true;
-      max-jobs = 32;
-      cores = 0;
-      http-connections = 64;
+  maven363 = pkgs.maven.overrideAttrs (old: rec {
+    pname = "apache-maven";
+    version = "3.6.3";
+    src = pkgs.fetchurl {
+      url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz";
+      sha256 = "sha256-Jq2R11GzqaUwh676dD9OFqF3QdORWyGc90ESv4ekOMU=";
     };
-    package = nixUnstable;
-  };
-
-  nix.extraOptions =
-    ""
-    + lib.optionalString (pkgs.system == "aarch64-darwin") ''
-      extra-platforms = x86_64-darwin aarch64-darwin
-    '';
-
-  environment.systemPackages = with pkgs; [
+  });
+in {
+  home.packages = with pkgs; [
     gitAndTools.gitFull
     neovim
     vim
@@ -131,7 +82,7 @@ in {
 
     htop
 
-    exa
+    eza
 
     openconnect
     yq
@@ -170,7 +121,7 @@ in {
     # apktool no darwin
 
     docker
-    lima
+    # lima - removed due to CVEs, use unstable version if needed
     llvmPackages_14.clangUseLLVM
 
     headscale