This commit is contained in:
ElKowar 2025-04-11 13:04:39 +02:00
parent 6a704a2e5d
commit 98fc347874
Signed by: ElKowar
GPG key ID: 862BA3D7D7760F13
7 changed files with 361 additions and 316 deletions

View file

@ -1,9 +1,22 @@
profile {
output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" mode 3440x1440@99.982 position 2560,0
output "Fujitsu Siemens Computers GmbH P27-8 TE Pro YVBH008792" mode 2560x1440 position 0,0
output eDP-1 mode 1920x1200 position 2560,1440
output "Sharp Corporation 0x1515 Unknown" mode 1920x1200 position 2560,1440
}
# profile {
# output "DP-5" mode 3440x1440@99.982 position 2560,0
# output "DP-6" mode 2560x1440 position 0,0
# output eDP-1 mode 1920x1200 position 2560,1440
# }
profile {
output eDP-1 mode 1920x1200 position 0,0
}
profile {
output "HP Inc. HP E27u G4 CN4114303X" mode 2560x1440@59.951 position 0,0
#output "HP Inc. HP Z27k G3 CN414018RC" mode 3840x2160@30 position 2560,0 scale 1.5
output "HP Inc. HP Z27k G3 CN414018RC" mode 2560x1440@59.951 position 2560,0 scale 1
output eDP-1 mode 1920x1200@59.950 position 2560,1440
}

View file

