m

3 files changed, 9 insertions, 93 deletions

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