Compare commits

..

11 Commits

Author SHA1 Message Date
Andrew Williams
c85ccc3d6f [aerospace] Fix RDC window location 2026-01-29 13:51:41 +00:00
213d5a306b [aerospace] Remove alt+tab 2026-01-27 23:07:47 +00:00
Andrew Williams
678a487ef8 [aerospace] Update config 2026-01-20 15:16:17 +00:00
Andrew Williams
e0cfc2654c [aerospace] Update config 2026-01-20 13:54:21 +00:00
12590e3547 [aerospace] Update config for RDP app 2026-01-17 22:08:17 +00:00
a57503f372 Update README 2026-01-17 15:57:22 +00:00
c88d401471 [shell-common] Add shellcheck lines for all shell files 2026-01-17 15:21:32 +00:00
a4d55ff664 [starship] Remove time prompt 2026-01-17 15:18:53 +00:00
53be68450e [zed] Update config 2026-01-17 15:18:38 +00:00
Andrew Williams
8c013bb66c [macos] Update themeing 2026-01-15 16:53:43 +00:00
Andrew Williams
cbc7e5fe81 [zed] Adjust settings 2026-01-15 12:23:46 +00:00
19 changed files with 77 additions and 13 deletions

View File

@@ -1,11 +1,20 @@
## Dotfiles # .dotfiles
A collection of dotfiles used by [nikdoof](https://github.com/nikdoof) A collection of dotfiles used by [nikdoof](https://github.com/nikdoof)
## Linux / macOS ## Used Tools
* [Aerospace](https://nikitabobko.github.io/AeroSpace/guide)
* [Jankyborders](https://github.com/FelixKratz/JankyBorders)
* [Ghostty](https://ghostty.org)
* [Starship](https://starship.rs)
* [Zed](https://zed.dev)
## Installation
### Linux / macOS
Installation is handled by `stowage`. 'Github' SSH key from private dotfiles required to run successfully. Installation is handled by `stowage`. 'Github' SSH key from private dotfiles required to run successfully.
``` ```shell-session
curl https://raw.githubusercontent.com/nikdoof/dotfiles/main/bootstrap.sh | bash curl https://raw.githubusercontent.com/nikdoof/dotfiles/main/bootstrap.sh | bash
``` ```

View File

@@ -194,12 +194,7 @@ on-mode-changed = []
alt-shift-y = 'move-node-to-workspace Y' alt-shift-y = 'move-node-to-workspace Y'
alt-shift-z = 'move-node-to-workspace Z' alt-shift-z = 'move-node-to-workspace Z'
# See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth
alt-tab = 'workspace-back-and-forth'
# See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor
alt-shift-tab = 'move-workspace-to-monitor --wrap-around next' alt-shift-tab = 'move-workspace-to-monitor --wrap-around next'
# See: https://nikitabobko.github.io/AeroSpace/commands#mode
alt-shift-semicolon = 'mode service' alt-shift-semicolon = 'mode service'
# 'service' binding mode declaration. # 'service' binding mode declaration.
@@ -240,7 +235,7 @@ run = 'move-node-to-workspace B'
# VSCode windows to workspace C # VSCode windows to workspace C
[[on-window-detected]] [[on-window-detected]]
if.app-id = 'com.microsoft.VSCode' if.app-id = 'com.microsoft.VSCode'
run = 'move-node-to-workspace C' run = ['move-node-to-workspace C', 'layout v_accordion']
# Zed settings windows float # Zed settings windows float
[[on-window-detected]] [[on-window-detected]]
@@ -252,7 +247,7 @@ check-further-callbacks = false
# Zed windows to workspace C # Zed windows to workspace C
[[on-window-detected]] [[on-window-detected]]
if.app-id = 'dev.zed.Zed' if.app-id = 'dev.zed.Zed'
run = 'move-node-to-workspace C' run = ['move-node-to-workspace C', 'layout v_accordion']
# Ghostty terminal windows to workspace T # Ghostty terminal windows to workspace T
[[on-window-detected]] [[on-window-detected]]
@@ -262,12 +257,12 @@ run = 'move-node-to-workspace T'
# Finder windows float # Finder windows float
[[on-window-detected]] [[on-window-detected]]
if.app-id = 'com.apple.finder' if.app-id = 'com.apple.finder'
run = ['layout floating'] run = ['move-node-to-workspace F']
# Telegram windows float # Telegram windows float
[[on-window-detected]] [[on-window-detected]]
if.app-name-regex-substring = 'telegram' if.app-name-regex-substring = 'telegram'
run = 'layout floating' run = ['move-node-to-workspace S', 'layout v_accordion']
# Activity Monitor windows float # Activity Monitor windows float
[[on-window-detected]] [[on-window-detected]]
@@ -316,3 +311,15 @@ run = 'layout floating'
[[on-window-detected]] [[on-window-detected]]
if.app-id = 'com.coconut-flavour.coconutBattery' if.app-id = 'com.coconut-flavour.coconutBattery'
run = 'layout floating' run = 'layout floating'
# Float the main window of Windows App
[[on-window-detected]]
if.app-id = 'com.microsoft.rdc.macos'
if.window-title-regex-substring = 'Devices'
run = ['move-node-to-workspace R', 'layout floating']
check-further-callbacks = false
# Accordian the connection windows
[[on-window-detected]]
if.app-id = 'com.microsoft.rdc.macos'
run = ['move-node-to-workspace R', 'layout v_accordion']

View File

@@ -1,3 +1,4 @@
# shellcheck shell=bash
# History # History
mkdir -p "${XDG_STATE_HOME}"/bash mkdir -p "${XDG_STATE_HOME}"/bash
export HISTFILE="${XDG_STATE_HOME}"/bash/history export HISTFILE="${XDG_STATE_HOME}"/bash/history

View File

@@ -1,2 +1,3 @@
# shellcheck shell=bash
# SSH completion based on ssh config # SSH completion based on ssh config
[ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config* | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh [ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config* | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh

View File

@@ -7,6 +7,7 @@ window-save-state = never
window-new-tab-position = end window-new-tab-position = end
theme = Nord theme = Nord
font-family = JetBrainsMono Nerd Font font-family = JetBrainsMono Nerd Font
background-opacity = 0.95
# Handled via Brew # Handled via Brew
auto-update = off auto-update = off

View File

@@ -51,6 +51,7 @@ brew "starship"
brew "terraform-docs" brew "terraform-docs"
brew "terraform-local" brew "terraform-local"
brew "tflint" brew "tflint"
brew "tlrc"
brew "tz" brew "tz"
brew "uv" brew "uv"
brew "yazi" brew "yazi"

View File

@@ -0,0 +1,16 @@
# Set themes for various CLI apps to match our terminal settings
# Theme flavour of the month: Nord
# Bat
if [ -x "$(command -v bat)" ]; then
export BAT_THEME="Nord"
fi
# Fzf
if [ -x "$(command -v bat)" ]; then
export FZF_DEFAULT_OPTS='
--color=fg:#e5e9f0,bg:#2E3440,hl:#81a1c1
--color=fg+:#e5e9f0,bg+:#2E3440,hl+:#81a1c1
--color=info:#eacb8a,prompt:#bf6069,pointer:#b48dac
--color=marker:#a3be8b,spinner:#b48dac,header:#a3be8b'
fi

View File

@@ -138,5 +138,5 @@ f() {
# Search for a file using macOS Spotlight # Search for a file using macOS Spotlight
# https://natelandau.com/my-mac-os-zsh-profile/ # https://natelandau.com/my-mac-os-zsh-profile/
spotlight() { spotlight() {
mdfind "kMDItemDisplayName == '${1}'wc" mdfind "kMDItemDisplayName == '${1}'wc" | fzf --preview 'fzf-preview.sh {}' --height 40%
} }

View File

@@ -1,3 +1,4 @@
# shellcheck shell=bash
# Override application locations to fix XDG # Override application locations to fix XDG
export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible export ANSIBLE_HOME="$XDG_DATA_HOME"/ansible
export LESSHISTFILE="$XDG_STATE_HOME"/less/history export LESSHISTFILE="$XDG_STATE_HOME"/less/history

View File

@@ -1,4 +1,5 @@
# shellcheck shell=bash # shellcheck shell=bash
# AWS functions
# Get the list of AWS profiles # Get the list of AWS profiles
function awsprofiles() { function awsprofiles() {

View File

@@ -1,4 +1,6 @@
# shellcheck shell=bash
# Go stuff # Go stuff
export GOPATH=$XDG_DATA_HOME/go/ export GOPATH=$XDG_DATA_HOME/go/
export PATH=${GOPATH}bin:$PATH export PATH=${GOPATH}bin:$PATH
if [ -z ${GOROOT+x} ] && [ -d /usr/local/go ]; then if [ -z ${GOROOT+x} ] && [ -d /usr/local/go ]; then

View File

@@ -1,2 +1,4 @@
# shellcheck shell=bash
# Python stuff # Python stuff
export POETRY_VIRTUALENVS_IN_PROJECT=true export POETRY_VIRTUALENVS_IN_PROJECT=true

View File

@@ -1,4 +1,6 @@
# shellcheck shell=bash
# Rust stuff # Rust stuff
if [ -f $HOME/.cargo/env ]; then if [ -f $HOME/.cargo/env ]; then
source $HOME/.cargo/env source $HOME/.cargo/env
fi fi

View File

@@ -150,3 +150,9 @@ read_only_style = "fg:nord0 bold bg:nord9"
success_symbol = "[ »](bold green)" success_symbol = "[ »](bold green)"
error_symbol = "[ »](bold red)" error_symbol = "[ »](bold red)"
vimcmd_symbol = "[  >](bold green)" vimcmd_symbol = "[  >](bold green)"
[time]
disabled = false
format = " [$time]($style) "
style = "bold fg:nord2"
time_format = "%R"

View File

@@ -148,6 +148,8 @@
"project_panel": { "project_panel": {
"entry_spacing": "standard", "entry_spacing": "standard",
"hide_root": false,
"default_width": 400,
}, },
"toolbar": { "toolbar": {
"breadcrumbs": false, "breadcrumbs": false,
@@ -166,4 +168,12 @@
"diagnostics": false, "diagnostics": false,
"metrics": false, "metrics": false,
}, },
"title_bar": {
"show_onboarding_banner": false,
"show_user_picture": false,
"show_branch_icon": true,
},
"file_finder": {
"modal_max_width": "medium",
},
} }

View File

@@ -1,3 +1,4 @@
# shellcheck shell=zsh
# History # History
mkdir -p "${XDG_STATE_HOME}/zsh" mkdir -p "${XDG_STATE_HOME}/zsh"
HISTFILE="${XDG_STATE_HOME}/zsh/history" HISTFILE="${XDG_STATE_HOME}/zsh/history"

View File

@@ -1,3 +1,4 @@
# shellcheck shell=zsh
# Zsh specific aliases # Zsh specific aliases
# Mostly suffix and global aliases # Mostly suffix and global aliases

View File

@@ -1,3 +1,4 @@
# shellcheck shell=zsh
fpath+=($XDG_CONFIG_HOME/zsh/completions) fpath+=($XDG_CONFIG_HOME/zsh/completions)
autoload -Uz compinit autoload -Uz compinit

View File

@@ -1,3 +1,4 @@
# shellcheck shell=zsh
# Source shell common # Source shell common
for f in ~/.config/shell-common/*.sh; do for f in ~/.config/shell-common/*.sh; do
source $f source $f