Merge branch 'main' of https://git.thomasfamily.duckdns.org/michael/nix-dots into main

nixpkgs/config.nix

@@ -0,0 +1 @@
+/Users/administrator/Projects/nix-dots/nixpkgs/machines/mac/config.nix

nixpkgs/home.nix

@@ -0,0 +1 @@
+/Users/administrator/Projects/nix-dots/nixpkgs/machines/mac/home.nix

nixpkgs/install.sh

@@ -1,4 +1,4 @@
-# Where first arg is directory under machines, can be one of macos, fedora, nixos
+# Where first arg is directory under machines
 mkdir -p $HOME/.config
 ln -s $(pwd) $HOME/.config/nixpkgs 
 ln -s $(pwd)/machines/$1/home.nix $HOME/.config/nixpkgs/home.nix

nixpkgs/machines/mac/config.nix

@@ -0,0 +1,3 @@
+{
+  allowUnfree = true;
+}

nixpkgs/machines/mac/home.nix

@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+{
+  imports = [
+    ../../modules/home-manager.nix
+    ../../modules/zsh.nix
+    ../../modules/dev.nix
+    ../../modules/fonts.nix
+  ];
+
+  home.packages = with pkgs; [
+  	neofetch
+  ];
+}

nixpkgs/machines/wsl/config.nix

@@ -0,0 +1,3 @@
+{
+  allowUnfree = true;
+}

nixpkgs/machines/wsl/home.nix

@@ -0,0 +1,20 @@
+{ config, pkgs, ... }:
+
+{
+  imports = [
+    ../../modules/home-manager.nix
+    ../../modules/git.nix
+    ../../modules/zsh.nix
+  ];
+
+  home.packages = with pkgs; [
+  	neofetch
+    pfetch
+  	fortune
+  ];
+
+  programs.zsh.shellAliases = {
+  	code = "/mnt/c/Program\\ Files/Microsoft\\ VS\\ Code/Code.exe";
+  };
+  
+}

nixpkgs/modules/dev.nix

@@ -1,6 +1,6 @@
 { config, pkgs, libs, ... }:
 {
   home.packages = with pkgs; [
-    docker-compose
+    nodePackages.yarn
   ];
 }

nixpkgs/modules/zsh.nix

@@ -40,8 +40,8 @@
       enable = true;
       enableZshIntegration = true;
       settings = {
-      character.symbol = "➜";
+        character.symbol = "➜ ";
-      character.success_symbol = "[➜](bold green)";
+        character.success_symbol = "[➜](green)";
-    };
+      };
   };
 }