From cc368399ef2c8f7c998004dd9d9c5de87c98156c Mon Sep 17 00:00:00 2001 From: fbachus Date: Mon, 2 Feb 2026 00:09:11 +0100 Subject: [PATCH] feat/cleanup: some january updates - do not commit lock files - add script connection to waybar (script not yet in this repo) - delay some loading in nvim - update niri to use swaylock and swayidle - add some niri windowrules for default window widths - update paru to offer choice for what to update --- .config/niri/binds.kdl | 2 +- .config/niri/config.kdl | 4 +- .config/niri/windowrules.kdl | 37 +++++++++++++++++- .config/nvim/lazy-lock.json | 50 ++++++++++++++++++++++++ .config/nvim/lua/plugins/lsp_config.lua | 3 +- .config/nvim/lua/plugins/peanuts.lua | 10 ++++- .config/nvim/lua/plugins/snacks.nvim.lua | 21 ++++++++++ .config/nvim/lua/plugins/telescope.lua | 2 +- .config/nvim/lua/plugins/which_key.lua | 4 ++ .config/paru/paru.conf | 7 ++-- .config/swayidle.conf | 6 +++ .config/waybar/config | 1 + .gitignore | 1 - 13 files changed, 137 insertions(+), 11 deletions(-) create mode 100644 .config/nvim/lazy-lock.json create mode 100644 .config/nvim/lua/plugins/snacks.nvim.lua create mode 100644 .config/swayidle.conf diff --git a/.config/niri/binds.kdl b/.config/niri/binds.kdl index ab1cf73..7670600 100644 --- a/.config/niri/binds.kdl +++ b/.config/niri/binds.kdl @@ -24,7 +24,7 @@ binds { Mod+Alt+B { spawn "~/.config/hypr/tofi_scripts/brightnessmenu.sh"; } // Super+Alt+L { spawn "swaylock"; } Mod+Shift+F11 { toggle-windowed-fullscreen; } - Mod+F12 { spawn "hyprlock"; } + Mod+F12 { spawn-sh "swaylock --grace 10 --ignore-empty-password --indicator --clock --timestr %H:%M --datestr '' --screenshot --effect-blur 5x3 --font hurmit-nf --inside-color 00000000 --line-color 00000000 --ring-color 00ff99 --key-hl-color 066dff"; } Mod+E { spawn "dolphin"; } // You can also use a shell. Do this if you need pipes, multiple commands, etc. diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl index 0c85bd1..fe4095e 100644 --- a/.config/niri/config.kdl +++ b/.config/niri/config.kdl @@ -1,5 +1,7 @@ spawn-at-startup "waybar" spawn-sh-at-startup "swaybg -m fit -i ~/Pictures/backgrounds/hibiscus-flowers-5k-5120x2880-16240.jpg" +spawn-sh-at-startup "swaydidle -w -C ~/.config/swayidle.conf" +spawn-sh-at-startup "amixer set 'Mic Boost (+20dB)' on" spawn-at-startup "dunst" spawn-at-startup "kwalletd6" spawn-at-startup "polkit-kde-authentication-agent-1" @@ -127,7 +129,7 @@ layout { } // You can change the default width of the new windows. - default-column-width { proportion 0.667; } + default-column-width { proportion 0.5; } // If you leave the brackets empty, the windows themselves will decide their initial width. // default-column-width {} diff --git a/.config/niri/windowrules.kdl b/.config/niri/windowrules.kdl index f4ee524..cb7befa 100644 --- a/.config/niri/windowrules.kdl +++ b/.config/niri/windowrules.kdl @@ -36,18 +36,51 @@ window-rule { } } +// browsers in full width +window-rule { + match app-id="^zen$" + match app-id="^vivaldi-stable$" + exclude title="^Vivaldi$" + exclude title="^Vivaldi - login - Vivaldi$" + exclude title="^Bitwarden - Vivaldi$" + + default-column-width { proportion 1.0; } +} + +// terminal doesn't need to be big +window-rule { + match app-id="^Alacritty$" + default-column-width { proportion 0.333; } +} + window-rule { match app-id="^Slack$" + match app-id="^org.telegram.desktop$" + match app-id="^ZapZap$" match app-id="^discord$" + + block-out-from "screencast" + open-on-workspace "Comms" +} + +window-rule { + match app-id="^discord$" + default-column-width { proportion 0.667; } +} + +window-rule { + match app-id="^Slack$" match app-id="^org.telegram.desktop$" match app-id="^ZapZap$" - open-on-workspace "Comms" + default-column-display "tabbed" + default-column-width { proportion 0.5; } } window-rule { match app-id="^spotify$" match app-id="^com.sayonara-player.Sayonara$" + default-column-width { proportion 0.9; } open-on-workspace "Music" } @@ -67,7 +100,7 @@ window-rule { window-rule { match title="^Friends List$" - default-window-height { proportion 0.666; } + default-window-height { proportion 0.667; } open-focused false open-on-workspace "Gaming" diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..fbdc42c --- /dev/null +++ b/.config/nvim/lazy-lock.json @@ -0,0 +1,50 @@ +{ + "color-picker.nvim": { "branch": "master", "commit": "06cb5f853535dea529a523e9a0e8884cdf9eba4d" }, + "conform.nvim": { "branch": "master", "commit": "c2526f1cde528a66e086ab1668e996d162c75f4f" }, + "coq.artifacts": { "branch": "artifacts", "commit": "ef5f21d638ccc456cfa5b8d0ab37093cefe48c8b" }, + "coq_nvim": { "branch": "coq", "commit": "d939a34ceb2b57d2937890337a4aa75eb55e18a8" }, + "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" }, + "everforest": { "branch": "main", "commit": "557bce922401e247a596583679bc181d4d688554" }, + "fzf-lua": { "branch": "main", "commit": "b4b1f05957a77f7662de834328827890c1a8c02b" }, + "gitsigns.nvim": { "branch": "main", "commit": "abf82a65f185bd54adc0679f74b7d6e1ada690c9" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, + "markview.nvim": { "branch": "main", "commit": "86ce3fe623fe54319a1f1d4ce6b861219c95b151" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "c953789db7fd28eafe5eb5659846d34b5024b3cc" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "9a10e096703966335bd5c46c8c875d5b0690dade" }, + "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, + "mini.nvim": { "branch": "main", "commit": "9b935c218ddba02e5dc75c94f90143bce1f7c646" }, + "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, + "nvim-dap": { "branch": "master", "commit": "e47878dcf1ccc30136b30d19ab19fe76946d61cd" }, + "nvim-dap-go": { "branch": "main", "commit": "b4421153ead5d726603b02743ea40cf26a51ed5f" }, + "nvim-dap-python": { "branch": "master", "commit": "1808458eba2b18f178f990e01376941a42c7f93b" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, + "nvim-lint": { "branch": "master", "commit": "bcd1a44edbea8cd473af7e7582d3f7ffc60d8e81" }, + "nvim-lspconfig": { "branch": "master", "commit": "3f58aeca0c6ece8a9fb8782ea3fcb6024f285be3" }, + "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, + "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, + "nvim-possession": { "branch": "main", "commit": "fa1a37ffcba9e8d708192ebb4b031b53679f0246" }, + "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, + "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "5ca4aaa6efdcc59be46b95a3e876300cfead05ef" }, + "nvim-web-devicons": { "branch": "master", "commit": "803353450c374192393f5387b6a0176d0972b848" }, + "obsidian.nvim": { "branch": "main", "commit": "dacdbd8b08862ddbb8e9d384ddba6c428aef4428" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" }, + "smart-open.nvim": { "branch": "0.3.x", "commit": "918c97cac0c33f7a116a822df144bc5bbefa4490" }, + "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, + "sqlite.lua": { "branch": "master", "commit": "50092d60feb242602d7578398c6eb53b4a8ffe7b" }, + "store.nvim": { "branch": "main", "commit": "a32c8972c4f4b52de12393df904a477f182c467a" }, + "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, + "telescope.nvim": { "branch": "master", "commit": "ad7d9580338354ccc136e5b8f0aa4f880434dcdc" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, + "typr": { "branch": "main", "commit": "584e4ef34dea25a4035627794322f315b22d1253" }, + "undotree": { "branch": "main", "commit": "f68aed28c8ff1294b012dfadaced2084dc045870" }, + "virtual-types.nvim": { "branch": "master", "commit": "d652ec0b1781bbb0e83dc588fb62d638006cf61e" }, + "volt": { "branch": "main", "commit": "620de1321f275ec9d80028c68d1b88b409c0c8b1" }, + "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, + "wilder.nvim": { "branch": "master", "commit": "679f348dc90d80ff9ba0e7c470c40a4d038dcecf" } +} diff --git a/.config/nvim/lua/plugins/lsp_config.lua b/.config/nvim/lua/plugins/lsp_config.lua index 9ed6936..1148ec9 100644 --- a/.config/nvim/lua/plugins/lsp_config.lua +++ b/.config/nvim/lua/plugins/lsp_config.lua @@ -27,6 +27,7 @@ return { enable = true, }, ensure_installed = { + "bash", "html", "javascript", "gdscript", @@ -127,7 +128,7 @@ return { vim.keymap.set("n", "K", vim.lsp.buf.hover, opts) vim.keymap.set("n", "wa", vim.lsp.buf.add_workspace_folder, opts) vim.keymap.set("n", "wr", vim.lsp.buf.remove_workspace_folder, opts) - vim.keymap.set("n", "F", function() vim.lsp.buf.format({ async = true }) end, opts) + -- vim.keymap.set("n", "F", function() vim.lsp.buf.format({ async = true }) end, opts) end, }) end, diff --git a/.config/nvim/lua/plugins/peanuts.lua b/.config/nvim/lua/plugins/peanuts.lua index 99cf4e1..b092022 100644 --- a/.config/nvim/lua/plugins/peanuts.lua +++ b/.config/nvim/lua/plugins/peanuts.lua @@ -127,7 +127,7 @@ return { }, { "lewis6991/gitsigns.nvim", - lazy = false, + event = "UIEnter", opts = { signs = { add = { text = "│" }, @@ -178,5 +178,13 @@ return { { "ibhagwan/fzf-lua", opts = {}, + event = "VeryLazy", + config = { + fzf_colors = true, + borderless, + skim, + telescope, + }, + -- keys = { "", mode = { "n" }, "FzfLua", desc = "FzfLua" }, }, } diff --git a/.config/nvim/lua/plugins/snacks.nvim.lua b/.config/nvim/lua/plugins/snacks.nvim.lua new file mode 100644 index 0000000..90fca48 --- /dev/null +++ b/.config/nvim/lua/plugins/snacks.nvim.lua @@ -0,0 +1,21 @@ +return { + "folke/snacks.nvim", + priority = 1000, + lazy = false, + ---@type snacks.Config + opts = { + animate = { enabled = true }, + bigfile = { enabled = false }, + dashboard = { enabled = false }, + explorer = { enabled = false }, + indent = { enabled = false }, + input = { enabled = false }, + notifier = { enabled = true, timeout = 3000 }, + picker = { enabled = false }, + quickfile = { enabled = true }, + scope = { enabled = false }, + scroll = { enabled = true }, + statuscolumn = { enabled = true }, + words = { enabled = false }, + }, +} diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index 43cf8ff..f6f78c6 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -1,7 +1,6 @@ return { { "nvim-telescope/telescope.nvim", - tag = "0.1.2", lazy = true, keys = { { "", mode = { "n" }, "Telescope smart_open", desc = "smart_open" }, @@ -72,6 +71,7 @@ return { -- faster and better matching than fzf { "nvim-telescope/telescope-fzy-native.nvim", + event = "VeryLazy", config = function() require("telescope").load_extension("fzy_native") end, }, { "kkharji/sqlite.lua", lazy = true }, diff --git a/.config/nvim/lua/plugins/which_key.lua b/.config/nvim/lua/plugins/which_key.lua index 1ff551d..a07d44b 100644 --- a/.config/nvim/lua/plugins/which_key.lua +++ b/.config/nvim/lua/plugins/which_key.lua @@ -48,6 +48,10 @@ return { { "fr", "Telescope oldfiles", desc = "Open Recent File", remap = true }, { "fs", "Telescope live_grep", desc = "Live Grep" }, { "fw", "Telescope grep_string", desc = "Find string under cursor" }, + + { "F", mode = { "n" }, "FzfLua", desc = "FzfLua" }, + -- { "", mode = { "n" }, "FzfLua", desc = "FzfLua" }, + { "", function() require("telescope").extensions.smart_open.smart_open() end, diff --git a/.config/paru/paru.conf b/.config/paru/paru.conf index 619f03c..487e63d 100644 --- a/.config/paru/paru.conf +++ b/.config/paru/paru.conf @@ -8,10 +8,11 @@ BottomUp Devel DevelSuffixes = -git -cvs -svn -bzr -darcs -always -hg -fossil -Limit = 50 -NewsOnUpgrade +# NewsOnUpgrade PgpFetch -Provides +# Provides SaveChanges UpgradeMenu UseAsk + +Limit = 50 diff --git a/.config/swayidle.conf b/.config/swayidle.conf new file mode 100644 index 0000000..fb509c0 --- /dev/null +++ b/.config/swayidle.conf @@ -0,0 +1,6 @@ +timeout 300 'swaylock --grace 10 --ignore-empty-password --indicator --clock --timestr %H:%M --datestr "" --screenshot --effect-blur 5x3 --font hurmit-nf --inside-color 00000000 --line-color 00000000 --ring-color 00ff99 --key-hl-color 066dff' +timeout 600 'niri msg action power-off-monitors' +after-resume 'niri msg action power-on-monitors' +before-sleep 'swaylock --grace 10 --ignore-empty-password --indicator --clock --timestr %H:%M --datestr "" --screenshot --effect-blur 5x3 --font hurmit-nf --inside-color 00000000 --line-color 00000000 --ring-color 00ff99 --key-hl-color 066dff' + + diff --git a/.config/waybar/config b/.config/waybar/config index 3a24ffb..2fe6e3d 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -141,6 +141,7 @@ }, "on-click": "pavucontrol-qt -t 3", "on-click-middle": "amixer set Master Playback Switch toggle --quiet", + "on-click-right": "~/Code/scripts/pipewire-switch-outputs-templar", }, "idle_inhibitor": { "format": "{icon}", diff --git a/.gitignore b/.gitignore index ba69242..e99e894 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,3 @@ history.txt *lock* .env* *typrstats -*-lock*