From 607a5c541d0ded735b96948b9bedb160a168c6d2 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Mon, 12 Jun 2023 14:39:33 -0400 Subject: [PATCH] system-specific packages --- flake.lock | 6 +- nix/home-manager/flake.lock | 18 ++-- nix/home-manager/modules/packages/default.nix | 83 ++++++++++--------- 3 files changed, 56 insertions(+), 51 deletions(-) diff --git a/flake.lock b/flake.lock index a56eb54..18fa1ce 100644 --- a/flake.lock +++ b/flake.lock @@ -164,11 +164,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686306016, - "narHash": "sha256-I3ziTWye7k07KknmO1WHym1YpKYaeZs+0GsxA9nRyTc=", + "lastModified": 1686476475, + "narHash": "sha256-W9yUePvCSDghn+YUXewuodyPxt+kJl/a7zdY4Q6r4MU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "124e028a0c59db58bc60e855a92eeb9299fd0be3", + "rev": "eef86b8a942913a828b9ef13722835f359deef29", "type": "github" }, "original": { diff --git a/nix/home-manager/flake.lock b/nix/home-manager/flake.lock index dcf8835..8a35406 100644 --- a/nix/home-manager/flake.lock +++ b/nix/home-manager/flake.lock @@ -82,11 +82,11 @@ ] }, "locked": { - "lastModified": 1686391840, - "narHash": "sha256-5S0APl6Mfm6a37taHwvuf11UHnAX0+PnoWQbsYbMUnc=", + "lastModified": 1686564129, + "narHash": "sha256-jzb2mHvQEZJL3a3ANhTeLIaa1nyjFJ/RzUJjCJme/V4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0144ac418ef633bfc9dbd89b8c199ad3a617c59f", + "rev": "9e37a1b6f9507ed27080518ff4007988a50c957e", "type": "github" }, "original": { @@ -142,11 +142,11 @@ ] }, "locked": { - "lastModified": 1685764721, - "narHash": "sha256-CIy1iwQTEKfZRrid4gBLA+r/LPGA9IUFo0lKJVyECGI=", + "lastModified": 1686574167, + "narHash": "sha256-hxE8z+S9E4Qw03D2VQRaJUmj9zep3FvhKz316JUZuPA=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "669ca1f2e2bc401abab6b837ae9c51503edc9b49", + "rev": "7e83b70f31f4483c07e6939166cb667ecb8d05d5", "type": "github" }, "original": { @@ -205,11 +205,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1686319658, - "narHash": "sha256-tGWdoUAqKnE866mYFlEfc2a99kxFy31hOQJH5YQKrTQ=", + "lastModified": 1686501370, + "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ae766d59b07c450e0f1de8a1bfd6529089f40849", + "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", "type": "github" }, "original": { diff --git a/nix/home-manager/modules/packages/default.nix b/nix/home-manager/modules/packages/default.nix index 5f6a206..ec5062e 100644 --- a/nix/home-manager/modules/packages/default.nix +++ b/nix/home-manager/modules/packages/default.nix @@ -4,49 +4,54 @@ config, system, ... -}: { +}: let + systemSpecificPackages = + if "${system}" != "aarch64-darwin" + then [pkgs.zsh pkgs.racket] + else []; +in { imports = [ ./emacs.nix ./git.nix ./starship.nix ./zellij.nix ]; - home.packages = with pkgs; [ - bandwhich - bat - bottom - cargo-workspaces - colima - clipboard-jh - dogdns - erdtree - fd - ffmpeg_6 - gawk - git-credential-1password - gnugrep - gnused - gnutar - gping - imagemagick - internetarchive - jless - jq - just - kondo - litecli - magic-wormhole-rs - ncdu - neovim - ov - pdm - poetry - racket - ripgrep - rsync - sqlite - yt-dlp - zsh - zstd - ]; + home.packages = with pkgs; + [ + bandwhich + bat + bottom + cargo-workspaces + colima + clipboard-jh + dogdns + erdtree + fd + ffmpeg_6 + gawk + git-credential-1password + gnugrep + gnused + gnutar + gping + imagemagick + internetarchive + jless + jq + just + kondo + litecli + magic-wormhole-rs + ncdu + neovim + ov + pdm + poetry + ripgrep + rsync + sqlite + yt-dlp + zstd + ] + ++ systemSpecificPackages; }