diff --git a/aerc/.config/aerc/accounts.conf b/aerc/.config/aerc/accounts.conf index b49c0ed..5fb25ae 100644 --- a/aerc/.config/aerc/accounts.conf +++ b/aerc/.config/aerc/accounts.conf @@ -12,22 +12,24 @@ aliases = pw@liphlink.xyz,p.waibel@liphlink.xyz,philipp.waibel@liphlink.xyz [phil_notmuch] source = notmuch://~/Mail/phil query-map = ~/.config/aerc/notmuch-queries.conf -outgoing = smtp://phil%40liphlink.xyz@mail.liphlink.xyz:587 -outgoing-cred-cmd = pass show mail/phil@liphlink.xyz +# outgoing = smtp://phil%40liphlink.xyz@mail.liphlink.xyz:587 +# outgoing-cred-cmd = pass show mail/phil@liphlink.xyz from = Phil default = Inbox +# copy-to = Sent +postpone = Drafts aliases = pw@liphlink.xyz,p.waibel@liphlink.xyz,philipp.waibel@liphlink.xyz [spam_live] - source = imaps://spam%40liphlink.xyz:ANZ6JJPBiB7k1c7k@mail.liphlink.xyz:993 - outgoing = smtp://spam%40liphlink.xyz:ANZ6JJPBiB7k1c7k@mail.liphlink.xyz:587 - default = INBOX - from = Liph - copy-to = Sent - archive = Archive - postpone = Drafts - folders-sort = INBOX,Drafts,Sent,Archive,Spam,Trash - aliases = blue@liphlink.xyz,red@liphlink.xyz +source = imaps://spam%40liphlink.xyz:ANZ6JJPBiB7k1c7k@mail.liphlink.xyz:993 +outgoing = smtp://spam%40liphlink.xyz:ANZ6JJPBiB7k1c7k@mail.liphlink.xyz:587 +default = INBOX +from = Liph +copy-to = Sent +archive = Archive +postpone = Drafts +folders-sort = INBOX,Drafts,Sent,Archive,Spam,Trash +aliases = blue@liphlink.xyz,red@liphlink.xyz [spam_notmuch] source = notmuch://~/Mail/spam @@ -35,6 +37,7 @@ query-map = ~/.config/aerc/notmuch-queries.conf outgoing = smtp://spam%40liphlink.xyz@mail.liphlink.xyz:587 outgoing-cred-cmd = pass show mail/spam@liphlink.xyz from = Liph +copy-to = Sent default = Inbox aliases = blue@liphlink.xyz,red@liphlink.xyz diff --git a/hypridle/.config/hypr/hypridle.conf b/hypr/.config/hypr/hypridle.conf similarity index 100% rename from hypridle/.config/hypr/hypridle.conf rename to hypr/.config/hypr/hypridle.conf diff --git a/hyprland/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf similarity index 100% rename from hyprland/.config/hypr/hyprland.conf rename to hypr/.config/hypr/hyprland.conf diff --git a/hyprlock/.config/hypr/hyprlock.conf b/hypr/.config/hypr/hyprlock.conf similarity index 100% rename from hyprlock/.config/hypr/hyprlock.conf rename to hypr/.config/hypr/hyprlock.conf diff --git a/hyprpaper/.config/hypr/hyprpaper.conf b/hypr/.config/hypr/hyprpaper.conf similarity index 100% rename from hyprpaper/.config/hypr/hyprpaper.conf rename to hypr/.config/hypr/hyprpaper.conf diff --git a/hyprmocha/.config/hypr/mocha.conf b/hypr/.config/hypr/mocha.conf similarity index 100% rename from hyprmocha/.config/hypr/mocha.conf rename to hypr/.config/hypr/mocha.conf diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index 14ee7b1..fd5bcde 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -17,3 +17,5 @@ term xterm-256color allow_hyperlinks yes +copy_on_select yes +paste_actions confirm-if-large diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl index 6a57dcc..ce83e17 100644 --- a/niri/.config/niri/config.kdl +++ b/niri/.config/niri/config.kdl @@ -5,21 +5,20 @@ input { keyboard { xkb { - layout "ch" - variant "de_mac" - model "apple" + layout "ch" + variant "de_mac" + model "apple" } - } touchpad { tap natural-scroll } - mouse { - } + } trackpoint { + } } // x11 support for wayland @@ -30,7 +29,6 @@ environment { ELECTRON_OZONE_PLATFORM_HINT "auto" ELECTRON_ENABLE_LOGGING "1" } - output "eDP-1" { mode "1920x1080@120.030" position x=1280 y=0 @@ -43,7 +41,9 @@ layout { proportion 0.5 proportion 0.66667 } - default-column-width { proportion 0.5; } + default-column-width { + proportion 0.5 + } focus-ring { width 2 active-color "#b4befe" @@ -51,13 +51,11 @@ layout { } border { off - width 4 active-color "#eba0ac" inactive-color "#505050" urgent-color "#9b0000" } - shadow { softness 30 spread 5 @@ -65,37 +63,32 @@ layout { color "#0007" } struts { + } } - spawn-at-startup "waybar" "-c" "/home/liph/.config/niri/waybar-niri/config.jsonc" "-s" "/home/liph/.config/niri/waybar-niri/style.css" spawn-at-startup "swaync" spawn-at-startup "swww-daemon" spawn-at-startup "kitty" spawn-at-startup "librewolf" spawn-at-startup "sh" "-c" "sleep 5 && exec swayidle -w timeout 300 hyprlock timeout 600 'niri msg action power-off-monitors' resume 'niri msg action power-on-monitors' timeout 3600 'systemctl suspend'" - prefer-no-csd - gestures { hot-corners { off } } - workspace "1" workspace "2" workspace "3" workspace "4" - // Example: block out two password managers from screen capture. // (This example rule is commented out with a "/-" in front.) /-window-rule { - match app-id=r#"^org\.keepassxc\.KeePassXC$"# - match app-id=r#"^org\.gnome\.World\.Secrets$"# - block-out-from "screen-capture" +match app-id=r#"^org\.keepassxc\.KeePassXC$"# +match app-id=r#"^org\.gnome\.World\.Secrets$"# +block-out-from "screen-capture" } - // terminal window-rule window-rule { match at-startup=true app-id="kitty" @@ -106,7 +99,6 @@ window-rule { match at-startup=false app-id="kitty" clip-to-geometry true } - // browser window-rules window-rule { match at-startup=true app-id="librewolf" @@ -119,85 +111,167 @@ window-rule { match at-startup=false app-id="librewolf" clip-to-geometry true } - window-rule { match app-id="Claude" open-on-workspace "3" - default-column-width { proportion 0.6667; } + default-column-width { + proportion 0.6667 + } clip-to-geometry true } - window-rule { geometry-corner-radius 5 clip-to-geometry true } - - binds { // Mod+Shift+Slash { show-hotkey-overlay; } - Mod+Shift+L { spawn "hyprlock"; } - - Mod+Alt+P hotkey-overlay-title="Open Bitwarden" { spawn "bitwarden-desktop"; } - Mod+Alt+T hotkey-overlay-title="Open Tipp10" { spawn "tipp10"; } - Mod+Alt+V hotkey-overlay-title="Open Vial" { spawn "Vial"; } - Mod+Alt+M hotkey-overlay-title="Open Tidal" { spawn "tidal-hifi" "--ozone-platform=wayland" "--enable-features=WaylandWindowDecorations"; } - Mod+Alt+O hotkey-overlay-title="Open Obsidian" { spawn "obsidian"; } - Mod+Alt+C hotkey-overlay-title="Open Claude" { spawn "claude-desktop"; } - Mod+Alt+Z hotkey-overlay-title="Open Librewolf" { spawn "librewolf"; } - Mod+Alt+Return hotkey-overlay-title="Open Kitty" { spawn "kitty"; } - Mod+Alt+Space hotkey-overlay-title="Open Wofi" { spawn "wofi" "--show" "drun"; } + Mod+Shift+L { + spawn "hyprlock" + } + Mod+Alt+P hotkey-overlay-title="Open Bitwarden" { + spawn "bitwarden-desktop" + } + Mod+Alt+T hotkey-overlay-title="Open Tipp10" { + spawn "tipp10" + } + Mod+Alt+V hotkey-overlay-title="Open Vial" { + spawn "Vial" + } + Mod+Alt+M hotkey-overlay-title="Open Tidal" { + spawn "tidal-hifi" "--ozone-platform=wayland" "--enable-features=WaylandWindowDecorations" + } + Mod+Alt+O hotkey-overlay-title="Open Obsidian" { + spawn "obsidian" + } + Mod+Alt+C hotkey-overlay-title="Open Claude" { + spawn "claude-desktop" + } + Mod+Alt+Z hotkey-overlay-title="Open Librewolf" { + spawn "librewolf" + } + Mod+Alt+Return hotkey-overlay-title="Open Kitty" { + spawn "kitty" + } + Mod+Alt+Space hotkey-overlay-title="Open Wofi" { + spawn "wofi" "--show" "drun" + } // Brightness Controll - Mod+Ctrl+0 { spawn "sh" "-c" "~/scripts/layer_notify.sh 0"; } - Mod+Ctrl+1 { spawn "sh" "-c" "~/scripts/layer_notify.sh 1"; } - Mod+Ctrl+2 { spawn "sh" "-c" "~/scripts/layer_notify.sh 2"; } - Mod+Ctrl+3 { spawn "sh" "-c" "~/scripts/layer_notify.sh 3"; } - + Mod+Ctrl+0 { + spawn "sh" "-c" "~/scripts/layer_notify.sh 0" + } + Mod+Ctrl+1 { + spawn "sh" "-c" "~/scripts/layer_notify.sh 1" + } + Mod+Ctrl+2 { + spawn "sh" "-c" "~/scripts/layer_notify.sh 2" + } + Mod+Ctrl+3 { + spawn "sh" "-c" "~/scripts/layer_notify.sh 3" + } // Brightness controls - Mod+Ctrl+4 { spawn "sh" "-c" "~/scripts/niri_br_up.sh"; } - Mod+Ctrl+5 { spawn "sh" "-c" "~/scripts/niri_br_down.sh"; } - Mod+Ctrl+6 { spawn "sh" "-c" "~/scripts/niri_br_blue.sh"; } - Mod+Ctrl+7 { spawn "sh" "-c" "~/scripts/niri_br_reset.sh"; } - + Mod+Ctrl+4 { + spawn "sh" "-c" "~/scripts/niri_br_up.sh" + } + Mod+Ctrl+5 { + spawn "sh" "-c" "~/scripts/niri_br_down.sh" + } + Mod+Ctrl+6 { + spawn "sh" "-c" "~/scripts/niri_br_blue.sh" + } + Mod+Ctrl+7 { + spawn "sh" "-c" "~/scripts/niri_br_reset.sh" + } // Swaync Notifications - Mod+Ctrl+8 { spawn "swaync-client" "-t"; } - - Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } - - XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; } - XF86AudioLowerVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-"; } - XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } - - XF86AudioPlay allow-when-locked=true { spawn-sh "playerctl play-pause"; } - XF86AudioStop allow-when-locked=true { spawn-sh "playerctl stop"; } - XF86AudioPrev allow-when-locked=true { spawn-sh "playerctl previous"; } - XF86AudioNext allow-when-locked=true { spawn-sh "playerctl next"; } - - XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } - XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } - - Mod+O repeat=false { toggle-overview; } - - Mod+Shift+C repeat=false { close-window; } - - Mod+Left { focus-column-left; } - Mod+Down { focus-window-down; } - Mod+Up { focus-window-up; } - Mod+Right { focus-column-right; } - Mod+H { focus-column-left; } - Mod+J { focus-window-down; } - Mod+K { focus-window-up; } - Mod+L { focus-column-right; } - - Mod+Ctrl+Left { move-column-left; } - Mod+Ctrl+Down { move-window-down; } - Mod+Ctrl+Up { move-window-up; } - Mod+Ctrl+Right { move-column-right; } - Mod+Ctrl+H { move-column-left; } - Mod+Ctrl+J { move-window-down; } - Mod+Ctrl+K { move-window-up; } - Mod+Ctrl+L { move-column-right; } - + Mod+Ctrl+8 { + spawn "swaync-client" "-t" + } + Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { + spawn-sh "pkill orca || exec orca" + } + XF86AudioRaiseVolume allow-when-locked=true { + spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0" + } + XF86AudioLowerVolume allow-when-locked=true { + spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-" + } + XF86AudioMute allow-when-locked=true { + spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" + } + XF86AudioMicMute allow-when-locked=true { + spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle" + } + XF86AudioPlay allow-when-locked=true { + spawn-sh "playerctl play-pause" + } + XF86AudioStop allow-when-locked=true { + spawn-sh "playerctl stop" + } + XF86AudioPrev allow-when-locked=true { + spawn-sh "playerctl previous" + } + XF86AudioNext allow-when-locked=true { + spawn-sh "playerctl next" + } + XF86MonBrightnessUp allow-when-locked=true { + spawn "brightnessctl" "--class=backlight" "set" "+10%" + } + XF86MonBrightnessDown allow-when-locked=true { + spawn "brightnessctl" "--class=backlight" "set" "10%-" + } + Mod+O repeat=false { + toggle-overview + } + Mod+Shift+C repeat=false { + close-window + } + Mod+Left { + focus-column-left + } + Mod+Down { + focus-window-down + } + Mod+Up { + focus-window-up + } + Mod+Right { + focus-column-right + } + Mod+H { + focus-column-left + } + Mod+J { + focus-window-down + } + Mod+K { + focus-window-up + } + Mod+L { + focus-column-right + } + Mod+Ctrl+Left { + move-column-left + } + Mod+Ctrl+Down { + move-window-down + } + Mod+Ctrl+Up { + move-window-up + } + Mod+Ctrl+Right { + move-column-right + } + Mod+Ctrl+H { + move-column-left + } + Mod+Ctrl+J { + move-window-down + } + Mod+Ctrl+K { + move-window-up + } + Mod+Ctrl+L { + move-column-right + } // Mod+Shift+Down { focus-monitor-down; } // Mod+Shift+Up { focus-monitor-up; } // Mod+Shift+Right { focus-monitor-right; } @@ -205,7 +279,6 @@ binds { // Mod+Shift+J { focus-monitor-down; } // Mod+Shift+K { focus-monitor-up; } // Mod+Shift+L { focus-monitor-right; } - // Mod+Shift+Ctrl+Left { move-column-to-monitor-left; } // Mod+Shift+Ctrl+Down { move-column-to-monitor-down; } // Mod+Shift+Ctrl+Up { move-column-to-monitor-up; } @@ -214,41 +287,93 @@ binds { // Mod+Shift+Ctrl+J { move-column-to-monitor-down; } // Mod+Shift+Ctrl+K { move-column-to-monitor-up; } // Mod+Shift+Ctrl+L { move-column-to-monitor-right; } - - Mod+U { focus-workspace-down; } - Mod+I { focus-workspace-up; } - Mod+Alt+J { move-column-to-workspace-down; } - Mod+Alt+K { move-column-to-workspace-up; } - Mod+Alt+U { move-column-to-workspace-down; } - Mod+Alt+I { move-column-to-workspace-up; } - - Mod+Shift+U { move-workspace-down; } - Mod+Shift+I { move-workspace-up; } - - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } - Mod+Ctrl+WheelScrollDown cooldown-ms=150 { move-column-to-workspace-down; } - Mod+Ctrl+WheelScrollUp cooldown-ms=150 { move-column-to-workspace-up; } - - Mod+WheelScrollRight { focus-column-right; } - Mod+WheelScrollLeft { focus-column-left; } - Mod+Ctrl+WheelScrollRight { move-column-right; } - Mod+Ctrl+WheelScrollLeft { move-column-left; } - - Mod+Shift+WheelScrollDown { focus-column-right; } - Mod+Shift+WheelScrollUp { focus-column-left; } - Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } - Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } - - Mod+1 { focus-workspace 1; } - Mod+2 { focus-workspace 2; } - Mod+3 { focus-workspace 3; } - Mod+4 { focus-workspace 4; } - Mod+5 { focus-workspace 5; } - Mod+6 { focus-workspace 6; } - Mod+7 { focus-workspace 7; } - Mod+8 { focus-workspace 8; } - Mod+9 { focus-workspace 9; } + Mod+U { + focus-workspace-down + } + Mod+I { + focus-workspace-up + } + Mod+Alt+J { + move-column-to-workspace-down + } + Mod+Alt+K { + move-column-to-workspace-up + } + Mod+Alt+U { + move-column-to-workspace-down + } + Mod+Alt+I { + move-column-to-workspace-up + } + Mod+Shift+U { + move-workspace-down + } + Mod+Shift+I { + move-workspace-up + } + Mod+WheelScrollDown cooldown-ms=150 { + focus-workspace-down + } + Mod+WheelScrollUp cooldown-ms=150 { + focus-workspace-up + } + Mod+Ctrl+WheelScrollDown cooldown-ms=150 { + move-column-to-workspace-down + } + Mod+Ctrl+WheelScrollUp cooldown-ms=150 { + move-column-to-workspace-up + } + Mod+WheelScrollRight { + focus-column-right + } + Mod+WheelScrollLeft { + focus-column-left + } + Mod+Ctrl+WheelScrollRight { + move-column-right + } + Mod+Ctrl+WheelScrollLeft { + move-column-left + } + Mod+Shift+WheelScrollDown { + focus-column-right + } + Mod+Shift+WheelScrollUp { + focus-column-left + } + Mod+Ctrl+Shift+WheelScrollDown { + move-column-right + } + Mod+Ctrl+Shift+WheelScrollUp { + move-column-left + } + Mod+1 { + focus-workspace 1 + } + Mod+2 { + focus-workspace 2 + } + Mod+3 { + focus-workspace 3 + } + Mod+4 { + focus-workspace 4 + } + Mod+5 { + focus-workspace 5 + } + Mod+6 { + focus-workspace 6 + } + Mod+7 { + focus-workspace 7 + } + Mod+8 { + focus-workspace 8 + } + Mod+9 { + focus-workspace 9 + } // Mod+Ctrl+1 { move-column-to-workspace 1; } // Mod+Ctrl+2 { move-column-to-workspace 2; } // Mod+Ctrl+3 { move-column-to-workspace 3; } @@ -258,51 +383,88 @@ binds { // Mod+Ctrl+7 { move-column-to-workspace 7; } // Mod+Ctrl+8 { move-column-to-workspace 8; } // Mod+Ctrl+9 { move-column-to-workspace 9; } - - Mod+BracketLeft { consume-or-expel-window-left; } - Mod+BracketRight { consume-or-expel-window-right; } - - Mod+Comma { consume-window-into-column; } - Mod+Period { expel-window-from-column; } - - Mod+R { switch-preset-column-width; } + Mod+BracketLeft { + consume-or-expel-window-left + } + Mod+BracketRight { + consume-or-expel-window-right + } + Mod+Comma { + consume-window-into-column + } + Mod+Period { + expel-window-from-column + } + Mod+R { + switch-preset-column-width + } // Cycling through the presets in reverse order is also possible. // Mod+R { switch-preset-column-width-back; } - Mod+Shift+R { switch-preset-window-height; } - Mod+Ctrl+R { reset-window-height; } - Mod+F { maximize-column; } - Mod+Shift+F { fullscreen-window; } - - Mod+Ctrl+F { expand-column-to-available-width; } - + Mod+Shift+R { + switch-preset-window-height + } + Mod+Ctrl+R { + reset-window-height + } + Mod+F { + maximize-column + } + Mod+Shift+F { + fullscreen-window + } + Mod+Ctrl+F { + expand-column-to-available-width + } // Mod+C { center-column; } - - Mod+Ctrl+C { center-visible-columns; } - - Mod+Minus { set-column-width "-10%"; } - Mod+Equal { set-column-width "+10%"; } - + Mod+Ctrl+C { + center-visible-columns + } + Mod+Minus { + set-column-width "-10%" + } + Mod+Equal { + set-column-width "+10%" + } // Finer height adjustments when in column with other windows. - Mod+Shift+Minus { set-window-height "-10%"; } - Mod+Shift+Equal { set-window-height "+10%"; } - + Mod+Shift+Minus { + set-window-height "-10%" + } + Mod+Shift+Equal { + set-window-height "+10%" + } // Move the focused window between the floating and the tiling layout. - Mod+V { toggle-window-floating; } - Mod+Shift+V { switch-focus-between-floating-and-tiling; } - - Mod+W { toggle-column-tabbed-display; } - + Mod+V { + toggle-window-floating + } + Mod+Shift+V { + switch-focus-between-floating-and-tiling + } + Mod+W { + toggle-column-tabbed-display + } // screenshot - Mod+Alt+4 { spawn "sh" "-c" "grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png && notify-send 'Screenshot' 'Area screenshot saved'"; } + Mod+Alt+4 { + spawn "sh" "-c" "grim -g \"$(slurp)\" ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png && notify-send 'Screenshot' 'Area screenshot saved'" + } // Fullscreen and save - Mod+Alt+5 { spawn "sh" "-c" "grim ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png && notify-send -t 2000 'Screenshot' 'Fullscreen screenshot saved'"; } + Mod+Alt+5 { + spawn "sh" "-c" "grim ~/Pictures/screenshot-$(date +%Y%m%d-%H%M%S).png && notify-send -t 2000 'Screenshot' 'Fullscreen screenshot saved'" + } // Select area to clipboard - Mod+Shift+4 { spawn "sh" "-c" "grim -g \"$(slurp)\" - | wl-copy && notify-send -t 2000 'Screenshot' 'Fullscreen copied to clipboard'"; } - - Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } - - Mod+Shift+E { quit; } - Ctrl+Alt+Delete { quit; } - - Mod+Shift+P { power-off-monitors; } + Mod+Shift+4 { + spawn "sh" "-c" "grim -g \"$(slurp)\" - | wl-copy && notify-send -t 2000 'Screenshot' 'Area copied to clipboard'" + } + Mod+Escape allow-inhibiting=false { + toggle-keyboard-shortcuts-inhibit + } + Mod+Shift+E { + quit + } + Ctrl+Alt+Delete { + quit + } + Mod+Shift+P { + power-off-monitors + } } + diff --git a/niri/.config/niri/waybar-niri/config.jsonc b/niri/.config/niri/waybar-niri/config.jsonc index 1ea7023..ce0dd96 100644 --- a/niri/.config/niri/waybar-niri/config.jsonc +++ b/niri/.config/niri/waybar-niri/config.jsonc @@ -4,7 +4,7 @@ "position": "top", "height": 30, "spacing": 0, - "modules-left": ["custom/logo", "cpu", "memory", "bluetooth", "mpris"], + "modules-left": ["custom/logo", "cpu", "memory", "bluetooth"], "modules-center": ["niri/workspaces"], "modules-right": [ "tray", @@ -32,23 +32,23 @@ "default": "", }, }, - "mpris": { - "format": "DEFAULT: {player_icon} {dynamic}", - "format-paused": "DEFAULT: {status_icon} {dynamic}", - "player-icons": { - "default": "▶", - "mpv": "🎵", - }, - "status-icons": { - "paused": "⏸", - }, - }, + // "mpris": { + // "format": "DEFAULT: {player_icon} {dynamic}", + // "format-paused": "DEFAULT: {status_icon} {dynamic}", + // "player-icons": { + // "default": "▶", + // "mpv": "🎵", + // }, + // "status-icons": { + // "paused": "⏸", + // }, + // }, "tray": { "icon-size": 14, "spacing": 10, }, "clock": { - "format": "{:%I:%M:%S %p}", + "format": "{:%H:%M:%S}", "tooltip-format": "{:%Y %B}\n{calendar}", "format-alt": "{:%Y-%m-%d}", "interval": 1, @@ -75,14 +75,14 @@ "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󰂂", "󰁹"], }, "power-profiles-daemon": { - "format": "{icon}", + "format": "{icon}", "tooltip-format": "Power profile: {profile}\nDriver: {driver}", "tooltip": true, "format-icons": { - "default": "", - "performance": "", - "balanced": "", - "power-saver": "󰌪", + "default": " ", + "performance": " ", + "balanced": " ", + "power-saver": "󰌪 ", }, }, "network": { @@ -99,11 +99,11 @@ "format-source-muted": "", "format-icons": { "headphone": "", - "hands-free": "", - "headset": "", - "phone": "", - "portable": "", - "car": "", + // "hands-free": "", + // "headset": "", + // "phone": "", + // "portable": "", + // "car": "", "default": ["󰕿", "󰖀", "󰕾"], }, "on-click": "pavucontrol", diff --git a/niri/.config/niri/waybar-niri/config_1.jsonc b/niri/.config/niri/waybar-niri/config_1.jsonc new file mode 100644 index 0000000..1ea7023 --- /dev/null +++ b/niri/.config/niri/waybar-niri/config_1.jsonc @@ -0,0 +1,126 @@ +// -*- mode: jsonc -*- +{ + "layer": "top", + "position": "top", + "height": 30, + "spacing": 0, + "modules-left": ["custom/logo", "cpu", "memory", "bluetooth", "mpris"], + "modules-center": ["niri/workspaces"], + "modules-right": [ + "tray", + "power-profiles-daemon", + // "niri/language", + "pulseaudio", + "network", + "battery", + "clock", + "custom/power", + ], + "niri/workspaces": { + "format": "{icon}", + "format-icons": { + // Named workspaces + // (you need to configure them in niri) + // "1", + // "2": "2", + // "3": "3", + // "4": "4", + // "5": "5", + // "6": "6", + // Icons by state + "active": "", + "default": "", + }, + }, + "mpris": { + "format": "DEFAULT: {player_icon} {dynamic}", + "format-paused": "DEFAULT: {status_icon} {dynamic}", + "player-icons": { + "default": "▶", + "mpv": "🎵", + }, + "status-icons": { + "paused": "⏸", + }, + }, + "tray": { + "icon-size": 14, + "spacing": 10, + }, + "clock": { + "format": "{:%I:%M:%S %p}", + "tooltip-format": "{:%Y %B}\n{calendar}", + "format-alt": "{:%Y-%m-%d}", + "interval": 1, + }, + "cpu": { + "format": " {usage}%", + "tooltip": false, + "interval": 1, + }, + "memory": { + "format": " {}%", + "interval": 1, + }, + "battery": { + "interval": 1, + "states": { + "warning": 30, + "critical": 15, + }, + "format": "{icon} {capacity}%", + "format-full": "{icon} {capacity}%", + "format-charging": "󰂄 {capacity}%", + "format-plugged": "󰂄 {capacity}%", + "format-icons": ["󰁺", "󰁼", "󰁾", "󰂀", "󰂂", "󰁹"], + }, + "power-profiles-daemon": { + "format": "{icon}", + "tooltip-format": "Power profile: {profile}\nDriver: {driver}", + "tooltip": true, + "format-icons": { + "default": "", + "performance": "", + "balanced": "", + "power-saver": "󰌪", + }, + }, + "network": { + "format-wifi": "󰖩 ", + "format-ethernet": "󰈀", + "format-disconnected": "󱚵", + "format-alt": "{bandwidthDownBytes}", + "interval": 1, + }, + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": "󰝟", + "format-source": "{volume}% ", + "format-source-muted": "", + "format-icons": { + "headphone": "", + "hands-free": "", + "headset": "", + "phone": "", + "portable": "", + "car": "", + "default": ["󰕿", "󰖀", "󰕾"], + }, + "on-click": "pavucontrol", + }, + "custom/power": { + "format": "⏻", + "tooltip": false, + "on-click": "wlogout -l ~/.config/niri/wlogout/layout", + }, + "custom/logo": { + "format": "󰣇", + "on-click": "wofi --show drun", + }, + "bluetooth": { + "format": "󰂯", + "format-disabled": "󰂲", + "format-connected": "󰂱", + "on-click": "blueman-manager", + }, +} diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index a663723..74ff961 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -4,14 +4,10 @@ "R.nvim": { "branch": "main", "commit": "b7de6e6f43d79e31b077096ca0089fde85190f46" }, "barbecue": { "branch": "main", "commit": "cd7e7da622d68136e13721865b4d919efd6325ed" }, "catppuccin": { "branch": "main", "commit": "beaf41a30c26fd7d6c386d383155cbd65dd554cd" }, - "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-nvim-lua": { "branch": "main", "commit": "e3a22cb071eb9d6508a156306b102c45cd2d573d" }, - "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp-r": { "branch": "main", "commit": "70bfe8f4c062acc10266e24825439c009a0b1b89" }, - "cmp-tabnine": { "branch": "main", "commit": "c0167cdc86c15e782c5461ee62aebee89231c2ed" }, - "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" }, "dashboard-nvim": { "branch": "master", "commit": "0775e567b6c0be96d01a61795f7b64c1758262f6" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, @@ -28,7 +24,6 @@ "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" }, "luvit-meta": { "branch": "main", "commit": "0ea4ff636c5bb559ffa78108561d0976f4de9682" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "fe661093f4b05136437b531e7f959af2a2ae66c8" }, - "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" }, "neo-tree.nvim": { "branch": "v3.x", "commit": "f3df514fff2bdd4318127c40470984137f87b62e" }, "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, diff --git a/nvim/.config/nvim/lua/plugins/conform.lua b/nvim/.config/nvim/lua/plugins/conform.lua index c8761fd..dd2d707 100644 --- a/nvim/.config/nvim/lua/plugins/conform.lua +++ b/nvim/.config/nvim/lua/plugins/conform.lua @@ -25,6 +25,8 @@ return { handlebars = { "prettier" }, -- Toml toml = { "taplo" }, -- Changed from tombi to taplo + -- KDL + kdl = { "kdlfmt" }, -- Ruby ruby = { "rubocop" }, -- LaTeX diff --git a/yazi/.config/yazi/keymap.toml b/yazi/.config/yazi/keymap.toml index a3f6419..744d0d3 100644 --- a/yazi/.config/yazi/keymap.toml +++ b/yazi/.config/yazi/keymap.toml @@ -1,12 +1,10 @@ [mgr] prepend_keymap = [ # toggle-pane plugin - { on = "T", run = "plugin toggle-pane max-preview", desc = "Maximize or restore the preview pane" }, + { on = "W", run = "plugin toggle-pane max-preview", desc = "Maximize or restore the preview pane" }, + { on = "E", run = "plugin toggle-pane min-preview", desc = "Minimize or restore the preview pane" }, # what size plugin - { on = [ - ".", - "s", - ], run = "plugin what-size", desc = "Calc size of selection or cwd" }, + { on = "n", run = "plugin what-size", desc = "Calc size of selection or cwd" }, { on = "F", run = "plugin smart-filter", desc = "Smart filter" }, # rsync plugin { on = [ diff --git a/yazi/.config/yazi/plugins/mime-ext.yazi/main.lua b/yazi/.config/yazi/plugins/mime-ext.yazi/main.lua index c85ab94..234fd06 100644 --- a/yazi/.config/yazi/plugins/mime-ext.yazi/main.lua +++ b/yazi/.config/yazi/plugins/mime-ext.yazi/main.lua @@ -397,6 +397,7 @@ local EXTS = { jxl = "image/jxl", kar = "audio/midi", karbon = "application/kde.karbon", + kdl = "text/kdl", kfo = "application/kde.kformula", kia = "application/kidspiration", kml = "application/google-earth.kml+xml", diff --git a/yazi/.config/yazi/plugins/whoosh.yazi/bookmarks b/yazi/.config/yazi/plugins/whoosh.yazi/bookmarks index 8be7058..62be25f 100644 --- a/yazi/.config/yazi/plugins/whoosh.yazi/bookmarks +++ b/yazi/.config/yazi/plugins/whoosh.yazi/bookmarks @@ -11,6 +11,7 @@ nvim /home/liph/dotfiles/nvim/.config/nvim/ n,n,n niri /home/liph/dotfiles/niri/.config/niri d,n neovim_plug /home/liph/dotfiles/nvim/.config/nvim/lua/plugins/ n,p mnt /mnt m +mcp /home/liph/mcp M kitty /home/liph/dotfiles/kitty/.config/kitty k hypr /home/liph/.config/hypr h home /home/liph f diff --git a/yazi/.config/yazi/yazi.toml b/yazi/.config/yazi/yazi.toml index 409508c..f5e3f87 100644 --- a/yazi/.config/yazi/yazi.toml +++ b/yazi/.config/yazi/yazi.toml @@ -31,6 +31,7 @@ reveal = [ play = [{ run = 'mpv --force-window "$@"', orphan = true, for = "unix" }] pdf = [{ run = 'zathura "$@"', orphan = true, for = "linux" }] text = [{ run = 'nvim "$@"', block = true, for = "linux" }] +epub = [{ run = 'epy "$@"', orphan = true, for = "linux" }] [open] rules = [ @@ -56,6 +57,8 @@ rules = [ { name = "*.yml", use = "edit" }, { name = "*.tex", use = "edit" }, # Uncommented! { name = "*.text", use = "edit" }, + { name = "*.epub", use = "edit" }, + { name = "*,kdl", use = "edit" }, # Media files { mime = "image/*", use = "open" }, { mime = "video/*", use = "play" }, diff --git a/zshrc/.aliases.zsh b/zshrc/.aliases.zsh index ce0aef0..abc5f9b 100644 --- a/zshrc/.aliases.zsh +++ b/zshrc/.aliases.zsh @@ -66,7 +66,7 @@ alias mlist='sudo reflector --verbose --latest 10 --age 1 --download-timeout 20 # alias gaf='git add *' # alias gco='git commit -m' # alias gp='git push' -# alias gcc='git clone' +alias gcc='git clone' alias lgit='lazygit' # proton vpn diff --git a/zshrc/.plugins.zsh b/zshrc/.plugins.zsh index 959a4a0..212d325 100644 --- a/zshrc/.plugins.zsh +++ b/zshrc/.plugins.zsh @@ -3,6 +3,7 @@ # Add in plugins zinit light zsh-users/zsh-syntax-highlighting +# zinit light zdharma-continuum/fast-syntax-highlighting zinit light zsh-users/zsh-completions zinit light zsh-users/zsh-autosuggestions zinit light Aloxaf/fzf-tab @@ -12,6 +13,7 @@ zinit ice lucid wait as"completion" zinit snippet https://github.com/eza-community/eza/blob/main/completions/zsh/_eza zinit light MichaelAquilina/zsh-you-should-use zinit light wfxr/forgit +# zinit light trapd00r/zsh-syntax-highlighting-filetypes # Add in snippets from "OhMyZsh“ zinit snippet OMZP::git diff --git a/zshrc/.zshrc b/zshrc/.zshrc index 2f498ba..bc7a862 100644 --- a/zshrc/.zshrc +++ b/zshrc/.zshrc @@ -128,3 +128,4 @@ function zvm_after_init() { # Re-bind ctrl+space for autosuggestions if needed bindkey '^@' autosuggest-accept } +export PATH="$HOME/.local/bin:$PATH"