From ab6b2b1850b73645016e4f1a717b5ef1dbfdd409 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Fri, 20 Oct 2023 15:55:21 +0200 Subject: [PATCH] Updated config --- .config/alacritty/alacritty.yml | 11 +++--- .config/htop/htoprc | 12 +++---- .config/nushell/alias.nu | 3 ++ .config/nvim/lazy-lock.json | 36 ++++++++----------- .config/nvim/lua/config/autocmds.lua | 11 ------ .config/nvim/lua/config/settings.lua | 2 +- .../nvim/lua/{plugins => disabled}/nvterm.lua | 0 .../lua/{plugins => disabled}/spectre.lua | 0 .../lua/{plugins => disabled}/trouble.lua | 2 -- .config/nvim/lua/plugins/cmp.lua | 16 ++++----- .config/nvim/lua/plugins/lsp.lua | 17 +-------- .config/nvim/lua/plugins/notify.lua | 8 +++++ .../lua/plugins/{theme.lua => onedark.lua} | 2 +- .config/nvim/lua/plugins/tree.lua | 4 +-- .config/vscode/settings.json | 18 +++++++--- 15 files changed, 63 insertions(+), 79 deletions(-) rename .config/nvim/lua/{plugins => disabled}/nvterm.lua (100%) rename .config/nvim/lua/{plugins => disabled}/spectre.lua (100%) rename .config/nvim/lua/{plugins => disabled}/trouble.lua (88%) create mode 100644 .config/nvim/lua/plugins/notify.lua rename .config/nvim/lua/plugins/{theme.lua => onedark.lua} (93%) diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 49850cd..520443a 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -8,19 +8,19 @@ font: family: "UbuntuMono Nerd Font" style: Regular - size: 14 + size: 15.5 key_bindings: - { key: F11, action: ToggleFullscreen } window: - opacity: 0.9 + opacity: 1 + decorations: none + startup_mode: Maximized colors: - name: vscode (dark) - author: senpai-10 primary: - background: "#1E1E1E" + background: "#241F31" foreground: "#D4D4D4" cursor: text: "#1d1f21" @@ -43,4 +43,5 @@ colors: magenta: "#d670d6" cyan: "#29b8db" white: "#e5e5e5" + theme: vscode.dark diff --git a/.config/htop/htoprc b/.config/htop/htoprc index 72e3733..84a18c7 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -39,17 +39,17 @@ column_meter_modes_0=1 1 column_meters_1=DiskIO NetworkIO column_meter_modes_1=1 1 tree_view=0 -sort_key=46 -tree_sort_key=0 +sort_key=47 +tree_sort_key=46 sort_direction=-1 -tree_sort_direction=1 +tree_sort_direction=-1 tree_view_always_by_pid=0 all_branches_collapsed=0 screen:Main=PERCENT_CPU PERCENT_MEM Command -.sort_key=PERCENT_CPU -.tree_sort_key=PID +.sort_key=PERCENT_MEM +.tree_sort_key=PERCENT_CPU .tree_view=0 .tree_view_always_by_pid=0 .sort_direction=-1 -.tree_sort_direction=1 +.tree_sort_direction=-1 .all_branches_collapsed=0 diff --git a/.config/nushell/alias.nu b/.config/nushell/alias.nu index 430b6de..7259ae0 100644 --- a/.config/nushell/alias.nu +++ b/.config/nushell/alias.nu @@ -11,6 +11,9 @@ alias home = git $"--git-dir=($env.HOME)/.home/" $"--work-tree=($env.HOME)" alias gob = go build -v alias got = go test -v +# Hyperfine +alias bench = hyperfine --shell=none + # Neovim alias e = nvim alias n = nvim diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 4bb7061..0c48546 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,26 +1,20 @@ { "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, - "LuaSnip": { "branch": "master", "commit": "ea7d7ea510c641c4f15042becd27f35b3e5b3c2b" }, - "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, - "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, - "flash.nvim": { "branch": "main", "commit": "8a8e74922a383c253b7f92e042b749150140c8d1" }, - "gitsigns.nvim": { "branch": "main", "commit": "fef5d90953f0a730483b44745fae5938ba8227f8" }, - "lazy.nvim": { "branch": "main", "commit": "2a9354c7d2368d78cbd5575a51a2af5bd8a6ad01" }, - "neodev.nvim": { "branch": "main", "commit": "f0e574687aa51c513017155f003e8e8950ec6ff4" }, - "noice.nvim": { "branch": "main", "commit": "74c2902146b080035beb19944baf6f014a954720" }, - "nui.nvim": { "branch": "main", "commit": "c8de23342caf8d50b15d6b28368d36a56a69d76f" }, - "nvim-cmp": { "branch": "main", "commit": "5dce1b778b85c717f6614e3f4da45e9f19f54435" }, - "nvim-lspconfig": { "branch": "master", "commit": "d177ad277a638f262edb73c75ffe33e377b95dc5" }, - "nvim-notify": { "branch": "master", "commit": "5d33f5e371ba6e63d0e1763ddc18cd9832833bc7" }, - "nvim-spectre": { "branch": "master", "commit": "411cee67fe3f8242023eb8d9edafefbbfb2d06f1" }, - "nvim-tree.lua": { "branch": "master", "commit": "94c7c810af205c0f00c8f105dcf490c8eb17658a" }, - "nvim-treesitter": { "branch": "master", "commit": "b6492f41c46d9c3bc3550ecfb10c3f261e73cba6" }, - "nvim-web-devicons": { "branch": "master", "commit": "ecdeb4e2a4af34fc873bbfbf1f4c4e447e632255" }, - "nvterm": { "branch": "main", "commit": "3e43be1d0ca60cc5e2dfc2d289b06577e7e57e98" }, - "onedark.nvim": { "branch": "master", "commit": "dac8c39812dae025255c9069a260e1f69d967927" }, - "plenary.nvim": { "branch": "master", "commit": "0232372b906f275f76ac42029eba25eaf95e76b9" }, + "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, + "gitsigns.nvim": { "branch": "main", "commit": "5a9a6ac29a7805c4783cda21b80a1e361964b3f2" }, + "lazy.nvim": { "branch": "main", "commit": "9788a19ec0b4036028e78aec702634b4b89d3470" }, + "neodev.nvim": { "branch": "main", "commit": "b094a663ccb71733543d8254b988e6bebdbdaca4" }, + "noice.nvim": { "branch": "main", "commit": "8f1b53ab85f83e0687d0f267085ad781ec240432" }, + "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, + "nvim-cmp": { "branch": "main", "commit": "d3a3056204e1a9dbb7c7fe36c114dc43b681768c" }, + "nvim-lspconfig": { "branch": "master", "commit": "38da5bbe1eaab2394056109e48c7e195bdb8fdfe" }, + "nvim-notify": { "branch": "master", "commit": "e4a2022f4fec2d5ebc79afa612f96d8b11c627b3" }, + "nvim-tree.lua": { "branch": "master", "commit": "40b9b887d090d5da89a84689b4ca0304a9649f62" }, + "nvim-treesitter": { "branch": "master", "commit": "1bfefd1f98dae54576a54b59b42379b275a00414" }, + "nvim-web-devicons": { "branch": "master", "commit": "3af745113ea537f58c4b1573b64a429fefad9e07" }, + "onedark.nvim": { "branch": "master", "commit": "b9acd92ded2ba155867ca5af9d618e933d96e3b0" }, + "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, "telescope-project.nvim": { "branch": "master", "commit": "7c64b181dd4e72deddcf6f319e3bf1e95b2a2f30" }, - "telescope.nvim": { "branch": "master", "commit": "a19770625aed49ad2a9f591a5e3946707f7359f6" }, - "trouble.nvim": { "branch": "main", "commit": "3f85d8ed30e97ceeddbbcf80224245d347053711" } + "telescope.nvim": { "branch": "master", "commit": "74ce793a60759e3db0d265174f137fb627430355" } } \ No newline at end of file diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua index 41cbd67..51cb11b 100644 --- a/.config/nvim/lua/config/autocmds.lua +++ b/.config/nvim/lua/config/autocmds.lua @@ -1,16 +1,5 @@ local on = vim.api.nvim_create_autocmd -on("VimEnter", { - callback = function() - local files = require("nvim-tree.api") - local width = vim.go.columns - - if width > 120 then - files.tree.toggle({ focus = false }) - end - end, -}) - on({ "TermOpen", "TermEnter" }, { callback = function() vim.opt_local.signcolumn = "no" diff --git a/.config/nvim/lua/config/settings.lua b/.config/nvim/lua/config/settings.lua index 8f183f5..01947d2 100644 --- a/.config/nvim/lua/config/settings.lua +++ b/.config/nvim/lua/config/settings.lua @@ -13,7 +13,7 @@ opt.autowrite = false opt.clipboard = "unnamedplus" opt.conceallevel = 0 opt.cursorline = true -opt.cursorlineopt = "both" +opt.cursorlineopt = "number" opt.expandtab = false opt.grepformat = "%f:%l:%c:%m" opt.grepprg = "rg --grep" diff --git a/.config/nvim/lua/plugins/nvterm.lua b/.config/nvim/lua/disabled/nvterm.lua similarity index 100% rename from .config/nvim/lua/plugins/nvterm.lua rename to .config/nvim/lua/disabled/nvterm.lua diff --git a/.config/nvim/lua/plugins/spectre.lua b/.config/nvim/lua/disabled/spectre.lua similarity index 100% rename from .config/nvim/lua/plugins/spectre.lua rename to .config/nvim/lua/disabled/spectre.lua diff --git a/.config/nvim/lua/plugins/trouble.lua b/.config/nvim/lua/disabled/trouble.lua similarity index 88% rename from .config/nvim/lua/plugins/trouble.lua rename to .config/nvim/lua/disabled/trouble.lua index 749f610..2a79606 100644 --- a/.config/nvim/lua/plugins/trouble.lua +++ b/.config/nvim/lua/disabled/trouble.lua @@ -11,8 +11,6 @@ return { position = "right", padding = false, use_diagnostic_signs = true, - auto_open = true, - auto_close = true, }, config = true, } diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index 9d72bf7..dcc8ee0 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -46,9 +46,9 @@ return { event = "InsertEnter", dependencies = { "hrsh7th/cmp-nvim-lsp", - "hrsh7th/cmp-buffer", - "hrsh7th/cmp-path", - "L3MON4D3/LuaSnip", + -- "hrsh7th/cmp-buffer", + -- "hrsh7th/cmp-path", + -- "L3MON4D3/LuaSnip", }, config = function() local cmp = require("cmp") @@ -72,11 +72,11 @@ return { [""] = cmp.mapping.abort(), [""] = cmp.mapping.confirm({ select = true }), }, - snippet = { - expand = function(args) - require("luasnip").lsp_expand(args.body) - end, - }, + -- snippet = { + -- expand = function(args) + -- require("luasnip").lsp_expand(args.body) + -- end, + -- }, sources = { { name = "nvim_lsp" }, { name = "luasnip" }, diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua index 21c165f..c4f1681 100644 --- a/.config/nvim/lua/plugins/lsp.lua +++ b/.config/nvim/lua/plugins/lsp.lua @@ -6,17 +6,7 @@ return { }, opts = { servers = { - denols = { - filetypes = { - "javascript", - "typescript", - "markdown", - "json", - }, - init_options = { - lint = true, - }, - }, + clangd = {}, gopls = {}, lua_ls = { settings = { @@ -27,11 +17,6 @@ return { }, }, }, - --cssls = {}, - --html = {}, - --jsonls = {}, - --tsserver = {}, - --svelte = {}, }, }, config = function(_, opts) diff --git a/.config/nvim/lua/plugins/notify.lua b/.config/nvim/lua/plugins/notify.lua new file mode 100644 index 0000000..0be5d6b --- /dev/null +++ b/.config/nvim/lua/plugins/notify.lua @@ -0,0 +1,8 @@ +return { + "rcarriga/nvim-notify", + event = "VeryLazy", + opts = { + background_colour = "#000000", + }, + config = true, +} diff --git a/.config/nvim/lua/plugins/theme.lua b/.config/nvim/lua/plugins/onedark.lua similarity index 93% rename from .config/nvim/lua/plugins/theme.lua rename to .config/nvim/lua/plugins/onedark.lua index 451b70a..33b1b5a 100644 --- a/.config/nvim/lua/plugins/theme.lua +++ b/.config/nvim/lua/plugins/onedark.lua @@ -4,7 +4,7 @@ return { priority = 1000, opts = { style = "dark", - transparent = false, + transparent = true, term_colors = true, highlights = { ["StatusLine"] = {fg = "$bg3", bg = "Normal"}, diff --git a/.config/nvim/lua/plugins/tree.lua b/.config/nvim/lua/plugins/tree.lua index e80e06a..6834f3c 100644 --- a/.config/nvim/lua/plugins/tree.lua +++ b/.config/nvim/lua/plugins/tree.lua @@ -39,7 +39,5 @@ return { width = 35, }, }, - config = function(_, opts) - require("nvim-tree").setup(opts) - end, + config = true, } diff --git a/.config/vscode/settings.json b/.config/vscode/settings.json index dea03a6..f0f9088 100644 --- a/.config/vscode/settings.json +++ b/.config/vscode/settings.json @@ -1,13 +1,20 @@ { + "breadcrumbs.enabled": false, + "editor.cursorBlinking": "phase", "editor.fontFamily": "UbuntuMono Nerd Font", "editor.fontSize": 15, + "editor.glyphMargin": false, + "editor.guides.indentation": false, "editor.hideCursorInOverviewRuler": true, "editor.insertSpaces": false, + "editor.lineNumbers": "off", "editor.renderFinalNewline": "off", "editor.scrollbar.vertical": "hidden", "editor.scrollbar.verticalScrollbarSize": 0, "editor.scrollBeyondLastLine": false, + "editor.showFoldingControls": "never", "explorer.confirmDelete": false, + "explorer.openEditors.visible": 1, "files.insertFinalNewline": false, "git.confirmSync": false, "git.enableSmartCommit": true, @@ -18,15 +25,16 @@ "gitProjectManager.openInNewWindow": false, "gitProjectManager.storeRepositoriesBetweenSessions": false, "go.gopath": "~/.go", - "go.lintTool": "golangci-lint", - "go.lintFlags": ["--fast"], "security.workspace.trust.enabled": false, "telemetry.telemetryLevel": "off", "window.menuBarVisibility": "hidden", "window.zoomLevel": 1, "workbench.activityBar.visible": false, - "workbench.statusBar.visible": false, - "workbench.iconTheme": "material-icon-theme", - "workbench.startupEditor": "none", "workbench.colorTheme": "One Dark Pro Darker", + "workbench.editor.enablePreview": false, + "workbench.editor.showTabs": false, + "workbench.iconTheme": "material-icon-theme", + "workbench.layoutControl.enabled": false, + "workbench.startupEditor": "none", + "workbench.statusBar.visible": false }