Merge pull request 'mac2' (#3) from mac2 into master

Reviewed-on: https://git.sortug.com/polwex/nixconf/pulls/3

1 files changed, 74 insertions, 61 deletions

diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index 953b7fd..2f55c40 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -1,87 +1,100 @@
 {
   inputs,
   pkgs,
+  lib,
   ...
 }: {
   environment.systemPackages = with pkgs; [
-    moreutils
-    alejandra
-    # nixfmt
-    #
-    busybox
-    usbutils
-    xdg-utils
-    rlwrap
-    wget
-    htop
-    btop
-    bat
-    gitAndTools.gitFull
-    lazygit
-    git-lfs
-    lsd
-    lsof
-    tmux
-    socat
-    tmate
-    curlFull
-    ripgrep
-    ranger
-    minio
-    minio-client
-    zip
-    unzip
-    jq
-    vifm
-    nnn
-    fzf
-    killall
-    tree
-    qrcp
-    deluge
-    ncdu
-    edir
-    bottom
-    pigz
-    rclone
-    gparted
-    autossh
-    #hardware problems
-    lm_sensors
-    linuxKernel.packages.linux_hardened.cpupower
-    # linuxKernel.packages.linux_latest_libre.cpupower
+    # networking
+     minio
+     minio-client
+     curlFull
+     wget
+     deluge
+     autossh
+     sshfs
+    # terminal basics
+
+     htop
+     rlwrap
+     bat
+     gitAndTools.gitFull
+     lazygit
+     git-lfs
+     lsd
+     lsof
+     tmux
+     tmate
+     jq
+     vifm
+     killall
+     tree
+     qrcp
+     edir
+     bottom
+     pigz
+     rclone
+    # files/disk
+     nnn
+     ranger
+     ripgrep
+     fzf
+     ncdu
+     zip
+     unzip
+    
     # images
     imagemagick
-    sxiv
-    # audio debug
-    alsa-firmware
-    # wine
-    #wineWowPackages.staging
-    #wineWowPackages.waylandFull
-    appimage-run
-    # code
+    # nix
     nil
+    alejandra
+    #nixfmt
     direnv
     nix-direnv
-    # devenv
-    inputs.devenv.packages.${pkgs.system}.default
+    devenv
+    #inputs.devenv.packages.${pkgs.system}.default
     # scraping
     python312Packages.yt-dlp
     # markdown lsp
     marksman
     # disk automount
-    udiskie
     #crypto
     # electrum
     # yacreader
-    nethogs
     superhtml
-    sshfs
-    sxiv
 
     # ai stuff!
     # aider-chat
-    yek
+    # yek
     # python312Packages.google-generativeai
+  ] ++ lib.optionals pkgs.stdenv.isLinux [
+    # linuxKernel.packages.linux_latest_libre.cpupower
+      gparted
+      moreutils
+      busybox
+      usbutils
+      xdg-utils
+      #hardware problems
+      lm_sensors
+      linuxKernel.packages.linux_hardened.cpupower
+     nethogs
+     #networking
+     # images
+     sxiv
+     # audio debug
+     alsa-firmware
+     # wine
+     appimage-run
+     # disk automount
+     udiskie
+     # /mac
+  ] ++ lib.optionals pkgs.stdenv.isDarwin [
+     # mostly for mcp stuff
+     nodejs
+     node2nix
+     zig
+     gcc
+     gnumake
+     bun
   ];
 }