diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml index 6b700bf..43a0718 100644 --- a/alacritty/alacritty.yml +++ b/alacritty/alacritty.yml @@ -32,10 +32,8 @@ colors: blue: '0x83a598' magenta: '0xd3869b' cyan: '0x8ec07c' - white: '0xfbf1c7' # Change cursor colors - cursor: - text: "#3B4252" - cursor: "#ECEFF4" + white: '0xfbf1c7' + cursor: style: @@ -44,23 +42,23 @@ cursor: font: # The normal (roman) font face to use. normal: - family: "Source Code Pro" + family: "Fira Code" # Style can be specified to pick a specific face. style: Semibold # The bold font face bold: - family: "Source Code Pro" + family: "Fira Code" # Style can be specified to pick a specific face. style: Bold # The italic font face italic: - family: "Source Code Pro" + family: "Fira Code" # Style can be specified to pick a specific face. style: Italic - size: 10.3 + size: 10 ligatures: true diff --git a/kitty/kitty.conf b/kitty/kitty.conf index ee166ff..761a599 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,9 +1,9 @@ -font_family Fira Code Regular +font_family Fira Code bold_font auto italic_font auto bold_italic_font auto cursor_blink_interval -1 -font_size 13 +font_size 12 hide_window_decorations yes diff --git a/lvim/config.lua b/lvim/config.lua index e0e30d4..8b67f6d 100644 --- a/lvim/config.lua +++ b/lvim/config.lua @@ -1,33 +1,20 @@ vim.cmd[[ +set rnu set termguicolors set background=dark let g:gruvbox_material_background = 'hard' -let g:gruvbox_material_better_performance = 1 let g:sneak#label = 1 ]] -- general lvim.log.level = "warn" -lvim.format_on_save = false +lvim.format_on_save = true lvim.colorscheme = "gruvbox-material" --- keymappings [view all the defaults by pressing Lk] lvim.leader = "space" -- add your own keymapping lvim.keys.normal_mode[""] = ":w" --- unmap a default keymapping --- lvim.keys.normal_mode[""] = false --- edit a default keymapping --- lvim.keys.normal_mode[""] = ":q" - --- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode. --- we use protected-mode (pcall) just in case the plugin wasn't loaded yet. --- local _, actions = pcall(require, "telescope.actions") - --- TODO: User Config for predefined plugins --- After changing plugin config exit and reopen LunarVim, Run :PackerInstall :PackerCompile --- Additional Leader bindings for WhichKey lvim.builtin.which_key.mappings["r"] = { ":RnvimrToggle", "Ranger" @@ -46,8 +33,8 @@ lvim.builtin.which_key.mappings["f"] = { name = "Find", b = { "Telescope git_branches", "Checkout Branch" }, c = { "Telescope colorscheme", "Colorscheme" }, - f = { "Telescope find_files", "Find File" }, - g = { "Telescope git_files", "Find Git File" }, + f = { "Telescope git_files", "Find Git File" }, + g = { "Telescope find_files", "Find File" }, h = { "Telescope help_tags", "Find Help" }, M = { "Telescope man_pages", "Man Pages" }, r = { "Telescope oldfiles", "Open Recent File" }, @@ -87,9 +74,10 @@ lvim.plugins = { "kevinhwang91/rnvimr", cmd = "RnvimrToggle", config = function() - vim.g.rnvimr_draw_border = 1 vim.g.rnvimr_pick_enable = 1 vim.g.rnvimr_bw_enable = 1 + vim.g.rnvimr_hide_gitignore = 1 + vim.g.rnvimr_draw_border = 1 end, }, { "tpope/vim-repeat" }, @@ -129,11 +117,6 @@ lvim.plugins = { {"justinmk/vim-sneak"}, } -lvim.builtin.dashboard.active = true -lvim.builtin.terminal.active = true -lvim.builtin.nvimtree.setup.view.side = "left" -lvim.builtin.nvimtree.show_icons.git = 0 - lvim.keys.normal_mode = { ["J"] = "jjjjj", ["K"] = "kkkkk", @@ -158,5 +141,16 @@ lvim.builtin.treesitter.ensure_installed = { "yaml", } +lvim.builtin.alpha.active = true +lvim.builtin.alpha.mode = "dashboard" + +lvim.builtin.terminal.active = true + +lvim.builtin.nvimtree.setup.view.side = "left" +lvim.builtin.nvimtree.show_icons.git = 0 + +lvim.builtin.notify.active = true +lvim.builtin.notify.opts = { stages = "fade" } + lvim.builtin.treesitter.ignore_install = { "haskell" } lvim.builtin.treesitter.highlight.enabled = true diff --git a/vscode/settings.json b/vscode/settings.json index 6fddffe..0e0c227 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -1,16 +1,20 @@ { // EDITOR CONFIGS - "editor.fontSize": 12, - "editor.fontFamily": "Fira Code", - "editor.fontWeight": "500", + // use this to install Fira Code: https://github.com/tonsky/FiraCode + "terminal.integrated.fontFamily": "Fira Code, Medium", + "terminal.integrated.fontSize": 13, + "editor.fontSize": 13, + "editor.fontFamily": "Fira Code, Medium", + "editor.fontWeight": "600", "editor.fontLigatures": true, "editor.tabSize": 2, - "editor.lineHeight": 1.4, + "editor.lineHeight": 1.3, "editor.suggestSelection": "first", "editor.scrollbar.horizontal": "hidden", "editor.scrollbar.vertical": "hidden", - "editor.formatOnSave": false, + "editor.formatOnSave": true, "editor.linkedEditing": true, + "editor.lightbulb.enable": false, // MINIMAL CONFIG "zenMode.hideLineNumbers": false, "window.menuBarVisibility": "toggle", @@ -72,6 +76,11 @@ "before": ["", "/"], "commands": ["editor.action.commentLine"] }, + // show code actions + { + "before": ["", "a"], + "commands": ["editor.action.codeAction"] + }, { "before": ["", "k"], @@ -94,19 +103,19 @@ "commands": ["workbench.action.closeActiveEditor"] }, { - "before": ["", "l"], + "before": ["Ctrl+l"], "commands": ["workbench.action.focusRightGroupWithoutWrap"] }, { - "before": ["", "h"], + "before": ["Ctrl+h"], "commands": ["workbench.action.focusLeftGroupWithoutWrap"] }, { - "before": ["", "j"], + "before": ["Ctrl+j"], "commands": ["workbench.action.focusBelowGroupWithoutWrap"] }, { - "before": ["", "k"], + "before": ["Ctrl+k"], "commands": ["workbench.action.focusAboveGroupWithoutWrap"] }, { @@ -236,9 +245,8 @@ "*.ipynb": "jupyter-notebook" }, "vsintellicode.modify.editor.suggestSelection": "automaticallyOverrodeDefaultValue", - "workbench.iconTheme": "material-icon-theme", + "workbench.iconTheme": "vscode-icons", "workbench.startupEditor": "newUntitledFile", - "workbench.colorTheme": "GitHub Dark", "editor.cursorStyle": "line", "editor.lineNumbers": "on", "editor.wordSeparators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-", @@ -249,6 +257,15 @@ }, "diffEditor.ignoreTrimWhitespace": false, "breadcrumbs.enabled": false, - "window.zoomLevel": -1, - "workbench.activityBar.visible": false + "workbench.colorTheme": "Gruvbox Dark Hard", + "problems.sortOrder": "position", + "redhat.telemetry.enabled": false, + + // formatter + "[typescriptreact]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + }, + "[html]": { + "editor.defaultFormatter": "esbenp.prettier-vscode" + } }