Compare commits

..

No commits in common. "35d04f27c5797929bc25a526b226c47acddac880" and "242bf7bdda10b2e0f9981e87f842be227ef7e2bc" have entirely different histories.

9 changed files with 313 additions and 362 deletions

View file

@ -1,22 +1,9 @@
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 "Sharp Corporation 0x1515 Unknown" mode 1920x1200 position 2560,1440
output eDP-1 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,8 +1,4 @@
// vim:set ft=kdl shiftwidth=4 commentstring=//%s:
debug {
keep-laptop-panel-on-when-lid-is-closed
}
input {
keyboard {
xkb {
@ -70,7 +66,7 @@ output "Philips Consumer Electronics Company PHL 345B1C 0x00008E7C" {
//<yolk> mode "1920x1080@60"
//<yolk> scale 1.0
//<yolk> transform "normal"
//<yolk> position x=2560 y=1440
//<yolk> position x=0 y=1440
//<yolk> }
// {% end %}
@ -110,9 +106,9 @@ layout {
// {% if device.laptop %}
//<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 "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 "waybar"
//<yolk> // spawn-at-startup "kanshi"
//<yolk> spawn-at-startup "kanshi"
// {% end %}
// {% if device.desktop %}
@ -128,8 +124,7 @@ 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_lights.jpg"
// 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_dark.jpg"
spawn-at-startup "~/.config/niri/clipsync watch with-notifications"
spawn-at-startup
//
@ -154,7 +149,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);
}
"
}
@ -176,8 +171,8 @@ animations {
gestures {
dnd-edge-view-scroll {
trigger-width 20
max-speed 2000
trigger-width 200
max-speed 3500
}
}
@ -420,7 +415,6 @@ binds {
Mod+Shift+R { reset-window-height; }
Mod+F { maximize-column; }
Mod+Shift+F { fullscreen-window; }
Mod+Ctrl+Shift+F { toggle-windowed-fullscreen; }
Mod+Ctrl+F { expand-column-to-available-width; }
Mod+C { center-column; }
@ -446,8 +440,6 @@ binds {
Ctrl+Escape { spawn "killall" "-s" "SIGINT" "wf-recorder"; }
Mod+Shift+Y { spawn "niri" "msg" "action" "set-dynamic-cast-window"; }
Mod+Ctrl+Alt+Shift+Y { spawn "niri" "msg" "action" "set-dynamic-cast-monitor"; }
Mod+Ctrl+Y { spawn "niri" "msg" "action" "clear-dynamic-cast-target"; }
Mod+Shift+E { quit; }
}

View file

@ -15,5 +15,5 @@
"news": {
"NEWS.md": "10960"
},
"version": 7
"version": 8
}

View file

@ -1 +0,0 @@
/usr/lib/systemd/user/appimagelauncherd.service

View file

@ -31,7 +31,7 @@
"power-profiles-daemon",
"pulseaudio",
"backlight",
// "keyboard-state",
"keyboard-state",
"battery",
//"battery#bat2",
"tray",
@ -281,5 +281,6 @@
"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,16 +4,23 @@
"bindings": {
// unbind closing the tab with this
"ctrl-w": null,
"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-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-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": {
@ -33,17 +40,7 @@
}
},
{
"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)",
"context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu",
"bindings": {
"z space": "editor::FoldAll",
"z backspace": "editor::FoldFunctionBodies",
@ -96,8 +93,8 @@
{
"context": "Editor && vim_mode == normal && !VimWaiting && !menu",
"bindings": {
"backspace": ["vim::PushSneak", {}],
"return": ["vim::PushSneakBackward", {}]
"backspace": ["vim::PushOperator", { "Sneak": {} }],
"return": ["vim::PushOperator", { "SneakBackward": {} }]
}
},
{

View file

@ -14,6 +14,13 @@
// "shift-escape": null
}
},
{
"context": "EmptyPane",
"bindings": {
":": "command_palette::Toggle",
"space p": "file_finder::Toggle"
}
},
{
"context": "os == macos && Editor && VimControl && !VimWaiting && !menu",
"bindings": {
@ -33,17 +40,7 @@
}
},
{
"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)",
"context": "MarkdownPreview || EmptyPane || Diagnostics || Editor && VimControl && !VimWaiting && !menu",
"bindings": {
"z space": "editor::FoldAll",
"z backspace": "editor::FoldFunctionBodies",

View file

@ -1,13 +1,6 @@
{
"git_panel": {
"status_style": "label_color"
},
"edit_predictions": {
"disabled_globs": [],
"mode": "eager"
},
"features": {
"edit_prediction_provider": "zed"
"inline_completion_provider": "zed"
},
"icon_theme": "Material Icon Theme",
"telemetry": {
@ -23,17 +16,17 @@
"assistant": {
"default_model": {
"provider": "copilot_chat",
"model": "claude-3-7-sonnet"
"model": "claude-3-5-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": "JetBrains Mono",
// "buffer_font_family": "JetBrainsMono Nerd Font Mono",
// "buffer_line_height": { "custom": 1.55 },
// "ui_font_family": "Noto Sans",
// "buffer_font_family": "Zed Mono",
@ -86,18 +79,7 @@
},
"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,8 +1,4 @@
{
"edit_predictions": {
"disabled_globs": [],
"mode": "eager_preview"
},
"features": {
"inline_completion_provider": "zed"
},