summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore9
-rw-r--r--common/nanorc/nanorc41
-rw-r--r--macos/Brewfile6
-rwxr-xr-x[-rw-r--r--]macos/brew.sh4
4 files changed, 54 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a872b4b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+common/gnupg/.gnupg/pubring.kbx~
+common/gnupg/.gnupg/S.gpg-agent.extra
+common/gnupg/.gnupg/trustdb.gpg
+common/gnupg/.gnupg/private-keys-v1.d
+common/gnupg/.gnupg/S.gpg-agent
+common/gnupg/.gnupg/S.gpg-agent.ssh
+common/gnupg/.gnupg/pubring.kbx
+common/gnupg/.gnupg/S.gpg-agent.browser
+common/gnupg/.gnupg/S.scdaemon
diff --git a/common/nanorc/nanorc b/common/nanorc/nanorc
new file mode 100644
index 0000000..504f2f2
--- /dev/null
+++ b/common/nanorc/nanorc
@@ -0,0 +1,41 @@
+# Settings for `nano` editor
+# Full list of settings might be shown via `man nano`
+# or here: https://www.nano-editor.org/dist/v3/nanorc.5.html
+
+# Influenced by:
+# https://bash-prompt.net/guides/nanorc-settings
+
+# Editor:
+set tabsize 4 # set tab-to-spaces size to 4
+set tabstospaces # convert TAB key press to spaces
+set trimblanks # trim extra spaces
+
+set softwrap # enable softwrap of lines
+set atblanks # wrap line at blanks
+set constantshow
+set nohelp # disable help, CTRL+G to view it
+set autoindent # next line will have the same indent as the current one
+set historylog # save the last 100 history searches for later use
+set positionlog # save the cursor position between editing sessions
+set zap # highlight text (CTRL+SHIFT+ARROW) and delete it with backspace
+set cutfromcursor # cut to end of line with CTRL+K
+set indicator # display a scroll bar on the right
+set minibar # information in the bottom bar, removes top bar
+
+# Extra files:
+set backup
+set backupdir "~/.nano-backups"
+set historylog
+
+# line numbers are copied with text, it is not useful:
+# set linenumbers
+
+# Syntax highlight:
+include /opt/homebrew/opt/nano/share/nano/*.nanorc
+
+# Hotkeys:
+# Full list: https://www.nano-editor.org/dist/latest/cheatsheet.html
+
+unbind ^w main
+bind ^f whereis main
+bind ^z undo main
diff --git a/macos/Brewfile b/macos/Brewfile
index a4a680a..2e25098 100644
--- a/macos/Brewfile
+++ b/macos/Brewfile
@@ -1,6 +1,4 @@
# Taps
-tap "homebrew/bundle"
-tap "homebrew/services"
tap "koekeishiya/formulae"
# Formulae
@@ -12,8 +10,8 @@ brew "ripgrep"
brew "fzf"
brew "bat"
brew "fd"
-brew "yabai"
-brew "skhd"
+brew "koekeishiya/formulae/yabai"
+brew "koekeishiya/formulae/skhd"
brew "ispell"
brew "zsh-autosuggestions"
brew "zsh-syntax-highlighting"
diff --git a/macos/brew.sh b/macos/brew.sh
index ae8c5f7..1c88b04 100644..100755
--- a/macos/brew.sh
+++ b/macos/brew.sh
@@ -17,7 +17,7 @@ brew bundle --file="$MACOS_DIR/Brewfile"
# Restart services to ensure they pick up any stowed config changes
echo "♻️ Restarting services..."
-brew services restart yabai
-brew services restart skhd
+brew services restart koekeishiya/formulae/yabai
+brew services restart koekeishiya/formulae/skhd
echo "✅ macOS environment synced."