made changes

.bashrc

@@ -652,3 +652,17 @@ export LESS_TERMCAP_ue=$'\e[0m'
 export LESS_TERMCAP_us=$'\e[1;4;31m'
 
 
+
+alias claude="/home/nicholai/.claude/local/claude"
+. "$HOME/.cargo/env"
+
+alias scripts="cd /home/nicholai/.nuke/ && nvim"
+
+alias comfy="cd ~/ComfyUI && source .venv/bin/activate && python main.py"
+
+alias sammie="cd ~/Software/Sammie-Roto-2/ && source venv/bin/activate && ./run_sammie.command"
+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"

init.lua

@@ -1,22 +1,24 @@
--- Load core settings
+-- always load core stuff
 require("core.options")
-
--- Bootstrap lazy.nvim
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not vim.loop.fs_stat(lazypath) then
-    vim.fn.system({
-        "git",
-        "clone",
-        "--filter=blob:none",
-        "https://github.com/folke/lazy.nvim.git",
-        "--branch=stable",
-        lazypath,
-    })
-end
-vim.opt.rtp:prepend(lazypath)
-
--- Load plugins
-require("lazy").setup("plugins")
-
--- Load core keymaps
 require("core.keymaps")
+
+-- only load plugins when not in VSCode / Cursor
+if not vim.g.vscode then
+  -- Bootstrap lazy.nvim
+  local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+  if not vim.loop.fs_stat(lazypath) then
+    vim.fn.system({
+      "git",
+      "clone",
+      "--filter=blob:none",
+      "https://github.com/folke/lazy.nvim.git",
+      "--branch=stable",
+      lazypath,
+    })
+  end
+  vim.opt.rtp:prepend(lazypath)
+
+  -- Load plugins
+  require("lazy").setup("plugins")
+end
+

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

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,
     },

setup.sh

@@ -2,3 +2,4 @@
 # setup.sh
 ln -sf ~/.config/nvim/.tmux.conf ~/.tmux.conf 
 ln -sf ~/.config/nvim/starship.toml ~/.config/starship.toml 
+ln -sf ~/.config/nvim/.bashrc ~/.bashrc