Migrate packages to modules, clean

mcwitt · Sep 25, 2024 · 116aaaf · 116aaaf
1 parent 84a4f3d
commit 116aaaf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/modules/common/home-manager/profiles/base/default.nix b/modules/common/home-manager/profiles/base/default.nix
@@ -9,23 +9,18 @@
 
   fonts.fontconfig.enable = true;
 
-  home.packages = with pkgs; [
-    delta
-    difftastic
-    fd
-    (ffmpeg.override { withFullDeps = true; })
-    fzf
-    htop
-    imagemagick
-    nix-du
-    (parallel-full.override { willCite = true; })
-    pre-commit
-    nodePackages.prettier
-    proselint
-    ripgrep
-    xclip
-    yq
-  ];
+  home.packages =
+    [
+      pkgs.delta
+      pkgs.difftastic
+      ((pkgs.ffmpeg.override { withFullDeps = true; }).overrideAttrs { doCheck = false; })
+      pkgs.imagemagick
+      pkgs.nix-du
+      ((pkgs.parallel-full.override { willCite = true; }).overrideAttrs { doCheck = false; })
+      pkgs.nodePackages.prettier
+      pkgs.xclip
+      pkgs.yq
+    ];
 
   home.shellAliases = {
     cdr = ''cd "$(${pkgs.git}/bin/git rev-parse --show-toplevel)"'';
@@ -62,6 +57,8 @@
 
   programs.emacs.enable = true;
 
+  programs.fd.enable = true;
+
   programs.fish = {
     enable = true;
 
@@ -142,12 +139,16 @@
 
   programs.home-manager.enable = true;
 
+  programs.htop.enable = true;
+
   programs.jq.enable = true;
 
   programs.ncdu.enable = true;
 
   programs.nushell.enable = true;
 
+  programs.ripgrep.enable = true;
+
   programs.wezterm = {
     enable = true;
     colorSchemes.custom = with config.lib.stylix.colors.withHashtag; {

diff --git a/modules/common/home-manager/tools/aws/default.nix b/modules/common/home-manager/tools/aws/default.nix
@@ -7,7 +7,7 @@ in
 
   config = mkIf cfg.enable {
 
-    home.packages = [ pkgs.awscli2 ];
+    programs.awscli.enable = true;
 
     programs.fish.interactiveShellInit = ''
       # https://github.com/aws/aws-cli/issues/1079