Merge branch 'main' of https://github.com/LarssonMartin1998/.dotfiles

home/.config/alacritty/alacritty.toml

@@ -61,6 +61,7 @@ dynamic_title = true
 startup_mode = "Maximized"
 opacity = 0.95
 blur = true
+option_as_alt = "Both"
 
 [window.dimensions]
 columns = 160

home/.config/nvim/lua/keymaps.lua

@@ -33,7 +33,7 @@ require("utils").add_keymaps({
         },
 
         -- Window
-        ["<C-k>"] = {
+        ["<C-q>"] = {
             cmd = "<C-w>q",
         },
 
@@ -115,7 +115,7 @@ require("utils").add_keymaps({
         },
     },
     t = {
-        ["<C-k>"] = {
+        ["<C-q>"] = {
             cmd = "<C-\\><C-N>",
         },
     },

home/.config/nvim/lua/language_servers/clangd.lua

@@ -31,7 +31,7 @@ local M = {
         "--rename-file-limit=0",
         "--header-insertion=iwyu",
         "--inlay-hints",
-        "--compile-commands-dir=build/",
+        -- "--compile-commands-dir=build/",
     },
     commands = {
         ClangdSwitchSourceHeader = {

home/.config/nvim/lua/plugs/auto_session.lua

@@ -13,5 +13,8 @@ return {
             "~/.config",
             "~/dev/git/.dotfiles",
         },
-    }
+    },
+    init = function()
+        vim.o.sessionoptions = "localoptions"
+    end
 }

home/.config/nvim/lua/plugs/telescope.lua

@@ -66,7 +66,10 @@ return {
         }
         -- Cache the options with the dropdown theme for each picker so we don't
         -- recalculate it every time we open a picker
+        local fzf_sorter = require("telescope.sorters").get_fzy_sorter()
         for _, v in ipairs(pickers) do
+            -- Make sure all custom pickers are set to use the fzf sorter
+            v.picker_opts.sorter = fzf_sorter
             v.picker_opts = vim.tbl_extend("force", dropdown, v.picker_opts)
         end
 

home/.ideavimrc

@@ -7,7 +7,7 @@
 "" -- Suggested options --
 " Show a few lines of context around the cursor. Note that this makes the
 " text scroll if you mouse-click near the start or end of the window.
-set scrolloff=1
+set scrolloff=8
 
 " Make VIM use the system clipboard
 set clipboard+=unnamedplus
@@ -43,7 +43,7 @@ map <leader>ta <Action>(FindInPath)
 
 map <leader>dr <Action>(Debug)
 map <leader>db <Action>(ToggleLineBreakpoint)
-map <leader>s <Action>(Stop)
+map <leader>ds <Action>(Stop)
 
 map gcc <Action>(CommentByLineComment)
 map gcb <Action>(CommentByBlockComment)

home/.tmux.conf

@@ -1,4 +1,4 @@
-# For some reason, fzf is missing from path when running shell scripts through tmux keybindings
+#git clone --depth 1 --recurse-submodules --shallow-submodules git@github.int.midasplayer.com:FarmStudio/FarmHeroesSaga.git For some reason, fzf is missing from path when running shell scripts through tmux keybindings
 set-environment -g PATH "~/dev/git/fzf/bin:$PATH"
 
 # Keybindings for navigating between panes
@@ -28,7 +28,7 @@ bind-key -n M-d run-shell "~/.config/tmux/tmux-fuzzy-find-session.sh"
 # Split window, change keybindings to match vim concept of splits
 bind-key -n M-v split-window -h
 bind-key -n M-h split-window -v
-bind-key -n M-k kill-pane
+bind-key -n M-q kill-pane
 bind-key -n M-f resize-pane -Z
 bind-key -n M-s command-prompt -p "New session: " "run-shell '~/.config/tmux/tmux-create-session.sh '%%''"
 bind-key -n M-w new-window

home/.zshrc

@@ -113,19 +113,19 @@ alias c="clear"
 alias s="source"
 alias sz="source ~/.zshrc"
 alias ls="eza -a --color=always"
-alias ll="eza --long --header -a --color=always --icons --git"
-alias tree="eza --tree --level=2 --color=always --icons --git"
+alias ll="eza --long --header -a --color=always --icons"
+alias tree="eza --tree --level=2 --color=always --icons"
 alias lg="lazygit"
 alias neofetch="fastfetch"
 alias cat="bat"
 alias fzf='fzf --preview "bat --color=always --style=numbers --line-range=:500 {}"'
 # wl-copy and wl-paste doesn't exist on mac, and mac has pbcopy and pbpaste
-if  [[ "$(uname)" != "Darwin" ]]; then
-    alias wlc="wl-copy"
-    alias wlp="wl-paste"
-else
+if  [[ "$(uname)" == "Darwin" ]]; then
     alias wlc="pbcopy"
     alias wlp="pbpaste"
+else
+    alias wlc="wl-copy"
+    alias wlp="wl-paste"
 fi
 
 # Alias functions