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

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

5 files changed, 28 insertions, 94 deletions

diff --git a/hosts/mac/m1mba/configuration.nix b/hosts/mac/m1mba/configuration.nix
index 373f781..ed64688 100644
--- a/hosts/mac/m1mba/configuration.nix
+++ b/hosts/mac/m1mba/configuration.nix
@@ -1,18 +1,11 @@
 {...}: {
   imports = [
     ../../base.nix
+    ../../users.nix
+    ../../editors.nix
+    ../../pkgs.nix
     ../mac.nix
-    ./users.nix
-    ./pkgs.nix
+    
   ];
 
-  # Auto upgrade nix package and the daemon service.
-  services.nix-daemon.enable = true;
-  # nix.package = pkgs.nix;
-  # Used for backwards compatibility, please read the changelog before changing.
-  # $ darwin-rebuild changelog
-  system.stateVersion = 4;
-
-  # The platform the configuration will be used on.
-  nixpkgs.hostPlatform = "aarch64-darwin";
 }
diff --git a/hosts/mac/m1mba/default.nix b/hosts/mac/m1mba/default.nix
new file mode 100644
index 0000000..3370bb0
--- /dev/null
+++ b/hosts/mac/m1mba/default.nix
@@ -0,0 +1,4 @@
+inputs: [
+  #inputs.kmonad.nixosModules.default
+  ./configuration.nix
+]
diff --git a/hosts/mac/m1mba/mac.nix b/hosts/mac/m1mba/mac.nix
deleted file mode 100644
index dba3035..0000000
--- a/hosts/mac/m1mba/mac.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  fonts.fontDir.enable = true;
-  fonts.fonts = with pkgs; [
-    recursive
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
-  ];
-  system.keyboard = {
-    enableKeyMapping = true;
-    remapCapsLockToEscape = true;
-  };
-}
diff --git a/hosts/mac/m1mba/pkgs.nix b/hosts/mac/m1mba/pkgs.nix
deleted file mode 100644
index dffcd66..0000000
--- a/hosts/mac/m1mba/pkgs.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ pkgs, kmonad, unstablePkgs, ...}:
-
-{
-# custom
-#  y.kmonad.enable = true;
- environment.systemPackages = with unstablePkgs; [
-     # custom
-     pkgs.overlays.yabai
-     #unfree
-#     slack
-#     spotify
-#     corefonts
-#     symbola
-     #gui
-     alacritty
-     vscodium
-     tdesktop
-     # terminal
-     #     
-     vim
-     neovim
-     helix
-     # ---
-     wget
-     htop
-     bat
-     gitAndTools.gitFull
-     lazygit
-     git-lfs
-     lsd
-     lsof
-     tmux
-     tmate
-     curlFull
-     ripgrep
-     ranger
-     minio
-     minio-client
-     zip
-     unzip
-     jq
-     vifm
-     nnn
-     # neovim asks for a c compiler just to run nvim-treesitter commands. let's see
-     fzf
-     killall
-     tree
-     deluge
-     ncdu
-     edir
-     bottom
-     pigz
-     rclone
-     # direnv
-     direnv
-     nix-direnv
-     # scraping
-     python310Packages.yt-dlp
-     # code
-     nodejs
-     node2nix
-     zig
-     gcc
-     gnumake
-     sqlite
-  ];
-}
-
diff --git a/hosts/mac/mac.nix b/hosts/mac/mac.nix
index dba3035..651e2e4 100644
--- a/hosts/mac/mac.nix
+++ b/hosts/mac/mac.nix
@@ -1,12 +1,29 @@
 { pkgs, ... }:
 {
-  fonts.fontDir.enable = true;
-  fonts.fonts = with pkgs; [
+# custom
+#  y.kmonad.enable = true;
+  environment.systemPackages = with pkgs;[
+    alacritty
+    #overlays.yabai
+  ];
+  fonts.packages = with pkgs; [
     recursive
-    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+    pkgs.nerd-fonts.droid-sans-mono
+ #   (pkgs.nerd-fonts.override { fonts = [ "JetBrainsMono" ]; })
   ];
+  #system.configurationRevision = self.rev or self.dirtyRev or null;
   system.keyboard = {
     enableKeyMapping = true;
     remapCapsLockToEscape = true;
   };
+  #pkgs = import nixpkgs {
+  #  overlays = builtins.attrValues self.overlays;
+  #  system = "aarch64-darwin";
+  #};
+  nixpkgs.hostPlatform = "aarch64-darwin";
+  system.stateVersion = 6;
+  ids.gids.nixbld = 30000;
+  #services.nix-daemon.enable = true;
+
+  
 }