diff --git a/private_dot_config/niri/binds.kdl b/private_dot_config/niri/binds.kdl index 6a8fbbd..07e8428 100644 --- a/private_dot_config/niri/binds.kdl +++ b/private_dot_config/niri/binds.kdl @@ -11,8 +11,14 @@ binds { Mod+O repeat=false { toggle-overview; } Mod+W repeat=false { close-window; } + // DMS. + Mod+V { spawn "dms" "ipc" "call" "clipboard" "toggle"; } + Mod+P { spawn "dms" "ipc" "call" "processlist" "focusOrToggle"; } + Mod+N { spawn "dms" "ipc" "call" "notifications" "toggle"; } + Mod+S { spawn "dms" "ipc" "call" "notepad" "toggle"; } + Mod+Space { spawn "dms" "ipc" "call" "spotlight" "toggle"; } + Mod+Return { spawn "alacritty"; } - Mod+Space { spawn "fuzzel"; } Mod+F { spawn-sh "uwsm app -- nautilus --new-window"; } Mod+B { spawn "chromium"; } Mod+D { spawn "vesktop"; } diff --git a/private_dot_config/niri/config.kdl b/private_dot_config/niri/config.kdl index 20a3124..62a9ee4 100644 --- a/private_dot_config/niri/config.kdl +++ b/private_dot_config/niri/config.kdl @@ -7,6 +7,12 @@ include "windowrules.kdl" include "startup.kdl" include "recentwindows.kdl" +environment { + QT_QPA_PLATFORM "wayland" + QT_QPA_PLATFORMTHEME "gtk3" + ELECTRON_OZONE_PLATFORM_HINT "auto" +} + // https://yalter.github.io/niri/Configuration:-Layout layout { gaps 5 diff --git a/private_dot_config/niri/startup.kdl b/private_dot_config/niri/startup.kdl index bd37942..4700b2e 100644 --- a/private_dot_config/niri/startup.kdl +++ b/private_dot_config/niri/startup.kdl @@ -1,6 +1,6 @@ hotkey-overlay { skip-at-startup; } -spawn-sh-at-startup "waybar -c ~/.config/waybar/config.jsonc" -spawn-at-startup "~/.config/niri/overview-listener" -spawn-sh-at-startup "swaybg -c 3B224C" +// spawn-at-startup "~/.config/niri/overview-listener" +spawn-at-startup "dms" "run" spawn-sh-at-startup "wl-clip-persist --clipboard regular -all-mime-type-regex '^(?!x-kde-passwordManagerHint).+'" +spawn-at-startup "bash" "-c" "wl-paste --watch cliphist store &" diff --git a/private_dot_config/niri/windowrules.kdl b/private_dot_config/niri/windowrules.kdl index af3229a..4d36d8c 100644 --- a/private_dot_config/niri/windowrules.kdl +++ b/private_dot_config/niri/windowrules.kdl @@ -44,3 +44,8 @@ window-rule { default-column-width {} default-window-height {} } + +window-rule { + match app-id=r#"org.quickshell$"# + open-floating true +} diff --git a/private_dot_config/nvim/lazy-lock.json b/private_dot_config/nvim/lazy-lock.json index eb996ae..ea86f3e 100644 --- a/private_dot_config/nvim/lazy-lock.json +++ b/private_dot_config/nvim/lazy-lock.json @@ -21,12 +21,12 @@ "nvim-scissors": { "branch": "main", "commit": "659627e50af4d26ccbde6cf891a849814a919337" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-context": { "branch": "master", "commit": "660861b1849256398f70450afdf93908d28dc945" }, - "obsidian.nvim": { "branch": "main", "commit": "2cd08b58cd651aadc07aba126d0b2025d9217957" }, "oil.nvim": { "branch": "master", "commit": "7e1cd7703ff2924d7038476dcbc04b950203b902" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "render-markdown.nvim": { "branch": "main", "commit": "6e0e8902dac70fecbdd8ce557d142062a621ec38" }, "roslyn.nvim": { "branch": "main", "commit": "e2901d86d7c1702b88c02b9616802845dc6d49f8" }, "tmux.nvim": { "branch": "main", "commit": "2c1c3be0ef287073cef963f2aefa31a15c8b9cd8" }, + "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "vim-easy-align": { "branch": "master", "commit": "9815a55dbcd817784458df7a18acacc6f82b1241" }, "vim-sleuth": { "branch": "master", "commit": "be69bff86754b1aa5adcbb527d7fcd1635a84080" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" }, diff --git a/private_dot_config/nvim/lua/plugin/04_fzflua.lua b/private_dot_config/nvim/lua/plugin/04_fzflua.lua index 4ca643e..a0985b8 100644 --- a/private_dot_config/nvim/lua/plugin/04_fzflua.lua +++ b/private_dot_config/nvim/lua/plugin/04_fzflua.lua @@ -1,16 +1,21 @@ return { { "ibhagwan/fzf-lua", - dependencies = { { "nvim-mini/mini.icons" } }, - opts = { - winopts = { - preview = { - vertical = "down:65%", - flip_columns = 120, + dependencies = { { "nvim-mini/mini.icons" }, { "folke/trouble.nvim" } }, + opts = function(_, _) + local config = require("fzf-lua.config") + local actions = require("trouble.sources.fzf").actions + config.defaults.actions.files["ctrl-t"] = actions.open + return { + winopts = { + preview = { + vertical = "down:65%", + flip_columns = 120, + }, }, - }, - files = { git_icons = true }, - }, + files = { git_icons = true }, + } + end, -- stylua: ignore keys = { { 'f"', "FzfLua registers", mode = { "n" }, desc = "fzf registers" }, diff --git a/private_dot_local/bin/executable_make-pwa b/private_dot_local/bin/executable_make-pwa index e5b82aa..39fadaf 100644 --- a/private_dot_local/bin/executable_make-pwa +++ b/private_dot_local/bin/executable_make-pwa @@ -56,24 +56,19 @@ case "$ACTION" in if [ -z "$ICON_PATH" ]; then ICON_BASENAME="web-browser" else - # Remove extension for .desktop Icon field if it's a PNG in ICON_DIR - if [[ "$ICON_PATH" == "$ICON_DIR"/*.png ]]; then - ICON_BASENAME="$(basename "$ICON_PATH" .png)" - else - ICON_BASENAME="$ICON_PATH" - fi + ICON_BASENAME="$ICON_PATH" fi fi mkdir -p "$DESKTOP_DIR" cat > "$DESKTOP_FILE" <