chore: update aerospace, git, colima configs and gitmodules
This commit is contained in:
Jeremie Fraeys
parent
4bdd64898c
commit
d11008d421
4 changed files with 26 additions and 38 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
|
@ -1,6 +1,6 @@
|
|||
[submodule "nvim/.config/nvim"]
|
||||
path = nvim/.config/nvim
|
||||
url = https://github.com/jfraeys/kickstart.nvim.git
|
||||
url = https://git.jfraeys.com/jfraeysd/nvim.git
|
||||
[submodule "wezterm/.config/wezterm/sessionizer"]
|
||||
path = wezterm/.config/wezterm/sessionizer
|
||||
url = https://github.com/jfraeys/sessionizer.git
|
||||
path = wezterm/.config/wezterm/plugins/sessionizer
|
||||
url = https://git.jfraeys.com/jfraeysd/sessionizer.git
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ after-login-command = []
|
|||
# 'after-startup-command' is run after 'after-login-command'
|
||||
# Available commands : https://nikitabobko.github.io/AeroSpace/commands
|
||||
# after-startup-command = ['exec-and-forget sketchybar']
|
||||
# after-startup-command = [
|
||||
# 'exec-and-forget borders active_color=0xffe6e8eb inactive_color=0xff3a3f4b width=5.0',
|
||||
# ]
|
||||
after-startup-command = [
|
||||
'exec-and-forget borders active_color=0xff268BD2 inactive_color=0xff93A1A1 width=5.0',
|
||||
]
|
||||
# Start AeroSpace at login
|
||||
start-at-login = true
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ enable-normalization-opposite-orientation-for-nested-containers = true
|
|||
accordion-padding = 0
|
||||
|
||||
# Possible values: tiles|accordion
|
||||
default-root-container-layout = 'tiles'
|
||||
default-root-container-layout = 'accordion'
|
||||
|
||||
# Possible values: horizontal|vertical|auto
|
||||
# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation,
|
||||
|
|
@ -105,6 +105,8 @@ inner.vertical = 3
|
|||
# activate
|
||||
# end tell'
|
||||
# '''
|
||||
alt-enter = "exec-and-forget wezterm cli spawn"
|
||||
|
||||
|
||||
cmd-h = [] # Disable "hide application"
|
||||
cmd-alt-h = [] # Disable "hide others"
|
||||
|
|
@ -216,8 +218,7 @@ X = ['secondary', 'dell']
|
|||
Y = ['secondary', 'dell']
|
||||
Z = ['secondary', 'dell']
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'com.apple.iCal'
|
||||
|
||||
run = "move-node-to-workspace C"
|
||||
|
||||
[[on-window-detected]]
|
||||
|
|
@ -226,19 +227,23 @@ run = "move-node-to-workspace D"
|
|||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'com.apple.finder'
|
||||
run = "move-node-to-workspace E"
|
||||
run = ["layout tiling", "move-node-to-workspace E"]
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'app.zen-browser.zen'
|
||||
run = "move-node-to-workspace G"
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'org.mozilla.firefox'
|
||||
run = "move-node-to-workspace G"
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'com.apple.MobileSMS'
|
||||
run = "move-node-to-workspace N"
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'com.apple.mail'
|
||||
run = "move-node-to-workspace M"
|
||||
run = ["layout tiling", "move-node-to-workspace M"]
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'md.obsidian'
|
||||
|
|
@ -256,6 +261,10 @@ run = "move-node-to-workspace T"
|
|||
if.app-id = 'com.vscodium'
|
||||
run = "move-node-to-workspace V"
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'com.exafunction.windsurf'
|
||||
run = "move-node-to-workspace V"
|
||||
|
||||
[[on-window-detected]]
|
||||
if.app-id = 'com.apple.Safari'
|
||||
run = "move-node-to-workspace X"
|
||||
|
|
|
|||
|
|
@ -1,64 +1,54 @@
|
|||
---
|
||||
# Number of CPUs to be allocated to the virtual machine.
|
||||
# Default: 2
|
||||
cpu: 2
|
||||
|
||||
# Size of the disk in GiB to be allocated to the virtual machine.
|
||||
# NOTE: value can only be increased after virtual machine has been created.
|
||||
#
|
||||
# Default: 100
|
||||
disk: 100
|
||||
|
||||
# Size of the memory in GiB to be allocated to the virtual machine.
|
||||
# Default: 2
|
||||
memory: 2
|
||||
|
||||
# Architecture of the virtual machine (x86_64, aarch64, host).
|
||||
#
|
||||
# NOTE: value cannot be changed after virtual machine is created.
|
||||
# Default: host
|
||||
arch: aarch64
|
||||
|
||||
# Container runtime to be used (docker, containerd).
|
||||
#
|
||||
# NOTE: value cannot be changed after virtual machine is created.
|
||||
# Default: docker
|
||||
runtime: docker
|
||||
|
||||
# Set custom hostname for the virtual machine.
|
||||
# Default: colima
|
||||
# colima-profile_name for other profiles
|
||||
hostname: colima
|
||||
|
||||
# Kubernetes configuration for the virtual machine.
|
||||
kubernetes:
|
||||
# Enable kubernetes.
|
||||
# Default: false
|
||||
enabled: false
|
||||
|
||||
# Kubernetes version to use.
|
||||
# This needs to exactly match a k3s version https://github.com/k3s-io/k3s/releases
|
||||
# Default: latest stable release
|
||||
version: v1.31.2+k3s1
|
||||
|
||||
# Additional args to pass to k3s https://docs.k3s.io/cli/server
|
||||
# Default: traefik is disabled
|
||||
k3sArgs:
|
||||
- --disable=traefik
|
||||
|
||||
# Auto-activate on the Host for client access.
|
||||
# Setting to true does the following on startup
|
||||
# - sets as active Docker context (for Docker runtime).
|
||||
# - sets as active Kubernetes context (if Kubernetes is enabled).
|
||||
# Default: true
|
||||
autoActivate: true
|
||||
|
||||
# Network configurations for the virtual machine.
|
||||
network:
|
||||
# Assign reachable IP address to the virtual machine.
|
||||
# NOTE: this is currently macOS only and ignored on Linux.
|
||||
# Default: false
|
||||
address: false
|
||||
|
||||
# Custom DNS resolvers for the virtual machine.
|
||||
#
|
||||
# EXAMPLE
|
||||
|
|
@ -66,7 +56,6 @@ network:
|
|||
#
|
||||
# Default: []
|
||||
dns: []
|
||||
|
||||
# DNS hostnames to resolve to custom targets using the internal resolver.
|
||||
# This setting has no effect if a custom DNS resolver list is supplied above.
|
||||
# It does not configure the /etc/hosts files of any machine or container.
|
||||
|
|
@ -76,7 +65,6 @@ network:
|
|||
# dnsHosts:
|
||||
# example.com: 1.2.3.4
|
||||
dnsHosts: {}
|
||||
|
||||
# Replicate host IP addresses in the VM. This enables port forwarding to specific
|
||||
# host IP addresses.
|
||||
# e.g. `docker run --port 10.0.1.2:8080:8080 alpine` would only forward to the
|
||||
|
|
@ -84,7 +72,6 @@ network:
|
|||
#
|
||||
# Default: false
|
||||
hostAddresses: false
|
||||
|
||||
# ===================================================================== #
|
||||
# ADVANCED CONFIGURATION
|
||||
# ===================================================================== #
|
||||
|
|
@ -92,7 +79,6 @@ network:
|
|||
# Forward the host's SSH agent to the virtual machine.
|
||||
# Default: false
|
||||
forwardAgent: false
|
||||
|
||||
# Docker daemon configuration that maps directly to daemon.json.
|
||||
# https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file.
|
||||
# NOTE: some settings may affect Colima's ability to start docker. e.g. `hosts`.
|
||||
|
|
@ -111,7 +97,6 @@ forwardAgent: false
|
|||
# Colima default behaviour: buildkit enabled
|
||||
# Default: {}
|
||||
docker: {}
|
||||
|
||||
# Virtual Machine type (qemu, vz)
|
||||
# NOTE: this is macOS 13 only. For Linux and macOS <13.0, qemu is always used.
|
||||
#
|
||||
|
|
@ -120,15 +105,12 @@ docker: {}
|
|||
# NOTE: value cannot be changed after virtual machine is created.
|
||||
# Default: qemu
|
||||
vmType: vz
|
||||
|
||||
# Utilise rosetta for amd64 emulation (requires m1 mac and vmType `vz`)
|
||||
# Default: false
|
||||
rosetta: false
|
||||
|
||||
# Enable nested virtualization for the virtual machine (requires m3 mac and vmType `vz`)
|
||||
# Default: false
|
||||
nestedVirtualization: false
|
||||
|
||||
# Volume mount driver for the virtual machine (virtiofs, 9p, sshfs).
|
||||
#
|
||||
# virtiofs is limited to macOS and vmType `vz`. It is the fastest of the options.
|
||||
|
|
@ -141,17 +123,14 @@ nestedVirtualization: false
|
|||
# NOTE: value cannot be changed after virtual machine is created.
|
||||
# Default: virtiofs (for vz), sshfs (for qemu)
|
||||
mountType: sshfs
|
||||
|
||||
# Propagate inotify file events to the VM.
|
||||
# NOTE: this is experimental.
|
||||
mountInotify: true
|
||||
|
||||
# The CPU type for the virtual machine (requires vmType `qemu`).
|
||||
# Options available for host emulation can be checked with: `qemu-system-$(arch) -cpu help`.
|
||||
# Instructions are also supported by appending to the cpu type e.g. "qemu64,+ssse3".
|
||||
# Default: host
|
||||
cpuType: ""
|
||||
|
||||
# Custom provision scripts for the virtual machine.
|
||||
# Provisioning scripts are executed on startup and therefore needs to be idempotent.
|
||||
#
|
||||
|
|
@ -170,18 +149,15 @@ cpuType: ""
|
|||
#
|
||||
# Default: []
|
||||
provision: []
|
||||
|
||||
# Modify ~/.ssh/config automatically to include a SSH config for the virtual machine.
|
||||
# SSH config will still be generated in $COLIMA_HOME/ssh_config regardless.
|
||||
# Default: true
|
||||
sshConfig: true
|
||||
|
||||
# The port number for the SSH server for the virtual machine.
|
||||
# When set to 0, a random available port is used.
|
||||
#
|
||||
# Default: 0
|
||||
sshPort: 0
|
||||
|
||||
# Configure volume mounts for the virtual machine.
|
||||
# Colima mounts user's home directory by default to provide a familiar
|
||||
# user experience.
|
||||
|
|
@ -196,7 +172,6 @@ sshPort: 0
|
|||
# Colima default behaviour: $HOME and /tmp/colima are mounted as writable.
|
||||
# Default: []
|
||||
mounts: []
|
||||
|
||||
# Specify a custom disk image for the virtual machine.
|
||||
# When not specified, Colima downloads an appropriate disk image from Github at
|
||||
# https://github.com/abiosoft/colima-core/releases.
|
||||
|
|
@ -204,7 +179,6 @@ mounts: []
|
|||
#
|
||||
# Default: ""
|
||||
diskImage: ""
|
||||
|
||||
# Environment variables for the virtual machine.
|
||||
#
|
||||
# EXAMPLE
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
# Please adapt and uncomment the following lines:
|
||||
name = Jeremie Fraeys
|
||||
email = jfaeys@gmail.com
|
||||
signingKey = /Users/jfraeys/.ssh/id_ed25519.pub
|
||||
[credential]
|
||||
helper = osxkeychain
|
||||
[init]
|
||||
|
|
@ -32,3 +33,7 @@
|
|||
[url "git@github.com:jfraeys/"]
|
||||
insteadOf = "cj:"
|
||||
|
||||
[gpg]
|
||||
format = ssh
|
||||
[commit]
|
||||
gpgSign = true
|
||||
|
|
|
|||
Loading…
Reference in a new issue