m

7 files changed, 88 insertions, 155 deletions

diff --git a/hosts/editors.nix b/hosts/editors.nix
index b3e6e69..241ea57 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -7,8 +7,8 @@
   environment.variables.F = "hx";
   environment.systemPackages = [
     pkgs.neovim
-    inputs.helix.packages.${pkgs.system}.helix
+    #inputs.helix.packages.${pkgs.system}.helix
     pkgs.nodePackages.prettier
-    # pkgs.helix
+     pkgs.helix
   ];
 }
diff --git a/hosts/local/i3.nix b/hosts/local/i3.nix
index ba84982..210c0d0 100644
--- a/hosts/local/i3.nix
+++ b/hosts/local/i3.nix
@@ -90,6 +90,7 @@
     easyeffects
     # games!
     ryujinx
+    wineWowPackages.staging
   ];
   services.flatpak.enable = true;
 
diff --git a/hosts/local/wayland.nix b/hosts/local/wayland.nix
index 8f588c8..b56967c 100644
--- a/hosts/local/wayland.nix
+++ b/hosts/local/wayland.nix
@@ -120,6 +120,8 @@
     #    espeak-ng
     #    espeak-ng-data
     ghostty
+    wineWowPackages.staging
+    wineWowPackages.waylandFull
   ];
   services.speechd.enable = true;
 
diff --git a/hosts/mac/m1mba/configuration.nix b/hosts/mac/m1mba/configuration.nix
index 8809af7..ed64688 100644
--- a/hosts/mac/m1mba/configuration.nix
+++ b/hosts/mac/m1mba/configuration.nix
@@ -2,8 +2,9 @@
   imports = [
     ../../base.nix
     ../../users.nix
+    ../../editors.nix
+    ../../pkgs.nix
     ../mac.nix
-    ./pkgs.nix
     
   ];
 
diff --git a/hosts/mac/m1mba/pkgs.nix b/hosts/mac/m1mba/pkgs.nix
deleted file mode 100644
index f7ac5f4..0000000
--- a/hosts/mac/m1mba/pkgs.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ pkgs, ...}:
-
-{
-# custom
-#  y.kmonad.enable = true;
- environment.systemPackages = with pkgs; [
-     # dont work on mac
-     #nethogs
-     #networking
-     # images
-     #sxiv
-     # audio debug
-     #alsa-firmware
-     # wine
-     #wineWowPackages.staging
-     #wineWowPackages.waylandFull
-     #appimage-run
-     # disk automount
-     #udiskie
-     #ghostty
-     # /mac
-     minio
-     minio-client
-     curlFull
-     wget
-     deluge
-     autossh
-     sshfs
-     #
-     htop
-     rlwrap
-     bat
-     gitAndTools.gitFull
-     lazygit
-     git-lfs
-     lsd
-     lsof
-     tmux
-     tmate
-     curlFull
-     ripgrep
-     ranger
-     minio
-     minio-client
-     zip
-     unzip
-     jq
-     vifm
-     nnn
-     fzf
-     killall
-     tree
-     qrcp
-     deluge
-     ncdu
-     edir
-     bottom
-     pigz
-     rclone
-     # direnv
-     direnv
-     nix-direnv
-     # nix lsp
-     nil
-     alejandra
-     # markdown lsp
-     marksman
-     #crypto
-     electrum
-     # mac only
-     # custom
-     #pkgs.overlays.yabai
-     # terminals
-     alacritty
-     # files
-     ranger
-     zip
-     unzip
-     # direnv
-     direnv
-     nix-direnv
-     # code
-     superhtml
-     nodejs
-     node2nix
-     zig
-     gcc
-     gnumake
-  ];
-}
-
diff --git a/hosts/mac/mac.nix b/hosts/mac/mac.nix
index 2e55b01..651e2e4 100644
--- a/hosts/mac/mac.nix
+++ b/hosts/mac/mac.nix
@@ -1,5 +1,11 @@
-{ self, pkgs, ... }:
+{ pkgs, ... }:
 {
+# custom
+#  y.kmonad.enable = true;
+  environment.systemPackages = with pkgs;[
+    alacritty
+    #overlays.yabai
+  ];
   fonts.packages = with pkgs; [
     recursive
     pkgs.nerd-fonts.droid-sans-mono
diff --git a/hosts/pkgs.nix b/hosts/pkgs.nix
index a636215..2f55c40 100644
--- a/hosts/pkgs.nix
+++ b/hosts/pkgs.nix
@@ -1,86 +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
-    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
   ];
 }