diff --git a/private_dot_config/btop/btop.conf b/private_dot_config/btop/btop.conf index 8703d41..d1914b6 100644 --- a/private_dot_config/btop/btop.conf +++ b/private_dot_config/btop/btop.conf @@ -57,7 +57,7 @@ update_ms = 2000 #* Processes sorting, "pid" "program" "arguments" "threads" "user" "memory" "cpu lazy" "cpu direct", #* "cpu lazy" sorts top process over time (easier to follow), "cpu direct" updates top process directly. -proc_sorting = "threads" +proc_sorting = "cpu direct" #* Reverse sorting order, True or False. proc_reversed = False diff --git a/private_dot_config/hypr/hyprland.conf b/private_dot_config/hypr/hyprland.conf index f565a49..b031f10 100644 --- a/private_dot_config/hypr/hyprland.conf +++ b/private_dot_config/hypr/hyprland.conf @@ -15,10 +15,6 @@ misc { middle_click_paste = false } -gestures { - workspace_swipe = false -} - # IMPORTS source = ./hyprland/binds/* diff --git a/private_dot_config/hypr/hyprland/decoration.conf b/private_dot_config/hypr/hyprland/decoration.conf index db5a75f..7e851f4 100644 --- a/private_dot_config/hypr/hyprland/decoration.conf +++ b/private_dot_config/hypr/hyprland/decoration.conf @@ -5,7 +5,7 @@ decoration { # Change transparency of focused and unfocused windows active_opacity = 1.0 - inactive_opacity = 0.90 + inactive_opacity = 1.0 shadow { enabled = true diff --git a/private_dot_config/hypr/hyprland/input.conf b/private_dot_config/hypr/hyprland/input.conf index 27fae7c..6e01eb4 100644 --- a/private_dot_config/hypr/hyprland/input.conf +++ b/private_dot_config/hypr/hyprland/input.conf @@ -2,7 +2,7 @@ input { kb_layout = pl kb_variant = kb_model = - kb_options = + kb_options = caps:escape_shifted_capslock kb_rules = follow_mouse = 1 diff --git a/private_dot_config/hypr/hyprland/monitors.conf b/private_dot_config/hypr/hyprland/monitors.conf index cb65efc..b02e0cb 100644 --- a/private_dot_config/hypr/hyprland/monitors.conf +++ b/private_dot_config/hypr/hyprland/monitors.conf @@ -1,3 +1,3 @@ -monitor = DP-1, 2560x1440@180.06, 0x0, 1, bitdepth, 10, cm, hdr +monitor = DP-1, 2560x1440@180.06, 0x0, 1, bitdepth, 10, cm, hdr, sdrbrightness, 1.3, sdrsaturation, 0.99 monitor = DP-2, 1920x1080@60, auto-left, 1 monitor = HDMI-A-2, 1920x1080@60, auto-up, 1 diff --git a/private_dot_config/nvim/lazy-lock.json b/private_dot_config/nvim/lazy-lock.json index e71b570..53454ae 100644 --- a/private_dot_config/nvim/lazy-lock.json +++ b/private_dot_config/nvim/lazy-lock.json @@ -1,30 +1,30 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "66b5c2707e624dcd2cd3605676c64a2efe47e9d1" }, - "autoclose.nvim": { "branch": "main", "commit": "509accbad0e717bdc64bda6a34f5c1b0da8d9e48" }, + "LuaSnip": { "branch": "master", "commit": "21f74f7ba8c49f95f9d7c8293b147c2901dd2d3a" }, + "autoclose.nvim": { "branch": "main", "commit": "3f86702b54a861a17d7994b2e32a7c648cb12fb1" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, - "cmp-path": { "branch": "main", "commit": "e52e640b7befd8113b3350f46e8cfcfe98fcf730" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, + "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" }, + "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, "galaxyline.nvim": { "branch": "main", "commit": "4d4f5fc8e20a10824117e5beea7ec6e445466a8f" }, - "gitsigns.nvim": { "branch": "main", "commit": "0cb5a7753d3c4b8e9cfdc9d88d9110cb8d4b1544" }, + "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "a9c876d72d82b6640266f8b248ac05a63630b1d9" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, + "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, "minimal.nvim": { "branch": "main", "commit": "22d837b814d3bd22625640ef63cc73b8507f291d" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "dbfd8da6206b4ab0e2fe9b72a538f82e2b410102" }, - "nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" }, + "nvim-lspconfig": { "branch": "master", "commit": "7de54fc6cae5080a656329a9c2f2dff03d914cdd" }, + "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-web-devicons": { "branch": "master", "commit": "0422a19d9aa3aad2c7e5cca167e5407b13407a9d" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "phpactor.nvim": { "branch": "main", "commit": "f4aba0b309f74b015f4a19a07e2befd6f1a0e6ca" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, - "undotree": { "branch": "main", "commit": "eab459ab87dd249617b5f7187bb69e614a083047" }, + "undotree": { "branch": "main", "commit": "97323394a2ab406926f79b30b472fae3ad2b0dbd" }, "vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }, "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" } } diff --git a/private_dot_config/nvim/lua/nvim_is_strange/plugins/lsp.lua b/private_dot_config/nvim/lua/nvim_is_strange/plugins/lsp.lua index 84b4039..f6a8e9f 100644 --- a/private_dot_config/nvim/lua/nvim_is_strange/plugins/lsp.lua +++ b/private_dot_config/nvim/lua/nvim_is_strange/plugins/lsp.lua @@ -27,17 +27,37 @@ return { cmp_lsp.default_capabilities() ) + + vim.diagnostic.config({ + virtual_text = { + prefix = "●", -- możesz zmienić na "▎", "x", "" itd. + spacing = 2, -- odstęp od kodu + source = "if_many", -- pokaż źródło błędu (np. rust-analyzer) + }, + signs = true, -- znaki w kolumnie po lewej + underline = true, -- podkreślenie błędnych fragmentów + update_in_insert = false, -- nie aktualizuj w trybie insert + }) + + + vim.keymap.set('n', 'ci', function() + vim.diagnostic.open_float(nil, { + focus = true, + scope = "cursor", + border = "rounded", + source = "always", + }) + end, { desc = "Pokaż diagnostykę LSP w popupie" }) + require("fidget").setup({}) require("mason").setup() require('mason-lspconfig').setup({ ensure_installed = { "lua_ls", - "intelephense", - "ts_ls", "emmet_language_server", "marksman", - "arduino_language_server", + "rust-analyzer" }, handlers = { -- config lsp function(server_name) @@ -66,25 +86,18 @@ return { }) end, - emmet_language_server = function() - require("lspconfig").emmet_language_server.setup({ - filetypes = { - "html", - "css", - "js", - "php", + rust_analyzer = function() + require('lspconfig').rust_analyzer.setup({ + settings = { + ["rust-analyzer"] = { + diagnostics = { + enable = true + } + } } }) end, - marksman = function() - require("lspconfig").marksman.setup({ - filetypes = { - "markdown", - } - }) - end - } }) diff --git a/private_dot_config/waybar/style.css b/private_dot_config/waybar/style.css index 860718f..7deea7a 100644 --- a/private_dot_config/waybar/style.css +++ b/private_dot_config/waybar/style.css @@ -1,48 +1,54 @@ -@import url("./colors.css"); +@define-color background #f5f5f5; +@define-color foreground #ffffff; +@define-color font-color #333333; +@define-color accent #7aa6c2; +@define-color accent-hover #5b8da9; +@define-color warning #f0ad4e; +@define-color critical #d9534f; +@define-color success #5cb85c; * { - transition: 2s all ease-in-out; - font-family: "Cousine Nerd Font mono"; + transition: 0.4s all ease-in-out; + font-family: "Cousine Nerd Font Mono"; font-size: 16px; padding: 2px; - margin: 1px 4px 1px 4px; + margin: 1px 4px; color: @font-color; - text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray; - border-radius: 25px; + text-shadow: none; + border-radius: 12px; } *:hover { - text-shadow: 1 1 10px black, 1 1 10px black, 1 1 10px black; + text-shadow: none; } window { - background-color: black; + background-color: @background; margin: 1px; } window#waybar { - background: @background; - border-radius: 20px; + background: @foreground; + border-radius: 12px; } /* modules */ #workspaces button { - background-color: @background; + background-color: @foreground; margin-left: 5px; - text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray; + color: @font-color; } #workspaces button:hover { - background-color: @foreground; - margin-left: 5px; - text-shadow: 1 1 5px gray, 1 1 7px gray, 1 1 10px gray; + background-color: @accent; + color: @foreground; } #workspaces button.urgent { - background-color: red; + background-color: @critical; animation: blink; - animation-duration: 5s; + animation-duration: 2s; } #clock { @@ -50,40 +56,45 @@ window#waybar { } tooltip { - background-color: black; + background-color: @foreground; + color: @font-color; } menu { - background-color: black; - border-radius: 15px; + background-color: @foreground; + border-radius: 10px; } +/* moduły */ + #media, #network, #pulseaudio, #battery { - border-radius: 25px; + border-radius: 12px; margin: 5px; + background-color: @foreground; } #tray { - background-color: @background; + background-color: @foreground; border-radius: 5px; padding: 5px; margin: 5px; } #tray:hover { - background-color: @foreground; + background-color: @accent-hover; + color: @foreground; } /* battery */ #battery.warning:not(.charging) { - background: orange; - color: white; + background: @warning; + color: @foreground; animation-name: blink; - animation-duration: 0.5s; + animation-duration: 1s; animation-timing-function: steps(12); animation-iteration-count: infinite; animation-direction: alternate; @@ -91,15 +102,15 @@ menu { #battery.charging, #battery.plugged { - color: #ffffff; - background-color: #26A65B; + color: @foreground; + background-color: @success; } #battery.critical:not(.charging) { - background-color: #f53c3c; - color: #ffffff; + background-color: @critical; + color: @foreground; animation-name: blink; - animation-duration: 0.5s; + animation-duration: 1s; animation-timing-function: steps(12); animation-iteration-count: infinite; animation-direction: alternate; @@ -112,25 +123,30 @@ menu { } } +/* spotify */ #custom-spotify { - background-color: rgba(29, 185, 84, 0.30); - color: black; + background-color: rgba(122, 166, 194, 0.2); + color: @font-color; padding: 10px; margin: 5px; border-radius: 5px; } #custom-spotify:hover { - background-color: rgba(29, 185, 84, 1); + background-color: rgba(122, 166, 194, 0.8); + color: @foreground; } +/* notifications, hardware */ #custom-notifications { border-radius: 5px; padding: 5px; - margin: 5; + margin: 5px; + background-color: @foreground; } #custom-hardware { - border-radius: 15px; + border-radius: 10px; margin: 4px; + background-color: @foreground; }