@ -1,4 +1,8 @@
// vim:set ft=kdl shiftwidth=4 commentstring=//%s:
debug {
keep-laptop-panel-on-when-lid-is-closed
}
input {
keyboard {
xkb {
@ -66,7 +70,7 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
//<yolk> mode "1920x1080@60"
//<yolk> scale 1.0
//<yolk> transform "normal"
//<yolk> position x=0 y=1440
//<yolk> position x=2560 y=1440
//<yolk> }
// {% end %}
@ -106,9 +110,9 @@ layout {
// {% if device.laptop %}
//<yolk> spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 600 'hyprlock' before-sleep 'hyprlock' timeout 3600 'systemctl suspend' timeout 60000 'systemctl hibernate'"
//<yolk> spawn-at-startup "bash" "-c" "swayidle -w timeout 601 'niri msg action power-off-monitors' timeout 1200 'hyprlock' before-sleep 'hyprlock' timeout 3600 'systemctl suspend'"
//<yolk> spawn-at-startup "waybar"
//<yolk> spawn-at-startup "kanshi"
//<yolk> // spawn-at-startup "kanshi"
// {% end %}
// {% if device.desktop %}
@ -124,7 +128,8 @@ spawn-at-startup "clipse -listen"
spawn-at-startup "wl-clip-persist" "--clipboard" "regular"
spawn-at-startup "kdeconnect-indicator"
//
spawn-at-startup "bash" "-c" "swaybg -m fill -i ~/.config/wallpapers/elk_gasstation_dark.jpg"
spawn-at-startup "bash" "-c" "swaybg -m fill -i ~/.config/wallpapers/elk_gasstation_lights.jpg"
// spawn-at-startup "bash" "-c" "swaybg -m fill -i ~/.config/wallpapers/elk_gasstation_dark.jpg"
spawn-at-startup "~/.config/niri/clipsync watch with-notifications"
spawn-at-startup
//
@ -149,7 +154,7 @@ animations {
float cur = niri_clamped_progress;
if (coords_geo.x > cur) { return vec4(0.0); }
vec3 coord = vec3(map(coords_geo.x,0.0, cur, 0.0, 1.0 ), coords_geo.y, coords_geo.z);
return texture2d(niri_tex, (niri_geo_to_tex * coord).st);
return texture2D(niri_tex, (niri_geo_to_tex * coord).st);
}
"
}
@ -171,8 +176,8 @@ animations {
gestures {
dnd-edge-view-scroll {
trigger-width 200
max-speed 3500
trigger-width 20
max-speed 2000
}
}

View file

@ -1,286 +1,285 @@
// -*- mode: jsonc -*-
{
// "layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right)
//"height": 24, // Waybar height (to be removed for auto height)
//"width": 24, // Waybar width
"spacing": 6, // Gaps between modules (4px)
"reload_style_on_change": true,
// Choose the order of the modules
"modules-left": [
"niri/workspaces",
"sway/workspaces",
"sway/mode",
"sway/scratchpad",
"custom/media"
],
"modules-center": [
"sway/window",
"clock",
"clock#date"
],
"modules-right": [
//"mpd",
//"idle_inhibitor",
"privacy",
//"network",
"cpu",
"memory",
"temperature",
"custom/display-scale",
"power-profiles-daemon",
"pulseaudio",
"backlight",
"keyboard-state",
"battery",
//"battery#bat2",
"tray",
"custom/power"
],
"niri/workspaces": {
"format": "{icon}",
"format-icons": {
// Named workspaces
// (you need to configure them in niri)
"browser": "",
"discord": "",
"chat": "<b></b>",
// Icons by state
//"focused": "◈",
"focused": "◆",
"active": "◆",
"default": "◆"
}
},
"privacy": {
"icon-spacing": 4,
"icon-size": 18,
"transition-duration": 250,
"modules": [
{
"type": "screenshare",
"tooltip": true,
"tooltip-icon-size": 24
},
{
"type": "audio-out",
"tooltip": true,
"tooltip-icon-size": 24
},
{
"type": "audio-in",
"tooltip": true,
"tooltip-icon-size": 24
}
]
},
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "warp-on-scroll": false,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"keyboard-state": {
"numlock": true,
"capslock": true,
"format": "{name} {icon}",
"format-icons": {
"locked": "",
"unlocked": ""
}
},
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
"sway/scratchpad": {
"format": "{icon} {count}",
"show-empty": false,
"format-icons": [
"",
""
],
"tooltip": true,
"tooltip-format": "{app}: {title}"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 5,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
},
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"clock": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}"
},
"clock#date": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": "{:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% ",
"tooltip": false
},
"memory": {
"format": "{}% "
},
"temperature": {
// "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": [
"",
"",
""
]
},
"backlight": {
"device": "intel_backlight",
"format": "{percent}% {icon}",
"format-icons": [
"",
"",
"",
"",
"",
"",
"",
"",
""
],
"on-scroll-up": "brightnessctl s 2%+",
"on-scroll-down": "brightnessctl s 2%-",
"on-click-right": "brightnessctl s 1%",
"on-click": "brightnessctl s 50%"
},
"battery": {
"states": {
// "good": 95,
"warning": 30,
"critical": 15
},
"format": "{capacity}% {icon}",
"format-full": "{capacity}% {icon}",
"format-charging": "{capacity}% ",
"format-plugged": "{capacity}% ",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": [
"",
"",
"",
"",
""
]
},
"battery#bat2": {
"bat": "BAT2"
},
"power-profiles-daemon": {
"format": "{icon}",
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
"tooltip": true,
"format-icons": {
"default": "",
"performance": "",
"balanced": "",
"power-saver": ""
}
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ipaddr}/{cidr} ",
"tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
"format": "{volume}% {icon} {format_source}",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
"format-source": "{volume}% ",
"format-source-muted": "",
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": [
"",
"",
""
]
},
"on-click": "pavucontrol"
},
"custom/power": {
"format": "⏻",
"tooltip": false,
"menu": "on-click",
"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
"menu-actions": {
"shutdown": "shutdown",
"reboot": "reboot",
"suspend": "systemctl suspend",
"hibernate": "systemctl hibernate"
}
},
"custom/display-scale": {
"format": "",
"on-click": "niri msg output eDP-1 scale 1.0",
"on-click-right": "niri msg output eDP-1 scale 1.25"
// "layer": "top", // Waybar at top layer
"position": "top", // Waybar position (top|bottom|left|right)
//"height": 24, // Waybar height (to be removed for auto height)
//"width": 24, // Waybar width
"spacing": 6, // Gaps between modules (4px)
"reload_style_on_change": true,
// Choose the order of the modules
"modules-left": [
"niri/workspaces",
"sway/workspaces",
"sway/mode",
"sway/scratchpad",
"custom/media"
],
"modules-center": [
"sway/window",
"clock",
"clock#date"
],
"modules-right": [
//"mpd",
//"idle_inhibitor",
"privacy",
//"network",
"cpu",
"memory",
"temperature",
"custom/display-scale",
"power-profiles-daemon",
"pulseaudio",
"backlight",
// "keyboard-state",
"battery",
//"battery#bat2",
"tray",
"custom/power"
],
"niri/workspaces": {
"format": "{icon}",
"format-icons": {
// Named workspaces
// (you need to configure them in niri)
"browser": "",
"discord": "",
"chat": "<b></b>",
// Icons by state
//"focused": "◈",
"focused": "◆",
"active": "◆",
"default": "◆"
}
},
"privacy": {
"icon-spacing": 4,
"icon-size": 18,
"transition-duration": 250,
"modules": [
{
"type": "screenshare",
"tooltip": true,
"tooltip-icon-size": 24
},
{
"type": "audio-out",
"tooltip": true,
"tooltip-icon-size": 24
},
{
"type": "audio-in",
"tooltip": true,
"tooltip-icon-size": 24
}
]
},
// Modules configuration
// "sway/workspaces": {
// "disable-scroll": true,
// "all-outputs": true,
// "warp-on-scroll": false,
// "format": "{name}: {icon}",
// "format-icons": {
// "1": "",
// "2": "",
// "3": "",
// "4": "",
// "5": "",
// "urgent": "",
// "focused": "",
// "default": ""
// }
// },
"keyboard-state": {
"numlock": true,
"capslock": true,
"format": "{name} {icon}",
"format-icons": {
"locked": "",
"unlocked": ""
}
},
"sway/mode": {
"format": "<span style=\"italic\">{}</span>"
},
"sway/scratchpad": {
"format": "{icon} {count}",
"show-empty": false,
"format-icons": [
"",
""
],
"tooltip": true,
"tooltip-format": "{app}: {title}"
},
"mpd": {
"format": "{stateIcon} {consumeIcon}{randomIcon}{repeatIcon}{singleIcon}{artist} - {album} - {title} ({elapsedTime:%M:%S}/{totalTime:%M:%S}) ⸨{songPosition}|{queueLength}⸩ {volume}% ",
"format-disconnected": "Disconnected ",
"format-stopped": "{consumeIcon}{randomIcon}{repeatIcon}{singleIcon}Stopped ",
"unknown-tag": "N/A",
"interval": 5,
"consume-icons": {
"on": " "
},
"random-icons": {
"off": "<span color=\"#f53c3c\"></span> ",
"on": " "
},
"repeat-icons": {
"on": " "
},
"single-icons": {
"on": "1 "
},
"state-icons": {
"paused": "",
"playing": ""
},
"tooltip-format": "MPD (connected)",
"tooltip-format-disconnected": "MPD (disconnected)"
},
"idle_inhibitor": {
"format": "{icon}",
"format-icons": {
"activated": "",
"deactivated": ""
}
},
"tray": {
// "icon-size": 21,
"spacing": 10
},
"clock": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format-alt": "{:%Y-%m-%d}"
},
"clock#date": {
// "timezone": "America/New_York",
"tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>",
"format": "{:%Y-%m-%d}"
},
"cpu": {
"format": "{usage}% ",
"tooltip": false
},
"memory": {
"format": "{}% "
},
"temperature": {
// "thermal-zone": 2,
// "hwmon-path": "/sys/class/hwmon/hwmon2/temp1_input",
"critical-threshold": 80,
// "format-critical": "{temperatureC}°C {icon}",
"format": "{temperatureC}°C {icon}",
"format-icons": [
"",
"",
""
]
},
"backlight": {
"device": "intel_backlight",
"format": "{percent}% {icon}",
"format-icons": [
"",
"",
"",
"",
"",
"",
"",
"",
""
],
"on-scroll-up": "brightnessctl s 2%+",
"on-scroll-down": "brightnessctl s 2%-",
"on-click-right": "brightnessctl s 1%",
"on-click": "brightnessctl s 50%"
},
"battery": {
"states": {
// "good": 95,
"warning": 30,
"critical": 15
},
"format": "{capacity}% {icon}",
"format-full": "{capacity}% {icon}",
"format-charging": "{capacity}% ",
"format-plugged": "{capacity}% ",
"format-alt": "{time} {icon}",
// "format-good": "", // An empty format will hide the module
// "format-full": "",
"format-icons": [
"",
"",
"",
"",
""
]
},
"battery#bat2": {
"bat": "BAT2"
},
"power-profiles-daemon": {
"format": "{icon}",
"tooltip-format": "Power profile: {profile}\nDriver: {driver}",
"tooltip": true,
"format-icons": {
"default": "",
"performance": "",
"balanced": "",
"power-saver": ""
}
},
"network": {
// "interface": "wlp2*", // (Optional) To force the use of this interface
"format-wifi": "{essid} ({signalStrength}%) ",
"format-ethernet": "{ipaddr}/{cidr} ",
"tooltip-format": "{ifname} via {gwaddr} ",
"format-linked": "{ifname} (No IP) ",
"format-disconnected": "Disconnected ⚠",
"format-alt": "{ifname}: {ipaddr}/{cidr}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
"format": "{volume}% {icon} {format_source}",
"format-bluetooth": "{volume}% {icon} {format_source}",
"format-bluetooth-muted": " {icon} {format_source}",
"format-muted": " {format_source}",
"format-source": "{volume}% ",
"format-source-muted": "",
"format-icons": {
"headphone": "",
"hands-free": "",
"headset": "",
"phone": "",
"portable": "",
"car": "",
"default": [
"",
"",
""
]
},
"on-click": "pavucontrol"
},
"custom/power": {
"format": "⏻",
"tooltip": false,
"menu": "on-click",
"menu-file": "$HOME/.config/waybar/power_menu.xml", // Menu file in resources folder
"menu-actions": {
"shutdown": "shutdown",
"reboot": "reboot",
"suspend": "systemctl suspend",
"hibernate": "systemctl hibernate"
}
},
"custom/display-scale": {
"format": "",
"on-click": "niri msg output eDP-1 scale 1.0",
"on-click-right": "niri msg output eDP-1 scale 1.25"
}
}

