From 719edc78e6dbc7d464c2369343c713edf963fb2c Mon Sep 17 00:00:00 2001 From: Yakov Shatilov Date: Thu, 6 Mar 2025 22:45:55 +0300 Subject: [PATCH] update --- hypr/hypridle.conf | 2 +- hypr/hyprland.conf | 7 ++- hypr/hyprlock.conf | 5 ++- hypr/hyprpaper.conf | 8 ++-- nvim/lua/chadrc.lua | 9 ++++ nvim/lua/configs/lspconfig.lua | 78 +--------------------------------- nvim/lua/plugins/init.lua | 16 +++---- 7 files changed, 32 insertions(+), 93 deletions(-) diff --git a/hypr/hypridle.conf b/hypr/hypridle.conf index 5a9e54f..360916c 100644 --- a/hypr/hypridle.conf +++ b/hypr/hypridle.conf @@ -16,7 +16,7 @@ listener { } listener { - timeout = 300 # 5min + timeout = 420 # 7min on-timeout = hyprctl dispatch dpms off # screen off when timeout has passed on-resume = hyprctl dispatch dpms on # screen on when activity is detected after timeout has fired. } diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 4869e21..a91aeec 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -6,8 +6,8 @@ autogenerated = 0 # remove this line to remove the warning # See https://wiki.hyprland.org/Configuring/Monitors/ -monitor=eDP-1,1920x1080@60,auto,1.333333 -# monitor=eDP-1,1920x1080@60,auto,1 +# monitor=eDP-1,1920x1080@60,auto,1.333333 +monitor=eDP-1,1920x1080@60,auto,1 # monitor=eDP-1,disable monitor=HDMI-A-1,2560x1440@144,auto,1 # monitor=HDMI-A-1,1920x1080@60,auto,1 @@ -25,6 +25,7 @@ $fileManager = nemo $menu = wofi --show drun $screenlock = hyprlock $hide_waybar = killall -SIGUSR1 waybar +$sleep = systemctl suspend # Some default env vars. env = XCURSOR_SIZE,24 @@ -207,6 +208,8 @@ bind = CTRL ALT, right, workspace, e+1 bind = CTRL ALT, left, workspace, e-1 # screenlock bind = $mainMod, L, exec, $screenlock +# sleep +bind = $mainMod SHIFT, L, exec, $sleep # tab workspaces bind = $mainMod, TAB, workspace, e+1 # Fullscreen mode diff --git a/hypr/hyprlock.conf b/hypr/hyprlock.conf index 81f39a5..38a722e 100644 --- a/hypr/hyprlock.conf +++ b/hypr/hyprlock.conf @@ -9,7 +9,7 @@ widget_name { background { monitor = - path = ~/Pictures/wallpapers/flowers3.jpg + path = ~/Pictures/wallpapers/carter-obasohan-5WhZV-CvJZw-unsplash.jpg # color = rgba(25, 20, 20, 1.0) # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations @@ -68,7 +68,8 @@ input-field { label { monitor = text = [$TIME] - color = rgba(200, 200, 200, 1.0) + # color = rgba(200, 200, 200, 1.0) + color = rgba(6, 19, 54, 1.0) font_size = 46 font_family = Noto Sans diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf index 0720121..cc8a659 100644 --- a/hypr/hyprpaper.conf +++ b/hypr/hyprpaper.conf @@ -1,8 +1,8 @@ -# preload = /usr/share/backgrounds/manjaro/beehive4k-d.png -preload = /home/yash/Pictures/wallpapers/flowers3.jpg +#preload = /home/yash/Pictures/wallpapers/flowers3.jpg +preload = /home/yash/Pictures/wallpapers/carter-obasohan-5WhZV-CvJZw-unsplash.jpg -wallpaper = eDP-1,/home/yash/Pictures/wallpapers/flowers3.jpg -wallpaper = HDMI-A-1,/home/yash/Pictures/wallpapers/flowers3.jpg +wallpaper = eDP-1,/home/yash/Pictures/wallpapers/carter-obasohan-5WhZV-CvJZw-unsplash.jpg +wallpaper = HDMI-A-1,/home/yash/Pictures/wallpapers/carter-obasohan-5WhZV-CvJZw-unsplash.jpg splash = false diff --git a/nvim/lua/chadrc.lua b/nvim/lua/chadrc.lua index 73a45fc..b8bfb6d 100644 --- a/nvim/lua/chadrc.lua +++ b/nvim/lua/chadrc.lua @@ -18,4 +18,13 @@ M.ui = { -- }, } +-- M.mason.pkgs = { +-- "lua-language-server", +-- "clangd", +-- "clang-format", +-- "stylua", +-- "gopls", +-- "golangci-lint", +-- } + return M diff --git a/nvim/lua/configs/lspconfig.lua b/nvim/lua/configs/lspconfig.lua index c278190..b2438d6 100644 --- a/nvim/lua/configs/lspconfig.lua +++ b/nvim/lua/configs/lspconfig.lua @@ -5,33 +5,6 @@ local capabilities = require("nvchad.configs.lspconfig").capabilities local lspconfig = require "lspconfig" - --- local servers = { "gopls" } - --- lsps with default config --- for _, lsp in ipairs(servers) do --- lspconfig[lsp].setup { --- on_attach = on_attach, --- on_init = on_init, --- capabilities = capabilities, --- } --- end - - --- local gopls_on_attach = function(client, bufnr) --- if client.supports_method("textDocument/inlayHint") then --- vim.lsp.inlay_hint.enable(true, { --- assignVariableTypes = true, --- compositeLiteralFields = true, --- compositeLiteralTypes = true, --- constantValues = true, --- functionTypeParameters = true, --- parameterNames = true, --- rangeVariableTypes = true, --- }) --- end --- end - lspconfig.gopls.setup({ on_attach = on_attach, on_init = on_init, @@ -49,53 +22,6 @@ lspconfig.gopls.setup({ lspconfig.clangd.setup{} +lspconfig.lua_ls.setup{} + -- lspconfig.pyright.setup{} - --- lspconfig.html.setup({ --- on_attach = on_attach, --- capabilities = capabilities, --- filetypes = { "html", "templ" }, --- }) - --- lspconfig.htmx.setup({ --- on_attach = on_attach, --- capabilities = capabilities, --- filetypes = { "html", "templ" }, --- }) - -lspconfig.templ.setup({ - on_attach = on_attach, - capabilities = capabilities, - filetypes = { "templ" }, -}) - -lspconfig.tailwindcss.setup({ - on_attach = on_attach, - capabilities = capabilities, - filetypes = { "templ" }, - settings = { - tailwindCSS = { - includeLanguages = { - templ = "html", - }, - }, - }, -}) - - -local templ_format = function() - local bufnr = vim.api.nvim_get_current_buf() - local filename = vim.api.nvim_buf_get_name(bufnr) - local cmd = "templ fmt " .. vim.fn.shellescape(filename) - - vim.fn.jobstart(cmd, { - on_exit = function() - -- Reload the buffer only if it's still the current buffer - if vim.api.nvim_get_current_buf() == bufnr then - vim.cmd('e!') - end - end, - }) -end - -vim.api.nvim_create_autocmd({ "BufWritePre" }, { pattern = { "*.templ" }, callback = templ_format }) diff --git a/nvim/lua/plugins/init.lua b/nvim/lua/plugins/init.lua index 9e109bd..fabb86a 100644 --- a/nvim/lua/plugins/init.lua +++ b/nvim/lua/plugins/init.lua @@ -45,14 +45,14 @@ return { { "williamboman/mason.nvim", opts = { - ensure_installed = { - "lua-language-server", - "clangd", - "clang-format", - "stylua", - "gopls", - "golangci-lint", - }, + -- ensure_installed = { + -- "lua-language-server", + -- "clangd", + -- "clang-format", + -- "stylua", + -- "gopls", + -- "golangci-lint", + -- }, }, }, {