From e108a0c9f3e9653775d528fd2b2462d5036e205f Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Sat, 27 Jan 2024 22:14:10 +0100 Subject: [PATCH 1/4] Fixed prisma treesitter --- nvchad/.config/nvim/lua/custom/chadrc.lua | 2 +- nvchad/.config/nvim/lua/custom/configs/overrides.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nvchad/.config/nvim/lua/custom/chadrc.lua b/nvchad/.config/nvim/lua/custom/chadrc.lua index d628a06..e070733 100644 --- a/nvchad/.config/nvim/lua/custom/chadrc.lua +++ b/nvchad/.config/nvim/lua/custom/chadrc.lua @@ -5,7 +5,7 @@ local M = {} local highlights = require "custom.highlights" M.ui = { - theme = "onedark", + theme = "one_light", theme_toggle = { "onedark", "one_light" }, hl_override = highlights.override, diff --git a/nvchad/.config/nvim/lua/custom/configs/overrides.lua b/nvchad/.config/nvim/lua/custom/configs/overrides.lua index 0a867a2..90f1e74 100644 --- a/nvchad/.config/nvim/lua/custom/configs/overrides.lua +++ b/nvchad/.config/nvim/lua/custom/configs/overrides.lua @@ -12,6 +12,7 @@ M.treesitter = { "c", "markdown", "markdown_inline", + "prisma", "haskell", }, indent = { From 40f2ed94adbb66f19ffbb2363e29b5ccd56b8a5c Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Wed, 31 Jan 2024 00:22:01 +0100 Subject: [PATCH 2/4] feat: TailwindCSS + other stuff with NvChad --- nvchad/.config/nvim/lua/custom/chadrc.lua | 2 +- nvchad/.config/nvim/lua/custom/configs/lspconfig.lua | 2 +- oh-my-zsh/.oh-my-zsh/aliases.sh | 7 +++++++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nvchad/.config/nvim/lua/custom/chadrc.lua b/nvchad/.config/nvim/lua/custom/chadrc.lua index e070733..d628a06 100644 --- a/nvchad/.config/nvim/lua/custom/chadrc.lua +++ b/nvchad/.config/nvim/lua/custom/chadrc.lua @@ -5,7 +5,7 @@ local M = {} local highlights = require "custom.highlights" M.ui = { - theme = "one_light", + theme = "onedark", theme_toggle = { "onedark", "one_light" }, hl_override = highlights.override, diff --git a/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua b/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua index 319a8e0..57544f7 100644 --- a/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua +++ b/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua @@ -4,7 +4,7 @@ local capabilities = require("plugins.configs.lspconfig").capabilities local lspconfig = require("lspconfig") -- if you just want default config for the servers then put them in a table -local servers = { "html", "cssls", "tsserver", "clangd", "ghdl_ls", "hls" } +local servers = { "html", "cssls", "tsserver", "clangd", "ghdl_ls", "hls", "tailwindcss" } for _, lsp in ipairs(servers) do lspconfig[lsp].setup({ diff --git a/oh-my-zsh/.oh-my-zsh/aliases.sh b/oh-my-zsh/.oh-my-zsh/aliases.sh index f38d37e..c2b72dd 100644 --- a/oh-my-zsh/.oh-my-zsh/aliases.sh +++ b/oh-my-zsh/.oh-my-zsh/aliases.sh @@ -21,3 +21,10 @@ alias gdb-multiarch="arm-none-eabi-gdb" # Git stuff alias gc="git add -A && git commit -m" + +# Very nice things +cd_gitroot() { + cd "$(git rev-parse --show-toplevel)" +} + +alias cr="cd_gitroot" From 4174edbad64f6f293058fb447dbe26d5f624dd86 Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Thu, 1 Feb 2024 17:36:47 +0100 Subject: [PATCH 3/4] Minor fixes --- nvchad/.config/nvim/lua/custom/configs/lspconfig.lua | 2 +- nvchad/.config/nvim/lua/custom/configs/overrides.lua | 2 ++ oh-my-zsh/.oh-my-zsh/aliases.sh | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua b/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua index 57544f7..d85cb71 100644 --- a/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua +++ b/nvchad/.config/nvim/lua/custom/configs/lspconfig.lua @@ -4,7 +4,7 @@ local capabilities = require("plugins.configs.lspconfig").capabilities local lspconfig = require("lspconfig") -- if you just want default config for the servers then put them in a table -local servers = { "html", "cssls", "tsserver", "clangd", "ghdl_ls", "hls", "tailwindcss" } +local servers = { "html", "cssls", "tsserver", "clangd", "ghdl_ls", "hls", "tailwindcss", "pyright" } for _, lsp in ipairs(servers) do lspconfig[lsp].setup({ diff --git a/nvchad/.config/nvim/lua/custom/configs/overrides.lua b/nvchad/.config/nvim/lua/custom/configs/overrides.lua index 90f1e74..f775ac0 100644 --- a/nvchad/.config/nvim/lua/custom/configs/overrides.lua +++ b/nvchad/.config/nvim/lua/custom/configs/overrides.lua @@ -14,6 +14,8 @@ M.treesitter = { "markdown_inline", "prisma", "haskell", + "python", + "maintained", }, indent = { enable = true, diff --git a/oh-my-zsh/.oh-my-zsh/aliases.sh b/oh-my-zsh/.oh-my-zsh/aliases.sh index c2b72dd..155eaab 100644 --- a/oh-my-zsh/.oh-my-zsh/aliases.sh +++ b/oh-my-zsh/.oh-my-zsh/aliases.sh @@ -28,3 +28,5 @@ cd_gitroot() { } alias cr="cd_gitroot" + +alias dev="cd $HOME/Projects/almtech/ingenuity/" From 1373c4a5ec38ac8ff144a72b9a9dc67dea6443aa Mon Sep 17 00:00:00 2001 From: Elias Almqvist Date: Thu, 1 Feb 2024 19:17:56 +0100 Subject: [PATCH 4/4] Fixes --- nvchad/.config/nvim/lua/custom/configs/overrides.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/nvchad/.config/nvim/lua/custom/configs/overrides.lua b/nvchad/.config/nvim/lua/custom/configs/overrides.lua index f775ac0..45f326d 100644 --- a/nvchad/.config/nvim/lua/custom/configs/overrides.lua +++ b/nvchad/.config/nvim/lua/custom/configs/overrides.lua @@ -15,7 +15,6 @@ M.treesitter = { "prisma", "haskell", "python", - "maintained", }, indent = { enable = true,