elal
/
dotfiles
mirror of https://github.com/E-Almqvist/dotfiles
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge fix

Browse Source
laptop
Elias Almqvist 9 months ago
parent 9984cbf9df 07bf169ee0
commit 3f2c0672f7
No known key found for this signature in database
GPG Key ID: E31A99CE3E75A158
5 changed files with 209 additions and 160 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 211
      code/.config/Code/User/settings.json
  2. 36
      gnome-settings.ini
  3. 4
      nvchad/.config/nvim/lua/custom/chadrc.lua
  4. 116
      nvchad/.config/nvim/lua/custom/plugins.lua
  5. 2
      oh-my-zsh/.oh-my-zsh/aliases.sh

211
code/.config/Code/User/settings.json
Unescape View File

@ -1,100 +1,113 @@
{ {
"telemetry.telemetryLevel": "off", "telemetry.telemetryLevel": "off",
"editor.insertSpaces": false, "editor.detectIndentation": true,
"editor.detectIndentation": true, "explorer.confirmDelete": false,
"explorer.confirmDelete": false, "git.openRepositoryInParentFolders": "never",
"git.openRepositoryInParentFolders": "never", "workbench.editorAssociations": {
"workbench.editorAssociations": { "*.sqlite": "default"
"*.sqlite": "default" },
}, "workbench.startupEditor": "none",
"workbench.startupEditor": "none", "editor.minimap.enabled": false,
"editor.minimap.enabled": false, "breadcrumbs.enabled": true,
"breadcrumbs.enabled": false, "editor.renderWhitespace": "none",
"editor.renderWhitespace": "none", "window.menuBarVisibility": "toggle",
"window.menuBarVisibility": "toggle", "editor.fontFamily": "Fira Code, 'Droid Sans Mono', 'monospace', monospace",
"editor.fontFamily": "Fira Code, 'Droid Sans Mono', 'monospace', monospace", "jupyter.askForKernelRestart": false,
"window.zoomLevel": -1, "vim.handleKeys": {
"jupyter.askForKernelRestart": false, "<C-j>": false,
"vim.normalModeKeyBindingsNonRecursive": [ "<C-l>": false,
{ "<C-k>": false,
"before": ["u"], "<C-d>": false,
"commands": ["undo"] "<C-p>": false,
}, "<C-i>": false,
{ "<C-b>": false,
"before": ["c-r"], "<C-o>": false,
"commands": ["redo"] },
}, "vim.normalModeKeyBindingsNonRecursive": [
{ {
"before": ["<leader>", "t"], "before": ["u"],
"commands": ["workbench.action.toggleSidebarVisibility"] "commands": ["undo"]
}, },
{ {
"before": ["g", "s"], "before": ["c-r"],
"commands": ["workbench.action.showAllSymbols"] "commands": ["redo"]
}, },
{ {
"before": ["g", "a"], "before": ["<leader>", "t"],
"commands": ["references-view.findReferences"] "commands": ["workbench.action.toggleSidebarVisibility"]
}, },
{ {
"before": ["g", "r"], "before": ["g", "s"],
"commands": ["editor.action.rename"] "commands": ["workbench.action.showAllSymbols"]
}, },
{ {
"before": ["g", "w"], "before": ["g", "a"],
"commands": ["editor.emmet.action.wrapWithAbbreviation"] "commands": ["references-view.findReferences"]
} },
], {
"vim.visualModeKeyBindingsNonRecursive": [ "before": ["g", "r"],
{ "commands": ["editor.action.rename"]
"before": ["g", "r"], },
"commands": ["git.revertSelectedRanges"] {
}, "before": ["g", "w"],
{ "commands": ["editor.emmet.action.wrapWithAbbreviation"]
"before": ["g", "w"], }
"commands": ["editor.emmet.action.wrapWithAbbreviation"] ],
}, "vim.visualModeKeyBindingsNonRecursive": [
{ {
"before": ["c-<leader>"], "before": ["g", "r"],
"commands": ["editor.action.triggerSuggest"] "commands": ["git.revertSelectedRanges"]
} },
], {
"editor.mouseWheelScrollSensitivity": 2, "before": ["g", "w"],
"editor.smoothScrolling": true, "commands": ["editor.emmet.action.wrapWithAbbreviation"]
"workbench.list.smoothScrolling": true, },
"terminal.integrated.smoothScrolling": true, {
"editor.cursorSmoothCaretAnimation": "on", "before": ["c-<leader>"],
"[latex]": { "commands": ["editor.action.triggerSuggest"]
"editor.defaultFormatter": "mathematic.vscode-latex" },
}, {
"cSpell.userWords": [ "before": ["<leader>", "g"],
"pycocotools", "commands": ["editor.action.showHover"]
"torchvision" }
], ],
"[python]": { "vim.leader": "<Space>",
"editor.defaultFormatter": "ms-python.black-formatter" "editor.mouseWheelScrollSensitivity": 2,
}, "editor.smoothScrolling": true,
"workbench.colorCustomizations": {}, "workbench.list.smoothScrolling": true,
"[typescriptreact]": { "terminal.integrated.smoothScrolling": true,
"editor.defaultFormatter": "esbenp.prettier-vscode" "[latex]": {
}, "editor.defaultFormatter": "mathematic.vscode-latex"
"[typescript]": { },
"editor.defaultFormatter": "esbenp.prettier-vscode" "C_Cpp.intelliSenseEngine": "disabled",
}, "workbench.colorCustomizations": {},
"[json]": { "[typescript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[jsonc]": { "[typescriptreact]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "esbenp.prettier-vscode"
}, },
"[javascript]": { "[c]": {
"editor.defaultFormatter": "esbenp.prettier-vscode" "editor.defaultFormatter": "llvm-vs-code-extensions.vscode-clangd"
}, },
"workbench.activityBar.location": "hidden", "[cpp]": {
"github.copilot.enable": { "editor.defaultFormatter": "xaver.clang-format"
"*": false, },
"plaintext": false, "[css]": {
"markdown": false, "editor.defaultFormatter": "esbenp.prettier-vscode"
"scminput": false },
}, "[json]": {
} "editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[javascript]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cmake.showOptionsMovedNotification": false,
"window.autoDetectColorScheme": true,
"window.zoomLevel": -1,
"haskell.manageHLS": "GHCup",
"window.customTitleBarVisibility": "auto"
}

36
gnome-settings.ini
View File

File diff suppressed because one or more lines are too long

4
nvchad/.config/nvim/lua/custom/chadrc.lua
Unescape View File

@ -5,8 +5,8 @@ local M = {}
local highlights = require "custom.highlights" local highlights = require "custom.highlights"
M.ui = { M.ui = {
theme = "yoru", theme = "gruvchad",
theme_toggle = { "yoru", "one_light" }, theme_toggle = { "gruvchad", "gruvbox_light" },
hl_override = highlights.override, hl_override = highlights.override,
hl_add = highlights.add, hl_add = highlights.add,

116
nvchad/.config/nvim/lua/custom/plugins.lua
Unescape View File

@ -3,49 +3,49 @@ local overrides = require("custom.configs.overrides")
---@type NvPluginSpec[] ---@type NvPluginSpec[]
local plugins = { local plugins = {
-- Override plugin definition options -- Override plugin definition options
{ {
"neovim/nvim-lspconfig", "neovim/nvim-lspconfig",
config = function() config = function()
require "plugins.configs.lspconfig" require("plugins.configs.lspconfig")
require "custom.configs.lspconfig" require("custom.configs.lspconfig")
end, -- Override to setup mason-lspconfig end, -- Override to setup mason-lspconfig
}, },
-- override plugin configs -- override plugin configs
{ {
"williamboman/mason.nvim", "williamboman/mason.nvim",
opts = overrides.mason opts = overrides.mason,
}, },
{ {
"nvim-treesitter/nvim-treesitter", "nvim-treesitter/nvim-treesitter",
opts = overrides.treesitter, opts = overrides.treesitter,
}, },
{ {
"nvim-tree/nvim-tree.lua", "nvim-tree/nvim-tree.lua",
opts = overrides.nvimtree, opts = overrides.nvimtree,
}, },
-- Install a plugin -- Install a plugin
{ {
"max397574/better-escape.nvim", "max397574/better-escape.nvim",
event = "InsertEnter", event = "InsertEnter",
config = function() config = function()
require("better_escape").setup() require("better_escape").setup()
end, end,
}, },
{ {
"stevearc/conform.nvim", "stevearc/conform.nvim",
-- for users those who want auto-save conform + lazyloading! -- for users those who want auto-save conform + lazyloading!
-- event = "BufWritePre" -- event = "BufWritePre"
config = function() config = function()
require "custom.configs.conform" require("custom.configs.conform")
end, end,
}, },
{ {
"github/copilot.vim", "github/copilot.vim",
@ -60,19 +60,37 @@ local plugins = {
end end
}, },
-- To make a plugin not be loaded {
-- { "nvim-treesitter/nvim-treesitter",
-- "NvChad/nvim-colorizer.lua", dependencies = {
-- enabled = false "JoosepAlviste/nvim-ts-context-commentstring",
-- }, },
opts = overrides.treesitter,
},
{
"numToStr/Comment.nvim",
dependencies = "JoosepAlviste/nvim-ts-context-commentstring",
config = function()
require("Comment").setup({
pre_hook = require("ts_context_commentstring.integrations.comment_nvim").create_pre_hook(),
})
end,
},
-- To make a plugin not be loaded
-- {
-- "NvChad/nvim-colorizer.lua",
-- enabled = false
-- },
-- All NvChad plugins are lazy-loaded by default -- All NvChad plugins are lazy-loaded by default
-- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false` -- For a plugin to be loaded, you will need to set either `ft`, `cmd`, `keys`, `event`, or set `lazy = false`
-- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example -- If you want a plugin to load on startup, add `lazy = false` to a plugin spec, for example
-- { -- {
-- "mg979/vim-visual-multi", -- "mg979/vim-visual-multi",
-- lazy = false, -- lazy = false,
-- } -- }
} }
return plugins return plugins

2
oh-my-zsh/.oh-my-zsh/aliases.sh
Unescape View File

@ -38,3 +38,5 @@ alias cr="cd_gitroot"
alias dev="cd $HOME/Projects/almtech/ingenuity/" alias dev="cd $HOME/Projects/almtech/ingenuity/"
alias dc="docker-compose" alias dc="docker-compose"
alias dots="cd $HOME/.dotfiles/"

Write Preview
Loading…
Cancel
Save