Merge branch 'master' of github.com:vleeuwenmenno/dotfiles

config/gitconfig

@@ -1,7 +1,9 @@
 [gpg]
 	format = ssh
+
 [gpg "ssh"]
 	program = /opt/1Password/op-ssh-sign
+
 [commit]
 	gpgsign = true
 

home.nix

@@ -1,7 +1,6 @@
-{ config, pkgs, ... }:
-{
+{ config, lib, pkgs, ... }:
+{       
   fonts.fontconfig.enable = true;
-
   home = {
     username = "menno";
     homeDirectory = "/home/menno";
@@ -15,6 +14,7 @@
       lsd
       zsh
       zsh-powerlevel10k
+      fzf
     ];
   };
 
@@ -42,6 +42,17 @@
       includes = [ { path = "~/.dotfiles/config/gitconfig"; } ];
     };
 
+    ssh = {
+      enable = true;
+      matchBlocks = {
+        server = {
+          port = 22;
+          hostname =  "192.168.86.254";
+          user = "menno";
+        };
+      };
+    };
+
     zsh = {
       enable = true;
 

setup.sh

@@ -133,6 +133,13 @@ elif [ "$1" == "-c" ] || [ "$1" == "--continue" ]; then
     # Add `exec zsh` to bashrc
     add_exec_zsh
 
+    # If it's WSL
+    if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null; then
+        echo 'WSL detected, adding SSH 1Password symlink...'
+        sudo mkdir /opt/1Password
+        sudo ln -s /mnt/c/Users/menno/AppData/Local/1Password/app/8/op-ssh-sign-wsl /opt/1Password/op-ssh-sign
+    fi
+
     # We're done here!
     echo 'Installation complete! Please restart your shell and enjoy!'
 else