diff --git a/kitty/kitty.conf b/kitty/kitty.conf index a50f8eb..83cbaa9 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,10 +1,9 @@ font_size 10 - -font_family Jetbrains Mono Nerd Font -bold_font auto -italic_font auto -bold_italic_font auto +# font_family Jetbrains Mono Nerd Font +# bold_font auto +# italic_font auto +# bold_italic_font auto @@ -63,7 +62,17 @@ confirm_os_window_close 0 + + + +# BEGIN_KITTY_FONTS +font_family family="JetBrains Mono NL" +bold_font auto +italic_font auto +bold_italic_font auto +# END_KITTY_FONTS + # BEGIN_KITTY_THEME -# Solarized Dark +# Solarized Dark Higher Contrast include current-theme.conf -# END_KITTY_THEME +# END_KITTY_THEME \ No newline at end of file diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 03433d7..7f414e3 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,46 +1,45 @@ { "LuaSnip": { "branch": "master", "commit": "5a1e39223db9a0498024a77b8441169d260c8c25" }, + "NeoSolarized.nvim": { "branch": "master", "commit": "3c55ad358c062aa4879950c4f83b4deeac6b72df" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, - "conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" }, - "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, - "git-blame.nvim": { "branch": "master", "commit": "54da04264ec5313d602aebea7c5dc90141696ad7" }, - "gitsigns.nvim": { "branch": "main", "commit": "130beacf8a51f00aede9c31064c749136679a321" }, + "conform.nvim": { "branch": "master", "commit": "e969e302bced7ffb9a0a0323629f31feb0ca35a6" }, + "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" }, + "git-blame.nvim": { "branch": "main", "commit": "5c536e2d4134d064aa3f41575280bc8a2a0e03d7" }, + "gitsigns.nvim": { "branch": "main", "commit": "9f3c6dd7868bcc116e9c1c1929ce063b978fa519" }, "gv.vim": { "branch": "master", "commit": "b6bb6664e2c95aa584059f195eb3a9f3cb133994" }, - "hererocks": { "branch": "master", "commit": "98f3ff2f5e9c1e7c03dc46eb1a61ea57a4146870" }, - "image.nvim": { "branch": "master", "commit": "446a8a5cc7a3eae3185ee0c697732c32a5547a0b" }, + "image.nvim": { "branch": "master", "commit": "da2be65c153ba15a14a342b05591652a6df70d58" }, "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazygit.nvim": { "branch": "main", "commit": "a04ad0dbc725134edbee3a5eea29290976695357" }, - "lspkind.nvim": { "branch": "master", "commit": "3ddd1b4edefa425fda5a9f95a4f25578727c0bb3" }, + "lspkind.nvim": { "branch": "master", "commit": "c7274c48137396526b59d86232eabcdc7fed8a32" }, "lspsaga.nvim": { "branch": "main", "commit": "8efe00d6aed9db6449969f889170f1a7e43101a1" }, "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" }, - "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, - "mini.diff": { "branch": "main", "commit": "6010e588e9ed14724880f244d7fa3df8f0be3f46" }, - "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "a324581a3c83fdacdb9804b79de1cbe00ce18550" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.diff": { "branch": "main", "commit": "ff3cd5e76e812fa18bde0f8126d6f3bb62008c79" }, + "neo-tree.nvim": { "branch": "v3.x", "commit": "9d6826582a3e8c84787bd7355df22a2812a1ad59" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" }, - "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, + "nvim-autopairs": { "branch": "master", "commit": "59bce2eef357189c3305e25bc6dd2d138c1683f5" }, + "nvim-cmp": { "branch": "main", "commit": "da88697d7f45d16852c6b2769dc52387d1ddc45f" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lspconfig": { "branch": "master", "commit": "d696e36d5792daf828f8c8e8d4b9aa90c1a10c2a" }, - "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-lspconfig": { "branch": "master", "commit": "ead0f5f342d8d323441e7d4b88f0fc436a81ad5f" }, + "nvim-treesitter": { "branch": "main", "commit": "6bc51d020a5e06b7e20ea82dbc47196d3d3027c7" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, + "nvim-web-devicons": { "branch": "master", "commit": "737cf6c657898d0c697311d79d361288a1343d50" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" }, - "solarized.nvim": { "branch": "main", "commit": "c0dfe1cbfabd93b546baf5f1408f5df7e02e2050" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "3610dc7dc91f06aa98b11dca5cc30dfa98626b7e" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "tinted-nvim": { "branch": "main", "commit": "0347c54827694e85f4880233eefd71be3978e439" }, + "tinted-nvim": { "branch": "main", "commit": "d23eddcf4ec6c59af6a8a64844ff02487e832007" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "vim-commentary": { "branch": "master", "commit": "64a654ef4a20db1727938338310209b6a63f60c9" }, "vim-css-color": { "branch": "master", "commit": "14fd934cdd9ca1ac0e53511094e612eb9bace373" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" }, "vim-smoothie": { "branch": "master", "commit": "df1e324e9f3395c630c1c523d0555a01d2eb1b7e" }, "vim-wakatime": { "branch": "master", "commit": "d7973b157a632d1edeff01818f18d67e584eeaff" }, - "zk-nvim": { "branch": "main", "commit": "8df80d0dc2d66e53b08740361a600746a6e4edcf" } + "zk-nvim": { "branch": "main", "commit": "51c8f858420112dda495a6f4ddbd3943ae433e39" } } diff --git a/nvim/lua/plugins/telescope.lua b/nvim/lua/plugins/telescope.lua index 6e63ab6..cb8748f 100644 --- a/nvim/lua/plugins/telescope.lua +++ b/nvim/lua/plugins/telescope.lua @@ -1,5 +1,39 @@ -local actions = require("telescope.actions") +-- local actions = require("telescope.actions") +-- return { +-- "nvim-telescope/telescope.nvim", +-- tag = "0.1.8", +-- dependencies = { +-- "nvim-lua/plenary.nvim", +-- "nvim-telescope/telescope-fzf-native.nvim", +-- "nvim-telescope/telescope-file-browser.nvim", +-- }, +-- opts = { +-- defaults = { +-- mappings = { +-- i = { +-- [""] = actions.move_selection_previous, -- move to prev result +-- [""] = actions.move_selection_next, -- move to next result +-- }, +-- }, +-- file_ignore_patterns = { +-- "build/", +-- "neuron/", +-- "img", +-- ".cache/", +-- "node_modules", +-- ".git", +-- }, +-- }, +-- }, +-- keys = { +-- { "ff", "Telescope find_files hidden=true" }, +-- { "bb", "Telescope buffers" }, +-- { "tt", "Telescope file_browser hidden=true" }, +-- { "gg", "Telescope live_grep hidden=true" }, +-- }, +-- } +-- return { "nvim-telescope/telescope.nvim", tag = "0.1.8", @@ -8,24 +42,27 @@ return { "nvim-telescope/telescope-fzf-native.nvim", "nvim-telescope/telescope-file-browser.nvim", }, - opts = { - defaults = { - mappings = { - i = { - [""] = actions.move_selection_previous, -- move to prev result - [""] = actions.move_selection_next, -- move to next result + config = function() + local actions = require("telescope.actions") + require("telescope").setup({ + defaults = { + mappings = { + i = { + [""] = actions.move_selection_previous, + [""] = actions.move_selection_next, + }, + }, + file_ignore_patterns = { + "build/", + "neuron/", + "img", + ".cache/", + "node_modules", + ".git", }, }, - file_ignore_patterns = { - "build/", - "neuron/", - "img", - ".cache/", - "node_modules", - ".git", - }, - }, - }, + }) + end, keys = { { "ff", "Telescope find_files hidden=true" }, { "bb", "Telescope buffers" }, diff --git a/nvim/lua/plugins/treesitter.lua b/nvim/lua/plugins/treesitter.lua index 2e11119..addee66 100644 --- a/nvim/lua/plugins/treesitter.lua +++ b/nvim/lua/plugins/treesitter.lua @@ -1,59 +1,76 @@ return { "nvim-treesitter/nvim-treesitter", - event = { "BufReadPre", "BufNewFile" }, build = ":TSUpdate", - -- dependencies = { - -- "windwp/nvim-ts-autotag", - -- }, config = function() - local treesitter = require("nvim-treesitter.configs") - treesitter.setup({ - highlight = { - enable = true, - additional_vim_regex_highlighting = false, - }, - indent = { enable = true }, - -- autotag = { - -- enable = true, - -- }, + require("nvim-treesitter").setup({ ensure_installed = { - "json", - "javascript", - "typescript", - "tsx", - "yaml", - "html", - "css", - "markdown", - "markdown_inline", - "bash", - "lua", - "vim", - "dockerfile", - "gitignore", - "c", - "python", - "hcl", + "json", "javascript", "typescript", "tsx", + "yaml", "html", "css", "markdown", "markdown_inline", + "bash", "lua", "vim", "dockerfile", "gitignore", + "c", "python", "hcl", }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "", - node_incremental = "", - scope_incremental = false, - node_decremental = "", - }, - }, - -- rainbow = { - -- enable = true, - -- disable = { "html" }, - -- extended_mode = false, - -- max_file_lines = nil, - -- }, - -- context_commentstring = { - -- enable = true, - -- enable_autocmd = false, - -- }, + highlight = { enable = true }, + indent = { enable = true }, }) end, } + +-- return { +-- "nvim-treesitter/nvim-treesitter", +-- -- event = { "BufReadPre", "BufNewFile" }, +-- build = ":TSUpdate", +-- -- dependencies = { +-- -- "windwp/nvim-ts-autotag", +-- -- }, +-- config = function() +-- local treesitter = require("nvim-treesitter.configs") +-- treesitter.setup({ +-- highlight = { +-- enable = true, +-- additional_vim_regex_highlighting = false, +-- }, +-- indent = { enable = true }, +-- -- autotag = { +-- -- enable = true, +-- -- }, +-- ensure_installed = { +-- "json", +-- "javascript", +-- "typescript", +-- "tsx", +-- "yaml", +-- "html", +-- "css", +-- "markdown", +-- "markdown_inline", +-- "bash", +-- "lua", +-- "vim", +-- "dockerfile", +-- "gitignore", +-- "c", +-- "python", +-- "hcl", +-- }, +-- incremental_selection = { +-- enable = true, +-- keymaps = { +-- init_selection = "", +-- node_incremental = "", +-- scope_incremental = false, +-- node_decremental = "", +-- }, +-- }, +-- -- rainbow = { +-- -- enable = true, +-- -- disable = { "html" }, +-- -- extended_mode = false, +-- -- max_file_lines = nil, +-- -- }, +-- -- context_commentstring = { +-- -- enable = true, +-- -- enable_autocmd = false, +-- -- }, +-- }) +-- end, +-- } diff --git a/zsh/zshrc b/zsh/zshrc index 89673fc..d0b6de5 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -6,7 +6,7 @@ alias tw="timew" alias zj="zellij" alias z="cd /home/thomas/repos/eolas/zk" alias zn="/home/thomas/repos/eolas/scripts/new_zk_note.sh" -alias dot="cd /home/thomas/dotfiles" +alias dot="cd /home/thomas/repos/dotfiles" alias ddb="aws dynamodb" alias zcom="/home/thomas/repos/eolas/scripts/auto_save.sh" alias sysobs="cd /home/thomas/repos/systems-obscure"