View file

@ -4,23 +4,16 @@
"bindings": {
// unbind closing the tab with this
"ctrl-w": null,
"ctrl-w ctrl-h": ["workspace::ActivatePaneInDirection", "Left"],
"ctrl-w ctrl-j": ["workspace::ActivatePaneInDirection", "Down"],
"ctrl-w ctrl-k": ["workspace::ActivatePaneInDirection", "Up"],
"ctrl-w ctrl-l": ["workspace::ActivatePaneInDirection", "Right"],
"ctrl-w ctrl-h": "workspace::ActivatePaneLeft",
"ctrl-w ctrl-j": "workspace::ActivatePaneDown",
"ctrl-w ctrl-k": "workspace::ActivatePaneUp",
"ctrl-w ctrl-l": "workspace::ActivatePaneRight",
"ctrl-shift-t": "pane::ReopenClosedItem",
"ctrl-o": "pane::GoBack",
"ctrl-i": "pane::GoForward"
// "shift-escape": null
}
},
{
"context": "EmptyPane",
"bindings": {
":": "command_palette::Toggle",
"space p": "file_finder::Toggle"
}
},
{
"context": "os == macos && Editor && VimControl && !VimWaiting && !menu",
"bindings": {
@ -40,7 +33,17 @@
}
},
{
"context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu",
"context": "EmptyPane || Diagnostics && !vim_mode && !VimWaiting && !menu",
"bindings": {
"space b c": "pane::CloseActiveItem",
"space p": "file_finder::Toggle",
"space o": "pane::DeploySearch",
"space h": "pane::ActivatePrevItem",
"space l": "pane::ActivateNextItem"
}
},
{
"context": "MarkdownPreview || EmptyPane || (Editor && VimControl && !VimWaiting && !menu)",
"bindings": {
"z space": "editor::FoldAll",
"z backspace": "editor::FoldFunctionBodies",
@ -93,8 +96,8 @@
{
"context": "Editor && vim_mode == normal && !VimWaiting && !menu",
"bindings": {
"backspace": ["vim::PushOperator", { "Sneak": {} }],
"return": ["vim::PushOperator", { "SneakBackward": {} }]
"backspace": ["vim::PushSneak", {}],
"return": ["vim::PushSneakBackward", {}]
}
},
{

View file

@ -14,13 +14,6 @@
// "shift-escape": null
}
},
{
"context": "EmptyPane",
"bindings": {
":": "command_palette::Toggle",
"space p": "file_finder::Toggle"
}
},
{
"context": "os == macos && Editor && VimControl && !VimWaiting && !menu",
"bindings": {
@ -40,7 +33,17 @@
}
},
{
"context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu",
"context": "EmptyPane || Diagnostics && !vim_mode && !VimWaiting && !menu",
"bindings": {
"space b c": "pane::CloseActiveItem",
"space p": "file_finder::Toggle",
"space o": "pane::DeploySearch",
"space h": "pane::ActivatePrevItem",
"space l": "pane::ActivateNextItem"
}
},
{
"context": "MarkdownPreview || EmptyPane || (Editor && VimControl && !VimWaiting && !menu)",
"bindings": {
"z space": "editor::FoldAll",
"z backspace": "editor::FoldFunctionBodies",

View file

@ -1,6 +1,13 @@
{
"git_panel": {
"status_style": "label_color"
},
"edit_predictions": {
"disabled_globs": [],
"mode": "eager"
},
"features": {
"inline_completion_provider": "zed"
"edit_prediction_provider": "zed"
},
"icon_theme": "Material Icon Theme",
"telemetry": {
@ -16,17 +23,17 @@
"assistant": {
"default_model": {
"provider": "copilot_chat",
"model": "claude-3-5-sonnet"
"model": "claude-3-7-sonnet"
},
"enable_experimental_live_diffs": true,
"version": "2"
},
"theme": "Gruvbox Dark Hard",
"buffer_font_size": 14.0,
"buffer_font_family": "Input",
// "buffer_font_family": "Input",
// "buffer_font_family": "Input",
// "buffer_font_family": "FiraCode Nerd Font",
// "buffer_font_family": "JetBrainsMono Nerd Font Mono",
"buffer_font_family": "JetBrains Mono",
// "buffer_line_height": { "custom": 1.55 },
// "ui_font_family": "Noto Sans",
// "buffer_font_family": "Zed Mono",
@ -79,7 +86,18 @@
},
"lsp": {
"rust-analyzer": {
"cargo": {
"features": "all"
},
"initialization_options": {
// "diagnostics": {
// "experimental": {
// "enable": true
// }
// },
// "cargo": {
// "features": "all"
// },
"typing": {
// Temporary workaround around round rust-analzyer wrongly inserting `|` twice
"excludeChars": "|<"

View file

@ -1,4 +1,8 @@
{
"edit_predictions": {
"disabled_globs": [],
"mode": "eager_preview"
},
"features": {
"inline_completion_provider": "zed"
},