From e618f64cf53cb266db407ca1708d8e11018a8b78 Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Fri, 17 Mar 2023 10:34:31 +0200
Subject: [PATCH] Tweak configurations

---
 install.conf.yaml | 26 ++++++++++++++++----------
 ssh/config        |  4 ++++
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/install.conf.yaml b/install.conf.yaml
index 47758f5..e76a6ce 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -1,13 +1,12 @@
 ---
 - defaults:
     brew:
-      stderr: false
+      stderr: true
       stdout: true
     brewfile:
       stdout: true
     link:
       create: true
-      relative: true
       relink: true
 
 - clean:
@@ -35,9 +34,11 @@
     ~/.shellcheckrc:
     ~/.vuerc:
     ~/.config/:
-      path: config/
+      glob: true
+      path: config/**
     ~/.local/bin/:
-      path: local/bin/
+      glob: true
+      path: local/bin/**
     ~/.ssh/:
       force: true
       glob: true
@@ -47,13 +48,18 @@
       force: true
       path: zshrc
 
+- shell: [git submodule update --init --recursive, Installing submodules]
+
 - if:
   - cond: "[ $(uname) = Darwin ]"
     met:
-      - brewfile:
-        - Brewfile
+      - shell:
+        - echo "Darwin system"
+        - [brew bundle install --file="Brewfile", Installing Brewfile contents]
   - cond: "[[ $(hostname) = v ]]"
     met:
+      - shell:
+        - echo "host is v"
       - link:
         ~/.config/*:
           force: true
@@ -64,6 +70,8 @@
         - github.com/skx/sysbox@latest
   - cond: "[[ $(hostname) = lakka ]]"
     met:
+      - shell:
+        - echo "host is lakka"
       - link:
         ~/.irssi/*:
           force: true
@@ -75,7 +83,8 @@
   - cond: "command -v npm"
     met:
       - shell:
-        - bash "$HOME/.dotfiles/scripts/install-npm-packages.sh"
+        - echo "we have npm"
+        - ["$HOME/.dotfiles/scripts/install-npm-packages.sh", Installing npm packages]
 
 # GitHub CLI Extensions
 - ghe:
@@ -85,7 +94,6 @@
   - davidraviv/gh-clean-branches
   - dlvhdr/gh-dash
   - einride/gh-dependabot
-  - heaths/gh-label
   - hectcastro/gh-metrics
   - matt-bartel/gh-clone-org
   - rsese/gh-actions-status
@@ -94,5 +102,3 @@
   - VildMedPap/gh-orgstats
   - vilmibm/gh-screensaver
   - vilmibm/gh-user-status
-
-- shell: [git submodule update --init --recursive]
diff --git a/ssh/config b/ssh/config
index 75e5668..44425ee 100644
--- a/ssh/config
+++ b/ssh/config
@@ -1,14 +1,18 @@
 Host github.com
  User git
  HostName github.com
+ IdentityAgent none
+ IdentitiesOnly yes
  IdentityFile ~/.ssh/id_rsa
 
 Host bitbucket.com
  Hostname bitbucket.com
+ IdentitiesOnly yes
  IdentityFile ~/.ssh/id_rsa
 
 Host gitlab.com
  Hostname gitlab.com
+ IdentitiesOnly yes
  IdentityFile ~/.ssh/id_rsa
 
 Host *