diff --git a/.bashrc b/.bashrc index e55a45a..a72255a 100644 --- a/.bashrc +++ b/.bashrc @@ -656,7 +656,7 @@ export LESS_TERMCAP_us=$'\e[1;4;31m' alias claude="/home/nicholai/.claude/local/claude" . "$HOME/.cargo/env" -alias scripts="cd /mnt/work/L-Nextcloud/04_Library/_Tools/Nuke/ && nvim" +alias scripts="cd /home/nicholai/.nuke/ && nvim" alias comfy="cd ~/ComfyUI && source .venv/bin/activate && python main.py" @@ -664,3 +664,5 @@ alias sammie="cd ~/Software/Sammie-Roto-2/ && source venv/bin/activate && ./run_ export NSXIV_THUMBSIZE=512 export PATH=$PATH:/home/nicholai/.spicetify + +alias nuke="sudo bash ~/Documents/obsidian-vault/2-projects/Nuke-monitoring/scripts/nuke_isolated.sh" diff --git a/lua/core/options.lua b/lua/core/options.lua index 4075f48..c9770a8 100644 --- a/lua/core/options.lua +++ b/lua/core/options.lua @@ -1,3 +1,6 @@ +-- Leader key +vim.g.mapleader = ' ' + -- Basic Settings vim.opt.number = true vim.opt.relativenumber = true @@ -6,13 +9,18 @@ vim.opt.ignorecase = true vim.opt.smartcase = true vim.opt.hlsearch = false vim.opt.wrap = false -vim.opt.tabstop = 4 -vim.opt.shiftwidth = 4 +vim.opt.tabstop = 2 +vim.opt.shiftwidth = 2 vim.opt.expandtab = true vim.opt.termguicolors = true vim.opt.cursorline = true vim.opt.signcolumn = 'yes' vim.opt.clipboard = "unnamedplus" --- Leader key -vim.g.mapleader = ' ' +-- new additions +vim.scriptencoding = "utf-8" +vim.opt.encoding = "utf-8" +vim.opt.smartindent = true +vim.opt.hlsearch = true +vim.opt.backup = false +vim.opt.scrolloff = 10 diff --git a/lua/plugins/plugin.lua b/lua/plugins/plugin.lua index b59777b..b6c2e54 100644 --- a/lua/plugins/plugin.lua +++ b/lua/plugins/plugin.lua @@ -2,7 +2,7 @@ return { -- Color scheme { "catppuccin/nvim", - name = "catppuccin", + name = "catppuccin", priority = 1000, config = function() vim.cmd.colorscheme "catppuccin-mocha" @@ -37,6 +37,7 @@ return { javascriptreact = { "prettierd", "prettier" }, typescript = { "prettierd", "prettier" }, typescriptreact = { "prettierd", "prettier" }, + python = { "prettierd", "prettier" }, json = { "prettierd", "prettier" }, css = { "prettierd", "prettier" }, html = { "prettierd", "prettier" }, @@ -52,7 +53,7 @@ return { config = function() require("nvim-treesitter.configs").setup({ ensure_installed = { - "lua", "vim", "bash", "javascript", "typescript", "tsx", "json", "yaml", "html", "css", "prisma", + "lua", "vim", "bash", "javascript", "python", "typescript", "tsx", "json", "yaml", "html", "css", "prisma", "graphql" }, highlight = { enable = true }, @@ -106,7 +107,7 @@ return { dependencies = { "williamboman/mason.nvim" }, config = function() require("mason-lspconfig").setup({ - ensure_installed = { "ts_ls", "eslint", "jsonls", "html", "cssls", "tailwindcss" }, + ensure_installed = { "ts_ls", "eslint", "jsonls", "pyright", "html", "cssls", "tailwindcss" }, }) end, },