From d7d155178c8975a33fc5896f428ef1f040a77c01 Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Tue, 30 Apr 2024 08:49:51 +0100
Subject: [PATCH] Miscellany

---
 .bash_aliases                | 3 +++
 .bashrc                      | 2 +-
 .config/git/config           | 4 ++--
 .config/hypr/hyprland.conf   | 3 ++-
 .config/nvim/lua/options.lua | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/.bash_aliases b/.bash_aliases
index 965db63..f2fa742 100644
--- a/.bash_aliases
+++ b/.bash_aliases
@@ -16,3 +16,6 @@ CFLAGS="-Wall -Werror -Wextra"
 alias cc="gcc ${CFLAGS}"
 alias update_ruby_build="git -C "$(rbenv root)"/plugins/ruby-build pull"
 alias irc="ssh kernighan -t tmux attach -t irc"
+alias krc="kamal app exec -i --reuse 'bin/rails c'"
+alias krd="kamal app exec -i --reuse 'bin/rails dbconsole'"
+alias krb="kamal app exec -i --reuse 'bash'"
diff --git a/.bashrc b/.bashrc
index dd1578f..ef7378e 100644
--- a/.bashrc
+++ b/.bashrc
@@ -104,6 +104,6 @@ if ! shopt -oq posix; then
   fi
 fi
 
-eval "$(rbenv init - bash)"
+eval "$(~/.rbenv/bin/rbenv init - bash)"
 
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
diff --git a/.config/git/config b/.config/git/config
index ed581b9..5a9e306 100644
--- a/.config/git/config
+++ b/.config/git/config
@@ -19,8 +19,8 @@
         br = branch
         cb = clone --bare
         cp = cherry-pick
-        # Show all commits on the current branch but not develop
-        curr = "!git log --no-merges \"$(git rev-parse --abbrev-ref HEAD)\" ^develop"
+        # Show all commits on the current branch but not main
+        curr = "!git log --no-merges \"$(git rev-parse --abbrev-ref HEAD)\" ^main"
         co = checkout
         cm = commit
         cma = commit --amend
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 7d7cd9c..47c0efb 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -4,7 +4,8 @@ windowrule = workspace 1, alacritty
 windowrule = workspace 2, firefox
 windowrule = workspace 2, qutebrowser
 windowrule = workspace 2, ^(.*)(Chrom)(.*)$
-windowrule = workspace 2, thunderbird
+windowrule = workspace 3, thunderbird
+windowrule = workspace 3, "flatpak run com.spotify.Client"
 
 exec-once = eww daemon && eww open bar
 exec-once = qutebrowser
diff --git a/.config/nvim/lua/options.lua b/.config/nvim/lua/options.lua
index 3430b58..06e42fe 100644
--- a/.config/nvim/lua/options.lua
+++ b/.config/nvim/lua/options.lua
@@ -8,6 +8,7 @@ set.number = true
 set.relativenumber = true
 set.cursorline = true
 set.termguicolors = true
+set.grepprg = 'rg --vimgrep --smart-case'
 
 -- Improve terminal setup
 vim.api.nvim_command("autocmd TermOpen * startinsert")