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

nixpkgs/machines/loft/home.nix

@@ -5,6 +5,7 @@
     ../../modules/home-manager.nix
     ../../modules/fonts.nix
     ../../modules/git.nix
+    ../../modules/git_nixos.nix
     ../../modules/gnome.nix
     ../../modules/vscode.nix
     ../../modules/zsh.nix

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/git.nix

@@ -7,11 +7,7 @@
   # Use pkgs.gitAndTools.gitFull in order to get libsecret support
   programs.git = {
     enable = true;
-    package = pkgs.gitAndTools.gitFull;
     userEmail = "michaelhthomas@outlook.com";
     userName = "Michael Thomas";
-    extraConfig = {
-      credential.helper = "libsecret";
-    };
   };
 }

nixpkgs/modules/git_nixos.nix

@@ -0,0 +1,10 @@
+{ config, pkgs, libs, ... }:
+{
+  # Use pkgs.gitAndTools.gitFull in order to get libsecret support
+  programs.git = {
+    package = pkgs.gitAndTools.gitFull;
+    extraConfig = {
+      credential.helper = "libsecret";
+    };
+  };
+}

nixpkgs/modules/zsh.nix

@@ -2,6 +2,18 @@
 {
   programs.zsh = {
     enable = true;
+    plugins = [
+      {
+        name = "zsh-nix-shell";
+        file = "nix-shell.plugin.zsh";
+        src = pkgs.fetchFromGitHub {
+          owner = "chisui";
+          repo = "zsh-nix-shell";
+          rev = "v0.1.0";
+          sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx";
+        };
+      }
+    ];
     prezto = {
       enable = true;
       pmodules = [