Skip to content

Commit

Permalink
updated newest configs
Browse files Browse the repository at this point in the history
  • Loading branch information
hungnb31 committed Apr 7, 2022
1 parent 2522f33 commit cc6246c
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 46 deletions.
14 changes: 6 additions & 8 deletions alacritty/alacritty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions kitty/kitty.conf
Original file line number Diff line number Diff line change
@@ -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

Expand Down
40 changes: 17 additions & 23 deletions lvim/config.lua
Original file line number Diff line number Diff line change
@@ -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 <leader>Lk]
lvim.leader = "space"
-- add your own keymapping
lvim.keys.normal_mode["<C-s>"] = ":w<cr>"
-- unmap a default keymapping
-- lvim.keys.normal_mode["<C-Up>"] = false
-- edit a default keymapping
-- lvim.keys.normal_mode["<C-q>"] = ":q<cr>"

-- 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<cr>", "Ranger"
Expand All @@ -46,8 +33,8 @@ lvim.builtin.which_key.mappings["f"] = {
name = "Find",
b = { "<cmd>Telescope git_branches<cr>", "Checkout Branch" },
c = { "<cmd>Telescope colorscheme<cr>", "Colorscheme" },
f = { "<cmd>Telescope find_files<cr>", "Find File" },
g = { "<cmd>Telescope git_files<cr>", "Find Git File" },
f = { "<cmd>Telescope git_files<cr>", "Find Git File" },
g = { "<cmd>Telescope find_files<cr>", "Find File" },
h = { "<cmd>Telescope help_tags<cr>", "Find Help" },
M = { "<cmd>Telescope man_pages<cr>", "Man Pages" },
r = { "<cmd>Telescope oldfiles<cr>", "Open Recent File" },
Expand Down Expand Up @@ -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" },
Expand Down Expand Up @@ -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",
Expand All @@ -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
43 changes: 30 additions & 13 deletions vscode/settings.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -72,6 +76,11 @@
"before": ["<leader>", "/"],
"commands": ["editor.action.commentLine"]
},
// show code actions
{
"before": ["<leader>", "a"],
"commands": ["editor.action.codeAction"]
},

{
"before": ["<leader>", "k"],
Expand All @@ -94,19 +103,19 @@
"commands": ["workbench.action.closeActiveEditor"]
},
{
"before": ["<leader>", "l"],
"before": ["Ctrl+l"],
"commands": ["workbench.action.focusRightGroupWithoutWrap"]
},
{
"before": ["<leader>", "h"],
"before": ["Ctrl+h"],
"commands": ["workbench.action.focusLeftGroupWithoutWrap"]
},
{
"before": ["<leader>", "j"],
"before": ["Ctrl+j"],
"commands": ["workbench.action.focusBelowGroupWithoutWrap"]
},
{
"before": ["<leader>", "k"],
"before": ["Ctrl+k"],
"commands": ["workbench.action.focusAboveGroupWithoutWrap"]
},
{
Expand Down Expand Up @@ -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": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-",
Expand All @@ -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"
}
}

0 comments on commit cc6246c

Please sign in to comment.