diff --git a/home/dot_config/exact_nvim/exact_lua/exact_config/options.lua b/home/dot_config/exact_nvim/exact_lua/exact_config/options.lua index 36110e5..1c4cb64 100644 --- a/home/dot_config/exact_nvim/exact_lua/exact_config/options.lua +++ b/home/dot_config/exact_nvim/exact_lua/exact_config/options.lua @@ -62,10 +62,11 @@ vim.cmd([[au BufNewFile,BufRead *.astro setf astro]]) vim.cmd([[au BufNewFile,BufRead Podfile setf ruby]]) -- Code folding -vim.opt.foldmethod = 'expr' -vim.opt.foldexpr = 'nvim_treesitter#foldexpr()' --- vim.cmd([[ set nofoldenable]]) -- Disable folding at startup -vim.opt.foldenable = true +vim.opt.foldenable = false + +vim.lsp.set_log_level('off') + +vim.g.local_plugins_path = vim.fn.stdpath('config') .. '/lua/local_plugins/' -- LSP Server to use for Ruby. -- Set to "solargraph" to use solargraph instead of ruby_lsp. diff --git a/home/dot_config/exact_nvim/exact_lua/exact_local-plugins/exact_copy-filepath/init.lua b/home/dot_config/exact_nvim/exact_lua/exact_local_plugins/exact_copy-filepath/init.lua similarity index 85% rename from home/dot_config/exact_nvim/exact_lua/exact_local-plugins/exact_copy-filepath/init.lua rename to home/dot_config/exact_nvim/exact_lua/exact_local_plugins/exact_copy-filepath/init.lua index f60582c..d4f1e1a 100644 --- a/home/dot_config/exact_nvim/exact_lua/exact_local-plugins/exact_copy-filepath/init.lua +++ b/home/dot_config/exact_nvim/exact_lua/exact_local_plugins/exact_copy-filepath/init.lua @@ -4,13 +4,13 @@ M.setup = function() vim.api.nvim_create_user_command('CopyFilePathAbsolute', function() local path = vim.fn.expand('%:p') vim.fn.setreg('+', path) - vim.notify('Copied "' .. path .. '" to the clipboard!') + vim.notify(path) end, { desc = 'Copy the absolute path of the current file to the clipboard' }) vim.api.nvim_create_user_command('CopyFilePathRelative', function() local path = vim.fn.expand('%:.') vim.fn.setreg('+', path) - vim.notify('Copied "' .. path .. '" to the clipboard!') + vim.notify(path) end, { desc = 'Copy the relative path of the current file to the clipboard' }) vim.keymap.set('n', 'cpa', 'CopyFilePathAbsolute', { desc = "Copy file's absolute path" }) diff --git a/home/dot_config/exact_nvim/exact_lua/exact_plugins/editor.lua b/home/dot_config/exact_nvim/exact_lua/exact_plugins/editor.lua index 6a84ba0..ce3e75b 100644 --- a/home/dot_config/exact_nvim/exact_lua/exact_plugins/editor.lua +++ b/home/dot_config/exact_nvim/exact_lua/exact_plugins/editor.lua @@ -224,11 +224,4 @@ return { }, }, }, - -- Local plugins - { - dir = '../local-plugins/copy-filepath', - config = function() - require('../local-plugins/copy-filepath').setup() - end, - }, } diff --git a/home/dot_config/exact_nvim/exact_lua/exact_plugins/local_plugins.lua b/home/dot_config/exact_nvim/exact_lua/exact_plugins/local_plugins.lua new file mode 100644 index 0000000..c2aeda1 --- /dev/null +++ b/home/dot_config/exact_nvim/exact_lua/exact_plugins/local_plugins.lua @@ -0,0 +1,8 @@ +return { + { + dir = vim.g.local_plugins_path .. 'copy-filepath', + config = function() + require('local_plugins.copy-filepath').setup() + end, + }, +} diff --git a/home/dot_config/exact_private_aerospace/aerospace.toml.tmpl b/home/dot_config/exact_private_aerospace/aerospace.toml.tmpl index d045568..4ba269e 100644 --- a/home/dot_config/exact_private_aerospace/aerospace.toml.tmpl +++ b/home/dot_config/exact_private_aerospace/aerospace.toml.tmpl @@ -198,6 +198,11 @@ alt-shift-l = ['join-with right', 'mode main'] # floating windows for apps + +[[on-window-detected]] +if.app-id = 'com.apple.finder' +run = 'layout floating' + [[on-window-detected]] if.app-id = 'com.apple.systempreferences' run = 'layout floating' diff --git a/home/dot_config/zsh/dot_zsh_aliases.zsh b/home/dot_config/zsh/dot_zsh_aliases.zsh index 0d4cfe6..a0f7961 100644 --- a/home/dot_config/zsh/dot_zsh_aliases.zsh +++ b/home/dot_config/zsh/dot_zsh_aliases.zsh @@ -14,10 +14,16 @@ alias python="python3" alias g="git" alias lg="lazygit" alias ld="lazydocker" -alias dcu="docker compose up -d" -alias dcb="docker compose build" -alias dcd="docker compose down" -alias dcp="docker compose pull" +alias dcu="docker-compose up -d" +alias dcb="docker-compose build" +alias dcd="docker-compose down" +alias dcp="docker-compose pull" +alias chadd="chezmoi add" +alias chdiff="chezmoi diff" +alias chst="chezmoi status" +alias chcd="chezmoi cd" +alias chup="chezmoi update" +alias chapp="chezmoi apply" alias npmi="npm install" alias npmci="npm ci"