diff --git a/.Brewfile b/.Brewfile index 8871fb9..07fdb5d 100644 --- a/.Brewfile +++ b/.Brewfile @@ -1,54 +1,50 @@ -tap "homebrew/autoupdate" -tap "homebrew/bundle" -tap "homebrew/services" -tap "nikitabobko/tap" +# Casks +cask "aerospace" +cask "jordanbaird-ice@beta" +cask "monitorcontrol" +cask "opencloud" +cask "sioyek" +cask "wireshark-app" +cask "airbuddy" +cask "karabiner-elements" +cask "mos" +cask "prismlauncher" +cask "stremio" +cask "zen" +cask "bettertouchtool" +cask "flameshot" +cask "keyboard-cleaner" +cask "notchnook" +cask "qbittorrent" +cask "stretchly" +cask "brave-browser" +cask "hot" +cask "obs" +cask "qmk-toolbox" +cask "tailscale-app" +cask "zotero" +cask "discord" +cask "iina" +cask "obsidian" +cask "raycast" + +# Tools +brew "atuin" +brew "bat" brew "btop" brew "htop" -brew "cmake" -brew "coreutils", link: false -brew "dart-sdk", link: false -brew "duf" brew "eza" brew "fd" brew "fzf" -brew "gcc" brew "git" brew "git-delta" -brew "git-lfs" +brew "gnu-tar" brew "lazygit" -brew "llvm" -brew "neovim" -brew "openjdk@17" +brew "iperf3" +brew "ncdu" brew "openssh" +brew "pandoc" brew "ripgrep" -brew "rustup" -brew "shellcheck" -brew "texlive", link: false -brew "tmux" -brew "watch" +brew "starship" brew "wget" -cask "aerospace" -cask "bartender" -cask "discord" -cask "element" -cask "firefox" -cask "flameshot" -cask "font-fira-mono-nerd-font" -cask "font-jetbrains-mono-nerd-font" -cask "iina" -cask "karabiner-elements" -cask "mos" -cask "nextcloud" -cask "notchnook" -cask "obs" -cask "obs-ndi" -cask "obsidian" -cask "raycast" -cask "skim" -cask "stremio" -cask "thunderbird" -cask "wezterm" -cask "wireshark" -cask "zotero" -cask "bitwarden" -cask "wireguard-tools" +brew "zsh" \ No newline at end of file diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index a1913fd..99e9d56 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -8,9 +8,6 @@ return { }, version = '*', opts = { - enabled = function() - return not (string.find(vim.bo.filetype, "himalaya") or string.find(vim.bo.filetype, "mail")) - end, keymap = { preset = 'default', [''] = {}, diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index bb39ba3..042a73c 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -19,28 +19,6 @@ return { event = "VeryLazy", opts = {} }, - -- { - -- "ray-x/go.nvim", - -- dependencies = { - -- "ray-x/guihua.lua", - -- "neovim/nvim-lspconfig", - -- "nvim-treesitter/nvim-treesitter", - -- }, - -- config = function(lp, opts) - -- require("go").setup(opts) - -- local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {}) - -- vim.api.nvim_create_autocmd("BufWritePre", { - -- pattern = "*.go", - -- callback = function() - -- require('go.format').goimports() - -- end, - -- group = format_sync_grp, - -- }) - -- end, - -- event = { "CmdlineEnter" }, - -- ft = { "go", 'gomod' }, - -- build = ':lua require("go.install").update_all_sync()' - -- }, { "neovim/nvim-lspconfig", dependencies = { @@ -169,48 +147,47 @@ return { lspconfig["pyright"].setup({ capabilities = capabilities, }) - vim.lsp.config["tinymist"].capabilities = capabilities + vim.lsp.config["tinymist"] = { + capabilities = capabilities, + settings = { + -- exportPdf = "onType", + -- outputPath = "$root/$name", + formatterMode = "typstyle", + fontPaths = { + "./fonts" + } + }, + on_attach = function(client, bufnr) + vim.keymap.set("n", "tp", function() + client:exec_cmd({ + title = "pin", + command = "tinymist.pinMain", + arguments = { vim.api.nvim_buf_get_name(0) }, + }, { bufnr = bufnr }) + end, { desc = "[T]inymist [P]in", noremap = true }) + vim.keymap.set("n", "tu", function() + client:exec_cmd({ + title = "unpin", + command = "tinymist.pinMain", + arguments = { vim.v.null }, + }, { bufnr = bufnr }) + end, { desc = "[T]inymist [U]npin", noremap = true }) + end, + + } vim.lsp.enable("tinymist") + vim.lsp.config['nil_ls'].capabilities = capabilities + vim.lsp.enable('nil_ls') end, }, - { - 'mrcjkb/rustaceanvim', - version = '^5', - lazy = false - }, { 'chomosuke/typst-preview.nvim', ft = 'typst', version = '1.*', - opts = {}, - }, - { - "leoluz/nvim-dap-go", - ft = "go", - dependencies = "mfussenegger/nvim-dap", - opts = {} - }, - { - "rcarriga/nvim-dap-ui", - event = "VeryLazy", - dependencies = { "mfussenegger/nvim-dap", "nvim-neotest/nvim-nio" }, - config = function() - local dap = require("dap") - local dapui = require("dapui") - dapui.setup() - dap.listeners.after.event_initialized["dapui_config"] = function() - dapui.open() - end - dap.listeners.before.event_terminated["dapui_config"] = function() - dapui.close() - end - dap.listeners.before.event_exited["dapui_config"] = function() - dapui.close() - end - end - }, - { - "mfussenegger/nvim-dap", + opts = { + extra_args = {"--font-path=fonts"}, + invert_colors = '{"rest": "auto","image": "never"}' + }, }, { "stevearc/conform.nvim", diff --git a/.config/nvim/lua/plugins/misc.lua b/.config/nvim/lua/plugins/misc.lua index f7cac5e..8974baa 100644 --- a/.config/nvim/lua/plugins/misc.lua +++ b/.config/nvim/lua/plugins/misc.lua @@ -25,7 +25,14 @@ return { statuscolumn = { enabled = true }, dashboard = { enabled = true }, input = { enabled = true }, - image = { enabled = true }, + image = { + doc = { + inline = false, + float = true, + max_width = 10, + max_height = 5, + } + }, lazygit = { vim.keymap.set('n', 'lg', function() Snacks.lazygit.open() @@ -47,27 +54,9 @@ return { end }, "tpope/vim-fugitive", - { - 'codethread/qmk.nvim', - config = function() - ---@type qmk.UserConfig - local conf = { - name = 'LAYOUT_lily58_pro', - variant = 'zmk', - layout = { - 'x x x x x x _ _ _ _ x x x x x x', - 'x x x x x x _ _ _ _ x x x x x x', - 'x x x x x x _ _ _ _ x x x x x x', - 'x x x x x x x _ _ x x x x x x x', - '_ _ _ x x x x _ _ x x x x _ _ _', - } - } - require('qmk').setup(conf) - end - }, { "afonsofrancof/worktrees.nvim", - dev = false, + dev = true, event = "VeryLazy", opts = { mappings = { diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index 931acd9..6001626 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -53,5 +53,4 @@ return { }) end }, - "kyoh86/vim-jsonl" } diff --git a/.config/nvim/lua/plugins/ui.lua b/.config/nvim/lua/plugins/ui.lua index 90e92b0..c8de17f 100644 --- a/.config/nvim/lua/plugins/ui.lua +++ b/.config/nvim/lua/plugins/ui.lua @@ -1,14 +1,5 @@ return { - -- { - -- "vimpostor/vim-tpipeline", - -- config = function() - -- vim.g.tpipeline_restore = 0 - -- vim.g.tpipeline_autoembed = 0 - -- vim.o.laststatus = 0 - -- vim.g.tpipeline_statusline = '%=%l:%c' - -- end - -- }, { "folke/noice.nvim", event = "VeryLazy", @@ -34,19 +25,6 @@ return { "MunifTanjim/nui.nvim", } }, - { - 'kevinhwang91/nvim-ufo', - event = "VeryLazy", - dependencies = 'kevinhwang91/promise-async', - config = function() - vim.o.foldcolumn = '0' - vim.o.foldlevel = 99 - vim.o.foldlevelstart = 99 - vim.keymap.set('n', 'zR', require('ufo').openAllFolds) - vim.keymap.set('n', 'zM', require('ufo').closeAllFolds) - require('ufo').setup() - end - }, { "OXY2DEV/markview.nvim", ft = "markdown", @@ -61,9 +39,4 @@ return { require 'colorizer'.setup() end }, - { - "echasnovski/mini.diff", - opts = {} - } - } diff --git a/.local/bin/macos.sh b/.local/bin/macos.sh new file mode 100755 index 0000000..fa18dc6 --- /dev/null +++ b/.local/bin/macos.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +echo "Configuring macOS system defaults..." + +# NSGlobalDomain settings +defaults write -g AppleShowAllExtensions -bool true +defaults write -g ApplePressAndHoldEnabled -bool false +defaults write -g KeyRepeat -int 2 +defaults write -g InitialKeyRepeat -int 15 +defaults write -g com.apple.mouse.tapBehavior -int 1 +defaults write -g com.apple.sound.beep.volume -float 0.0 +defaults write -g com.apple.sound.beep.feedback -int 0 + +# Dock settings +defaults write com.apple.dock autohide -bool true +defaults write com.apple.dock autohide-delay -float 0.1 +defaults write com.apple.dock autohide-time-modifier -float 0.0 +defaults write com.apple.dock show-recents -bool false +defaults write com.apple.dock launchanim -bool false +defaults write com.apple.dock orientation -string "bottom" +defaults write com.apple.dock tilesize -int 48 +defaults write com.apple.dock mineffect -string "scale" + +# Finder settings +defaults write com.apple.finder _FXShowPosixPathInTitle -bool true + +# Trackpad settings +defaults write com.apple.AppleMultitouchTrackpad Clicking -bool true +defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true +defaults write com.apple.AppleMultitouchTrackpad TrackpadThreeFingerDrag -bool true +defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad TrackpadThreeFingerDrag -bool true + +echo "Restarting affected services..." +killall Dock +killall Finder + +echo "Configuration complete! Some changes may require a logout/login to take effect." \ No newline at end of file diff --git a/Brewfile b/Brewfile new file mode 100644 index 0000000..b49f670 --- /dev/null +++ b/Brewfile @@ -0,0 +1,61 @@ +# Casks +cask "aerospace" +cask "jordanbaird-ice@beta" +cask "monitorcontrol" +cask "opencloud" +cask "sioyek" +cask "wireshark-app" +cask "airbuddy" +cask "karabiner-elements" +cask "mos" +cask "prismlauncher" +cask "stremio" +cask "zen" +cask "bettertouchtool" +cask "flameshot" +cask "keyboard-cleaner" +cask "notchnook" +cask "qbittorrent" +cask "stretchly" +cask "brave-browser" +cask "hot" +cask "obs" +cask "qmk-toolbox" +cask "tailscale-app" +cask "zotero" +cask "discord" +cask "iina" +cask "obsidian" +cask "raycast" + +# Tools +brew "atuin" +brew "bat" +brew "btop" +brew "htop" +brew "eza" +brew "fd" +brew "fzf" +brew "git" +brew "git-delta" +brew "gnu-tar" +brew "lazygit" +brew "iperf3" +brew "ncdu" +brew "openssh" +brew "pandoc" +brew "ripgrep" +brew "starship" +brew "zsh" +brew "wget" +brew "ninja" +brew "cmake" +brew "gettext" +brew "curl" +brew "libevent" +brew "ncurses" +brew "utf8proc" +brew "coreutils" +brew "bash" +brew "aria2" +cask "orion"