diff --git a/.bashrc b/.bashrc index 08f7b1a..7977cd3 100644 --- a/.bashrc +++ b/.bashrc @@ -14,6 +14,7 @@ alias grep="grep --color=auto" alias shutdown="shutdown now" alias l="ls" alias zed="zeditor" +alias sudo="sudo -E" alias q="hyprland" alias reload="source ~/.bashrc" diff --git a/.config/foot/foot.ini b/.config/foot/foot.ini index b0ec088..0b8d528 100644 --- a/.config/foot/foot.ini +++ b/.config/foot/foot.ini @@ -99,9 +99,7 @@ hide-when-typing=yes [touch] # long-press-delay=400 -# -*- conf -*- # Rosé Pine - [colors] cursor=191724 e0def4 background=191724 diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 1cdacf9..4bab907 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -56,7 +56,7 @@ execr-once = eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,se exec-once = [workspace 1 silent] $browser exec-once = [workspace 11 silent] $messaging exec-once = [workspace 12 silent] foot bluetui -exec-once = [workspace 13 silent] foot nmtuii +exec-once = [workspace 13 silent] foot -o colors.regular4=191724 nmtuii exec-once = [workspace 14 silent] foot btop @@ -242,7 +242,7 @@ bind = $mainMod, B, workspace, 12 bind = $mainMod, B, exec, ps aux | grep "foot bluetui" | grep -v grep || foot bluetui # Network control (nmtui) bind = $mainMod, N, workspace, 13 -bind = $mainMod, N, exec, ps aux | grep "foot nmtuii" | grep -v grep || foot nmtuii +bind = $mainMod, N, exec, ps aux | grep "foot -o colors.regular4=191724 nmtuii" | grep -v grep || foot -o colors.regular4=191724 nmtuii # Memory and system control (BTOP) bind = $mainMod, M, workspace, 14 bind = $mainMod, M, exec, ps aux | grep "foot btop" | grep -v grep || foot btop diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 23ba38d..c214667 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -20,6 +20,7 @@ require("lazy").setup({ { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate", + lazy = false, }, { "rose-pine/neovim", @@ -41,6 +42,20 @@ require("lazy").setup({ opts = {}, lazy = false, }, + { + "folke/which-key.nvim", + event = "VeryLazy", + init = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + end, + opts = { + preset = "helix", + triggers = { + { "", mode = "nixsotc" }, + }, + }, + }, { "lewis6991/gitsigns.nvim" }, { "neovim/nvim-lspconfig" }, { "hrsh7th/nvim-cmp" }, @@ -65,7 +80,7 @@ cmp.setup({ [""] = cmp.mapping.select_next_item(), [""] = cmp.mapping.scroll_docs(-4), [""] = cmp.mapping.scroll_docs(4), - [""] = cmp.mapping.complete(), + -- [""] = cmp.mapping.complete(), [""] = cmp.mapping.close(), [""] = cmp.mapping.confirm({ select = true }), }, @@ -77,6 +92,13 @@ cmp.setup({ }, }) +require("nvim-treesitter.configs").setup({ + ensure_installed = { "go", "html", "css", "javascript", "hyprlang", "sql", "gomod", "gosum", "bash", "c", "rust" }, + highlight = { + enable = true, + }, +}) + -- nvim-lspconfig - Providing basic, default Nvim LSP client configurations for various LSP servers. local lspconfig = require("lspconfig") lspconfig.pyright.setup({}) @@ -90,10 +112,24 @@ require("luasnip").config.set_config({ updateevents = "TextChanged,TextChangedI", }) --- line numbers +-- native vim options +local vim = vim +local opt = vim.opt + +opt.foldmethod = "expr" +opt.foldexpr = "nvim_treesitter#foldexpr()" + vim.wo.number = true vim.wo.relativenumber = true +opt.tabstop = 2 +opt.shiftwidth = 2 +opt.expandtab = true + +vim.keymap.set("ca", "o", "tabnew") + +vim.cmd("autocmd BufReadPost,FileReadPost * normal zR") + -- Comment.vim - Smart and Powerful commenting plugin for neovim require("Comment").setup() @@ -145,14 +181,3 @@ vim.api.nvim_create_autocmd({ "InsertLeave", "FocusLost" }, { vim.cmd("silent! write") end, }) - --- aliases -vim.keymap.set("ca", "o", "tabnew") - --- remove editor background --- vim.cmd([[ --- highlight Normal guibg=none --- highlight NonText guibg=none --- highlight Normal ctermbg=none --- highlight NonText ctermbg=none --- ]]) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index 8741b01..d5a26b9 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -8,12 +8,12 @@ "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, "gitsigns.nvim": { "branch": "main", "commit": "c7d37ca22b461f64e26f8f6701b2586128ed0bef" }, + "multicursor.nvim": { "branch": "1.0", "commit": "9eedebdd395bbbc4711081e33b0606c079e054c3" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "d6dc63670d3dc5204b1e874af4cbf340cb5d9d18" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" }, "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, "rose-pine": { "branch": "main", "commit": "72befaffeac38db7bdd49e0549eaa2c4806dd878" }, - "trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" } + "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua deleted file mode 100644 index 33b828d..0000000 --- a/.config/nvim/plugin/packer_compiled.lua +++ /dev/null @@ -1,104 +0,0 @@ --- Automatically generated packer.nvim plugin loader code - -if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then - vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') - return -end - -vim.api.nvim_command('packadd packer.nvim') - -local no_errors, error_msg = pcall(function() - -_G._packer = _G._packer or {} -_G._packer.inside_compile = true - -local time -local profile_info -local should_profile = false -if should_profile then - local hrtime = vim.loop.hrtime - profile_info = {} - time = function(chunk, start) - if start then - profile_info[chunk] = hrtime() - else - profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 - end - end -else - time = function(chunk, start) end -end - -local function save_profiles(threshold) - local sorted_times = {} - for chunk_name, time_taken in pairs(profile_info) do - sorted_times[#sorted_times + 1] = {chunk_name, time_taken} - end - table.sort(sorted_times, function(a, b) return a[2] > b[2] end) - local results = {} - for i, elem in ipairs(sorted_times) do - if not threshold or threshold and elem[2] > threshold then - results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' - end - end - if threshold then - table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') - end - - _G._packer.profile_output = results -end - -time([[Luarocks path setup]], true) -local package_path_str = "/home/ted/.cache/nvim/packer_hererocks/2.1.1753364724/share/lua/5.1/?.lua;/home/ted/.cache/nvim/packer_hererocks/2.1.1753364724/share/lua/5.1/?/init.lua;/home/ted/.cache/nvim/packer_hererocks/2.1.1753364724/lib/luarocks/rocks-5.1/?.lua;/home/ted/.cache/nvim/packer_hererocks/2.1.1753364724/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/ted/.cache/nvim/packer_hererocks/2.1.1753364724/lib/lua/5.1/?.so" -if not string.find(package.path, package_path_str, 1, true) then - package.path = package.path .. ';' .. package_path_str -end - -if not string.find(package.cpath, install_cpath_pattern, 1, true) then - package.cpath = package.cpath .. ';' .. install_cpath_pattern -end - -time([[Luarocks path setup]], false) -time([[try_loadstring definition]], true) -local function try_loadstring(s, component, name) - local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) - if not success then - vim.schedule(function() - vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) - end) - end - return result -end - -time([[try_loadstring definition]], false) -time([[Defining packer_plugins]], true) -_G.packer_plugins = { - ["nvim-autopairs"] = { - loaded = true, - path = "/home/ted/.local/share/nvim/site/pack/packer/start/nvim-autopairs", - url = "https://github.com/windwp/nvim-autopairs" - }, - ["packer.nvim"] = { - loaded = true, - path = "/home/ted/.local/share/nvim/site/pack/packer/start/packer.nvim", - url = "https://github.com/wbthomason/packer.nvim" - } -} - -time([[Defining packer_plugins]], false) - -_G._packer.inside_compile = false -if _G._packer.needs_bufread == true then - vim.cmd("doautocmd BufRead") -end -_G._packer.needs_bufread = false - -if should_profile then save_profiles() end - -end) - -if not no_errors then - error_msg = error_msg:gsub('"', '\\"') - vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') -end diff --git a/.config/vesktop/settings/quickCss.css b/.config/vesktop/settings/quickCss.css index 30318ba..48f243b 100644 --- a/.config/vesktop/settings/quickCss.css +++ b/.config/vesktop/settings/quickCss.css @@ -18,4 +18,8 @@ #app-mount > div.appAsidePanelWrapper_a3002d > div.notAppAsidePanel_a3002d > div.app_a3002d > div > div.layers__960e4.layers__160d8 > div > div > div > div.content_c48ade > div.sidebar_c48ade.theme-dark.theme-darker.images-dark > div.sidebarList_c48ade.sidebarListRounded_c48ade > nav > div.scroller__99e7c.thin__99f8c.scrollerBase__99f8c.fade__99f8c > ul > div.sectionDivider__35e86 { margin-top: 8px; +} + +#app-mount > div.appAsidePanelWrapper_a3002d > div > div.app_a3002d > div > div.layers__960e4.layers__160d8 > div > div > div > div.content_c48ade > div.sidebar_c48ade.theme-dark.theme-darker.images-dark > section > div.mask__0d616 > div { + display: none; } \ No newline at end of file diff --git a/.config/vesktop/settings/settings.json b/.config/vesktop/settings/settings.json index d34d8d0..0cdf6db 100644 --- a/.config/vesktop/settings/settings.json +++ b/.config/vesktop/settings/settings.json @@ -3,7 +3,9 @@ "autoUpdateNotification": true, "useQuickCss": true, "themeLinks": [], - "enabledThemes": [], + "enabledThemes": [ + "rose-pine.css" + ], "enableReactDevtools": false, "frameless": false, "transparent": false, @@ -665,7 +667,7 @@ "authenticated": false, "url": "https://api.vencord.dev/", "settingsSync": false, - "settingsSyncVersion": 1754415115018 + "settingsSyncVersion": 1754939753550 }, "eagerPatches": false } \ No newline at end of file