diff --git a/config/niri/config.kdl b/config/niri/config.kdl index 3c55536..18b82ad 100644 --- a/config/niri/config.kdl +++ b/config/niri/config.kdl @@ -34,8 +34,8 @@ output "HDMI-A-1" { } output "eDP-1" { - off - scale 2 + //off + scale 1 transform "normal" position x=1280 y=0 } diff --git a/config/nvim/init.lua b/config/nvim/init.lua index e4d01e0..f1f3633 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -7,3 +7,4 @@ require("plugins/treesitter") --require("plugins/whichkey") require("config") require("plugins/render-markdown") +require("nvim-toggler").setup() diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 6409153..ae6a39d 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -8,7 +8,7 @@ "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" }, "comfy-line-numbers.nvim": { "branch": "main", "commit": "31e2f9287b4491ad72defb9e0185eb2739983799" }, "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" }, - "lazy.nvim": { "branch": "main", "commit": "202d8e92b3a74ac88eb3a7f1e40fb59b4c2a6535" }, + "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" }, "lsp_signature.nvim": { "branch": "master", "commit": "d50e40b3bf9324128e71b0b7e589765ce89466d2" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, @@ -19,6 +19,7 @@ "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" }, "nvim-numbertoggle": { "branch": "main", "commit": "923f9709989605fe2bc4b9de8a3625fa808f5cd6" }, + "nvim-toggler": { "branch": "main", "commit": "467808600882fd6c9e33b9dbc4889b1b80cfd917" }, "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" }, @@ -28,6 +29,7 @@ "telescope-undo.nvim": { "branch": "main", "commit": "928d0c2dc9606e01e2cc547196f48d2eaecf58e5" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, + "twilight.nvim": { "branch": "main", "commit": "664e752f4a219801265cc3fc18782b457b58c1e1" }, "typst-preview.nvim": { "branch": "master", "commit": "e544812bba84b4f7976590f2b6c0dfbd099e1893" }, "vim-vsnip": { "branch": "master", "commit": "0a4b8419e44f47c57eec4c90df17567ad4b1b36e" } } diff --git a/config/nvim/lua/plugins/lazy/plugins.lua b/config/nvim/lua/plugins/lazy/plugins.lua index 408b7a5..17aea2e 100644 --- a/config/nvim/lua/plugins/lazy/plugins.lua +++ b/config/nvim/lua/plugins/lazy/plugins.lua @@ -76,5 +76,28 @@ return { }, "sitiom/nvim-numbertoggle", "mluders/comfy-line-numbers.nvim", + { + "folke/twilight.nvim", + opts = { + dimming = { + alpha = 0.35, + color = { "Normal" }, + term_bg = "#282828", + inactive = false, + }, + context = 15, + treesitter = true, + expand = { + "function", + "method", + "table", + "if_statement", + }, + exclude = { + "md", + }, + }, + }, + "nguyenvukhang/nvim-toggler", }, } diff --git a/config/starship.toml b/config/starship.toml index 8ecd6dd..cff67bf 100644 --- a/config/starship.toml +++ b/config/starship.toml @@ -1,33 +1,33 @@ format = """ -[](#1e1e1e)\ +[](#1d2021)\ $os\ $username\ -[](bg:#444444 fg:#1e1e1e)\ +[](bg:#3c3836 fg:#1d2021)\ $directory\ -[](fg:#444444 bg:#2e2e2e)\ +[](fg:#3c3836 bg:#2a2a2a)\ $all_langs\ -[](fg:#2e2e2e bg:#1e1e1e)\ -$docker_context\ -[](fg:#1e1e1e bg:#454545)\ +[](fg:#2a2a2a bg:#1d2021)\ +$git_branch\ +[](fg:#1d2021 bg:#4a4a4a)\ $time\ -[ ](fg:#454545)\ +[ ](fg:#4a4a4a)\ """ add_newline = false [username] show_always = true -style_user = "bg:#1e1e1e fg:#a5a3a3" -style_root = "bg:#1e1e1e fg:#ff5555" +style_user = "bg:#1d2021 fg:#bdae93" +style_root = "bg:#1d2021 fg:#fb4934" format = '[$user]($style)' disabled = false [os] -style = "bg:#1e1e1e fg:#dddddd" +style = "bg:#1d2021 fg:#bdae93" disabled = true [directory] -style = "fg:#a5a3a3 bg:#444444" +style = "fg:#bdae93 bg:#3c3836" format = "[ $path ]($style)" truncation_length = 3 truncation_symbol = "…/" @@ -37,3 +37,8 @@ truncation_symbol = "…/" "Music" = " " "Pictures" = " " + +[git_branch] +symbol = " " +style = "bg:#1d2021 fg:#bdae93" +format = "[ $symbol$branch ]($style)" diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc index b0d7b01..fb764c5 100644 --- a/config/waybar/config.jsonc +++ b/config/waybar/config.jsonc @@ -9,6 +9,7 @@ ], "modules-right": [ "clock", + "battery", "pulseaudio", "network" ], @@ -82,8 +83,8 @@ "format": "{}" }, "network": { - "interface": "eno1", -// "interface": "wlo1", + "interface": "wlo1", +// "interface": "eno1", "format-wifi": "WLAN {essid}", "format-ethernet": "ETH {ipaddr}/{cidr}", "format-disconnected": "disconnected", @@ -93,22 +94,15 @@ "on-click": "sh -c 'ip addr show eno1 | grep \"inet \" | awk \"{print \\$2}\" | sed \"s#/.*##\" | wl-copy'" }, "battery": { - "format": "{icon}: {capacity}%", + "format": "BAT {capacity}%", "interval": 10, "states": { "warning": 20, "critical": 10 }, "format-time": "{H}:{m}", - "format-icons": [ - "", - "", - "", - "", - "" - ], - "format-charging": "{icon} +: {capacity}%", - "format-discharging": "{icon} -: {capacity}%", + "format-charging": "BAT {capacity}%", + "format-discharging": "BAT {capacity}%", "tooltip-format": "{power}W, {cycles} cycles" } }