From 0e1a74df08bc4a14a4d350d7cfa2f85cf58e1254 Mon Sep 17 00:00:00 2001 From: Josh Patra <30350506+SoPat712@users.noreply.github.com> Date: Sun, 13 Oct 2024 19:12:50 -0400 Subject: [PATCH] cleanup and fixes --- git/.gitconfig | 4 + iTerm/.DS_Store | Bin 0 -> 6148 bytes nvim/.config/nvim/lazy-lock.json | 76 ++++++------ nvim/.config/nvim/lua/plugins/codesnap.lua | 2 + nvim/.config/nvim/lua/plugins/compiler.lua | 21 ++++ nvim/.config/nvim/lua/plugins/lsp-config.lua | 5 +- nvim/.config/nvim/lua/plugins/noice.lua | 117 ++++++++++-------- nvim/.config/nvim/lua/plugins/nvim-lint.lua | 1 + nvim/.config/nvim/lua/plugins/which-key.lua | 1 + qbit/.DS_Store | Bin 0 -> 6148 bytes ...677658-7EB8-4CF8-BA26-6F32474B00D3.session | 1 + ...86239B-63B6-420A-8CBF-7FC04168F27D.session | 1 + ...F53738-9CDB-4F2B-A4E6-4FAFA4494496.session | 1 + ...4CED71-0D6C-4E05-87AA-EB850C81F9FC.session | 1 + zsh/.zshrc | 4 +- 15 files changed, 144 insertions(+), 91 deletions(-) create mode 100644 iTerm/.DS_Store create mode 100644 nvim/.config/nvim/lua/plugins/compiler.lua create mode 100644 qbit/.DS_Store create mode 100644 zsh/.zsh_sessions/5F677658-7EB8-4CF8-BA26-6F32474B00D3.session create mode 100644 zsh/.zsh_sessions/7E86239B-63B6-420A-8CBF-7FC04168F27D.session create mode 100644 zsh/.zsh_sessions/ACF53738-9CDB-4F2B-A4E6-4FAFA4494496.session create mode 100644 zsh/.zsh_sessions/FD4CED71-0D6C-4E05-87AA-EB850C81F9FC.session diff --git a/git/.gitconfig b/git/.gitconfig index 3f9c453..76937f3 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -24,3 +24,7 @@ conflictstyle = diff3 [diff] colorMoved = default +[http] + postBuffer = 524288000 +[pull] + rebase = false diff --git a/iTerm/.DS_Store b/iTerm/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..fe47be56377521ea8ca3422edca2019de0e80ae2 GIT binary patch literal 6148 zcmeHK%}T>S5Z-O8-BN@cR6GW}7EA;W;w40V0V8@)sR;=+7_+5G&7l->)EDwmd>&_Z zH(+TFor zS=8uZbdx64*xEgpc^Rg8GE)g@oIuF^ZJNij^5r~_3zZvahZu;#*xFw#oRRG;NA|)! zJqFcvPn_j)AodQA&aTGK*-I|pG?g4!SF&TUfp<{Ws(KA(c_#A-_?o;Xo{$(I28aP- zV3Qayr+^r4Qqfc^F+dFbhymOmY-os{!CIr*I-tYrGx~doD4^q80?{_;8LTye2ZZZX zK%L6X6NBq?u-hiiGgxcX>5QwDVIH$`^LXKEb+FqioN-Sh^~3-%u*yJJ4=p_ZFX1oK z`p92Rp%F1a4E!?&c<&;(@S!Mkwyu?jXRQtG5gH1{)u@1gzH$kG0q!FQ%BlS}>JaA{ WtTo~+XjkcgbP-U5P)7{>0s~*6WlX&Q literal 0 HcmV?d00001 diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index d2a4324..d59c8d3 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,56 +1,58 @@ { - "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" }, + "LuaSnip": { "branch": "master", "commit": "e808bee352d1a6fcf902ca1a71cee76e60e24071" }, "actions-preview.nvim": { "branch": "master", "commit": "9f52a01c374318e91337697ebed51c6fae57f8a4" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "clangd_extensions.nvim": { "branch": "main", "commit": "a8500531c4ed3a207e744a374ea038744a0f93eb" }, + "alpha-nvim": { "branch": "main", "commit": "bf3c8bb8c02ed3d9644cc5bbc48e2bdc39349cd7" }, + "clangd_extensions.nvim": { "branch": "main", "commit": "385a44f133f4145e3a3da1a2a557225dccc3e1f8" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "codesnap.nvim": { "branch": "main", "commit": "06d8e345e7be43a5b2bd67a86a3993da91c59781" }, - "conform.nvim": { "branch": "master", "commit": "310e2e95a4f832163f3f7a9fedebb1a4afc0db69" }, - "flash.nvim": { "branch": "main", "commit": "25ba3f4d1e0b080213b39518ebcfbb693a23c957" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "codesnap.nvim": { "branch": "main", "commit": "6400480aa6cc366cbd931146c429aaa64680dab9" }, + "compiler.nvim": { "branch": "main", "commit": "fd28c5e3cf9f78d9a943530ffd1b9cbd15e57ee1" }, + "conform.nvim": { "branch": "master", "commit": "40d4e98fcc3e6f485f0e8924c63734bc7e305967" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "friendly-snippets": { "branch": "main", "commit": "00ba9dd3df89509f95437b8d595553707c46d5ea" }, "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" }, - "indent-blankline.nvim": { "branch": "master", "commit": "65e20ab94a26d0e14acac5049b8641336819dfc7" }, - "lazy.nvim": { "branch": "main", "commit": "5473e3d77c13e40fc4758fa977a1f2c14d0b4ceb" }, - "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" }, + "indent-blankline.nvim": { "branch": "master", "commit": "3af6493bf69e4a857a8b1fab36f333629d413a18" }, + "lazy.nvim": { "branch": "main", "commit": "1159bdccd8910a0fd0914b24d6c3d186689023d9" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "25c11854aa25558ee6c03432edfa0df0217324be" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, - "mini.nvim": { "branch": "main", "commit": "f20d8cd3a116ef65f022797de064a044b217ff53" }, + "mini.indentscope": { "branch": "main", "commit": "da9af64649e114aa79480c238fd23f6524bc0903" }, + "mini.nvim": { "branch": "main", "commit": "61e5d46fc0cf71306c51275383767d996f559a60" }, "minimap.vim": { "branch": "master", "commit": "395378137e6180762d5b963ca9ad5ac2db5d3283" }, - "noice.nvim": { "branch": "main", "commit": "daa5f6908e97c89ca3e9861e03bdf356ea48cc72" }, - "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, - "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" }, - "nvim-lint": { "branch": "master", "commit": "efc6fc83f0772283e064c53a8f9fb5645bde0bc0" }, - "nvim-lspconfig": { "branch": "master", "commit": "01e08d4bf1c35e5126b2ad5209725e4c552289ab" }, - "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, - "nvim-treesitter": { "branch": "master", "commit": "0758155d4dfacfa959ad82ffa3879cb69c82e719" }, - "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" }, - "nvim-ts-autotag": { "branch": "main", "commit": "1624866a1379fc1861797f0ed05899a9c1d2ff61" }, - "nvim-ufo": { "branch": "main", "commit": "1b5f2838099f283857729e820cc05e2b19df7a2c" }, - "nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" }, - "outline.nvim": { "branch": "main", "commit": "2175b6da5b7b5be9de14fd3f54383a17f5e4609c" }, - "persistence.nvim": { "branch": "main", "commit": "40a137dd9240c9c6760c53df48d2b155f52c252b" }, - "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, - "promise-async": { "branch": "main", "commit": "28c1d5a295eb5310afa2523d4ae9aa41ec5a9de2" }, - "smart-splits.nvim": { "branch": "master", "commit": "44145a4b37217348293fe457992cc38cf3b19f33" }, - "telescope-file-browser.nvim": { "branch": "master", "commit": "a7ab9a957b17199183388c6f357d614fcaa508e5" }, + "noice.nvim": { "branch": "main", "commit": "df448c649ef6bc5a6a633a44f2ad0ed8d4442499" }, + "nui.nvim": { "branch": "main", "commit": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-lint": { "branch": "master", "commit": "27f44d1cc3d733a38a736acb902f94879d99c76c" }, + "nvim-lspconfig": { "branch": "master", "commit": "39f31e178466e4ed23c8ea6fddd5b7a4d9699398" }, + "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" }, + "nvim-treesitter": { "branch": "master", "commit": "45386764cc9535200d2288cab929c5093d33660e" }, + "nvim-treesitter-context": { "branch": "master", "commit": "78a81c7494e7d1a08dd1200b556933e513fd9f29" }, + "nvim-ts-autotag": { "branch": "main", "commit": "e239a560f338be31337e7abc3ee42515daf23f5e" }, + "nvim-ufo": { "branch": "main", "commit": "203c9f434feec57909ab4b1e028abeb3349b7847" }, + "nvim-web-devicons": { "branch": "master", "commit": "6b53401918a9033a41159d012160c5fb5eb249ae" }, + "outline.nvim": { "branch": "main", "commit": "6c44527837ff7ac1cd054dc365a721e881020a2e" }, + "overseer.nvim": { "branch": "master", "commit": "6271cab7ccc4ca840faa93f54440ffae3a3918bd" }, + "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, + "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, + "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "smart-splits.nvim": { "branch": "master", "commit": "7796d530559048481953bd1dcbdcfc776f636fb8" }, + "telescope-file-browser.nvim": { "branch": "master", "commit": "3b8a1e17187cfeedb31decbd625da62398a8ff34" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, "telescope-undo.nvim": { "branch": "main", "commit": "51be9ae7c42fc27c0b05505e3a0162e0f05fbb6a" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "todo-comments.nvim": { "branch": "main", "commit": "96fee098a90e7c09c9811aa7df71d773ba8b9b53" }, - "tokyonight.nvim": { "branch": "main", "commit": "6adfcde66e8af2f22dd5d76060980abd8daa0df8" }, - "trouble.nvim": { "branch": "main", "commit": "bf99ea71a39e322336b7f8be965f86dbf5c65540" }, + "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, + "tokyonight.nvim": { "branch": "main", "commit": "2c85fad417170d4572ead7bf9fdd706057bd73d7" }, + "trouble.nvim": { "branch": "main", "commit": "254145ffd528b98eb20be894338e2d5c93fa02c2" }, "vim-commentary": { "branch": "master", "commit": "c4b8f52cbb7142ec239494e5a2c4a512f92c4d07" }, - "vim-fugitive": { "branch": "master", "commit": "8c8cdf4405cb8bdb70dd9812a33bb52363a87dbc" }, + "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, - "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, + "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, "vim-startuptime": { "branch": "master", "commit": "ac2cccb5be617672add1f4f3c0a55ce99ba34e01" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "which-key.nvim": { "branch": "main", "commit": "e8b454fb03e3cab398c894e5d462c84595ee57ca" } -} \ No newline at end of file + "which-key.nvim": { "branch": "main", "commit": "0539da005b98b02cf730c1d9da82b8e8edb1c2d2" } +} diff --git a/nvim/.config/nvim/lua/plugins/codesnap.lua b/nvim/.config/nvim/lua/plugins/codesnap.lua index 92b235c..5778d32 100644 --- a/nvim/.config/nvim/lua/plugins/codesnap.lua +++ b/nvim/.config/nvim/lua/plugins/codesnap.lua @@ -9,6 +9,8 @@ return { opacity = true, -- (Optional) The code snap has some opacity by default, set it to false for 100% opacity watermark = "joshp", -- (Optional) you can custom your own watermark, but if you don't like it, just set it to "" preview_title = "CodeSnap.nvim", -- (Optional) preview page title + bg_theme = "summer", + has_line_number = true, }) end, } diff --git a/nvim/.config/nvim/lua/plugins/compiler.lua b/nvim/.config/nvim/lua/plugins/compiler.lua new file mode 100644 index 0000000..3725aa3 --- /dev/null +++ b/nvim/.config/nvim/lua/plugins/compiler.lua @@ -0,0 +1,21 @@ +return { + { -- This plugin + "Zeioth/compiler.nvim", + cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" }, + dependencies = { "stevearc/overseer.nvim", "nvim-telescope/telescope.nvim" }, + opts = {}, + }, + { -- The task runner we use + "stevearc/overseer.nvim", + commit = "6271cab7ccc4ca840faa93f54440ffae3a3918bd", + cmd = { "CompilerOpen", "CompilerToggleResults", "CompilerRedo" }, + opts = { + task_list = { + direction = "bottom", + min_height = 25, + max_height = 25, + default_detail = 1, + }, + }, + }, +} diff --git a/nvim/.config/nvim/lua/plugins/lsp-config.lua b/nvim/.config/nvim/lua/plugins/lsp-config.lua index 5ac1980..b6f142d 100644 --- a/nvim/.config/nvim/lua/plugins/lsp-config.lua +++ b/nvim/.config/nvim/lua/plugins/lsp-config.lua @@ -90,7 +90,7 @@ return { local hl = "DiagnosticSign" .. type vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" }) end - lspconfig.tsserver.setup({ + lspconfig.ts_ls.setup({ capabilities = capabilities, }) lspconfig.html.setup({ @@ -99,6 +99,9 @@ return { lspconfig.lua_ls.setup({ capabilities = capabilities, }) + lspconfig.gopls.setup({ + capabilities = capabilities, + }) local function get_python_path(workspace) -- Use a pattern to find the venv path in the workspace directory local venv_path = lspconfig.util.path.join(workspace, "venv", "bin", "python") diff --git a/nvim/.config/nvim/lua/plugins/noice.lua b/nvim/.config/nvim/lua/plugins/noice.lua index 29f224c..d27f369 100644 --- a/nvim/.config/nvim/lua/plugins/noice.lua +++ b/nvim/.config/nvim/lua/plugins/noice.lua @@ -1,55 +1,68 @@ -- lazy.nvim return { - "folke/noice.nvim", - event = "VeryLazy", - opts = { - lsp = { - -- override markdown rendering so that **cmp** and other plugins use **Treesitter** - override = { - ["vim.lsp.util.convert_input_to_markdown_lines"] = true, - ["vim.lsp.util.stylize_markdown"] = true, - ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp - }, - }, - -- you can enable a preset for easier configuration - presets = { - bottom_search = true, -- use a classic bottom cmdline for search - command_palette = true, -- position the cmdline and popupmenu together - long_message_to_split = true, -- long messages will be sent to a split - inc_rename = false, -- enables an input dialog for inc-rename.nvim - lsp_doc_border = false, -- add a border to hover docs and signature help - }, - }, - dependencies = { - -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries - "MunifTanjim/nui.nvim", - -- OPTIONAL: - -- `nvim-notify` is only needed, if you want to use the notification view. - -- If not available, we use `mini` as the fallback - -- Better `vim.notify()` - { - "rcarriga/nvim-notify", - keys = { - { - "un", - function() - require("notify").dismiss({ silent = true, pending = true }) - end, - desc = "Dismiss all Notifications", - }, - }, - opts = { - timeout = 3000, - max_height = function() - return math.floor(vim.o.lines * 0.75) - end, - max_width = function() - return math.floor(vim.o.columns * 0.75) - end, - on_open = function(win) - vim.api.nvim_win_set_config(win, { zindex = 100 }) - end, - }, - }, - }, + "folke/noice.nvim", + event = "VeryLazy", + config = function() + require("lualine").setup({ + sections = { + lualine_x = { + { + require("noice").api.statusline.mode.get, + cond = require("noice").api.statusline.mode.has, + color = { fg = "#ff9e64" }, + }, + }, + }, + }) + end, + opts = { + lsp = { + -- override markdown rendering so that **cmp** and other plugins use **Treesitter** + override = { + ["vim.lsp.util.convert_input_to_markdown_lines"] = true, + ["vim.lsp.util.stylize_markdown"] = true, + ["cmp.entry.get_documentation"] = true, -- requires hrsh7th/nvim-cmp + }, + }, + -- you can enable a preset for easier configuration + presets = { + bottom_search = true, -- use a classic bottom cmdline for search + command_palette = true, -- position the cmdline and popupmenu together + long_message_to_split = true, -- long messages will be sent to a split + inc_rename = false, -- enables an input dialog for inc-rename.nvim + lsp_doc_border = false, -- add a border to hover docs and signature help + }, + }, + dependencies = { + -- if you lazy-load any plugin below, make sure to add proper `module="..."` entries + "MunifTanjim/nui.nvim", + -- OPTIONAL: + -- `nvim-notify` is only needed, if you want to use the notification view. + -- If not available, we use `mini` as the fallback + -- Better `vim.notify()` + { + "rcarriga/nvim-notify", + keys = { + { + "un", + function() + require("notify").dismiss({ silent = true, pending = true }) + end, + desc = "Dismiss all Notifications", + }, + }, + opts = { + timeout = 3000, + max_height = function() + return math.floor(vim.o.lines * 0.75) + end, + max_width = function() + return math.floor(vim.o.columns * 0.75) + end, + on_open = function(win) + vim.api.nvim_win_set_config(win, { zindex = 100 }) + end, + }, + }, + }, } diff --git a/nvim/.config/nvim/lua/plugins/nvim-lint.lua b/nvim/.config/nvim/lua/plugins/nvim-lint.lua index ce872ea..a3e0c82 100644 --- a/nvim/.config/nvim/lua/plugins/nvim-lint.lua +++ b/nvim/.config/nvim/lua/plugins/nvim-lint.lua @@ -12,6 +12,7 @@ return { typescriptreact = { "eslint_d" }, svelte = { "eslint_d" }, python = { "pylint" }, + make = { "checkmake" }, } local lint_augroup = vim.api.nvim_create_augroup("lint", { clear = true }) diff --git a/nvim/.config/nvim/lua/plugins/which-key.lua b/nvim/.config/nvim/lua/plugins/which-key.lua index 1f311fa..422478f 100644 --- a/nvim/.config/nvim/lua/plugins/which-key.lua +++ b/nvim/.config/nvim/lua/plugins/which-key.lua @@ -1,5 +1,6 @@ return { "folke/which-key.nvim", + version = "2.1.0", config = function() require("which-key").setup({ plugins = { diff --git a/qbit/.DS_Store b/qbit/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0e6b6cb2bcc28ca0e0a8d015e8f9c33f31219f2f GIT binary patch literal 6148 zcmeHKPfNov6i>G4GKa8(ipPN0fvw;{yp%e>fE7Kc%#{@_)@H2jdKiNq^$Yn?{5-yw zWa8L7coA{$m6zYk`_qtLO42aKxL*ui#yX5K0g6~_L9;?Ij=Cf@>p|rD9g2Qq-G(}t71&^u>@y{LnntXPs_H&IlO|ga%PiYoF*!LfcU(2 zUPDL>5Cg=(dN5#jKha)~>C!BT0b<|>4B-ACK@mNRl|j9AK!d-J7;hk=fQ@$vL}}5p zSQ&%}2sfpGrj*+&1~=v4mp0F{SQ#|sjO&r%J$7VnZzx=k4t}ZA8TSlQOAHVLiwx9F zw}a>Z`S? Z_$3;Ep2f-_ctGe!K+`}CG4QJld;oZ{P0IiP literal 0 HcmV?d00001 diff --git a/zsh/.zsh_sessions/5F677658-7EB8-4CF8-BA26-6F32474B00D3.session b/zsh/.zsh_sessions/5F677658-7EB8-4CF8-BA26-6F32474B00D3.session new file mode 100644 index 0000000..19a70a2 --- /dev/null +++ b/zsh/.zsh_sessions/5F677658-7EB8-4CF8-BA26-6F32474B00D3.session @@ -0,0 +1 @@ +echo Restored session: "$(/bin/date -r 1726690367)" diff --git a/zsh/.zsh_sessions/7E86239B-63B6-420A-8CBF-7FC04168F27D.session b/zsh/.zsh_sessions/7E86239B-63B6-420A-8CBF-7FC04168F27D.session new file mode 100644 index 0000000..46af36d --- /dev/null +++ b/zsh/.zsh_sessions/7E86239B-63B6-420A-8CBF-7FC04168F27D.session @@ -0,0 +1 @@ +echo Restored session: "$(/bin/date -r 1728858582)" diff --git a/zsh/.zsh_sessions/ACF53738-9CDB-4F2B-A4E6-4FAFA4494496.session b/zsh/.zsh_sessions/ACF53738-9CDB-4F2B-A4E6-4FAFA4494496.session new file mode 100644 index 0000000..00575c9 --- /dev/null +++ b/zsh/.zsh_sessions/ACF53738-9CDB-4F2B-A4E6-4FAFA4494496.session @@ -0,0 +1 @@ +echo Restored session: "$(/bin/date -r 1726690366)" diff --git a/zsh/.zsh_sessions/FD4CED71-0D6C-4E05-87AA-EB850C81F9FC.session b/zsh/.zsh_sessions/FD4CED71-0D6C-4E05-87AA-EB850C81F9FC.session new file mode 100644 index 0000000..ea10b6f --- /dev/null +++ b/zsh/.zsh_sessions/FD4CED71-0D6C-4E05-87AA-EB850C81F9FC.session @@ -0,0 +1 @@ +echo Restored session: "$(/bin/date -r 1726690368)" diff --git a/zsh/.zshrc b/zsh/.zshrc index e5c90c6..0f1ed4f 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -11,7 +11,9 @@ export ET_NO_TELEMETRY=FALSE export PYENV_ROOT="$HOME/.pyenv" export PATH="$PYENV_ROOT/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH" +export PATH="$HOME/go/bin:$PATH" export PATH="/opt/homebrew/opt/libgit2@1.7/bin:$PATH" +export PATH="$HOME/flutter/bin:$PATH" export FZF_DEFAULT_COMMAND="fd --hidden --strip-cwd-prefix --exclude .git" export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" export FZF_ALT_C_COMMAND="fd --type=d --hidden --strip-cwd-prefix --exclude .git" @@ -58,7 +60,7 @@ alias cat=bat # OS-specific settings if [[ "$OSTYPE" == "darwin"* ]]; then export PATH=$PATH:/Users/joshp/.spicetify - alias alluptd="sudo port selfupdate; sudo port upgrade outdated; mas list; mas upgrade; brew update; brew upgrade; brew cu --all --yes" + alias alluptd="sudo port selfupdate; sudo port upgrade outdated; mas list; mas upgrade; brew update; brew upgrade; brew cu --all --yes; rustup update; cargo install-update -a; pip install --upgrade pip; pip-review --local --auto" export DISPLAY=:0 source ~/Projects/fzf-git.sh/fzf-git.sh fi