diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl index 7445582..855a683 100644 --- a/niri/.config/niri/config.kdl +++ b/niri/.config/niri/config.kdl @@ -30,6 +30,8 @@ cursor { environment { DISPLAY ":0" + XDG_SESSION_TYPE "wayland" + ELECTRON_OZONE_PLATFORM_HINT "auto" // GDK_BACKEND "x11" } @@ -38,21 +40,22 @@ output "DP-2" { //variable-refresh-rate scale 1 transform "normal" - position x=1440 y=0 + position x=2560 y=0 + //position x=1440 y=0 } output "HDMI-A-1" { mode "2560x1440" scale 1 position x=0 y=0 - transform "270" + //transform "270" } layout { gaps 16 // center-focused-column "always" // - "never", "always" "on-overflow" center-focused-column "on-overflow" // - "never", "always" "on-overflow" - // always-center-single-column + always-center-single-column preset-column-widths { proportion 0.33333 proportion 0.5 @@ -70,11 +73,12 @@ layout { spawn-at-startup "bash" "-c" "eww -c ~/.config/eww-bar open-many bar_1 niri_scroller" spawn-at-startup "xwayland-satellite" -spawn-at-startup "bash" "-c" "1password --silent" +spawn-at-startup "bash" "-c" "ELECTRON_OZONE_PLATFORM_HINT=auto 1password --silent" spawn-at-startup "wl-paste" "--watch" "xclip -in -sel c" spawn-at-startup "~/.config/niri/clipboardfix.sh" -spawn-at-startup "clipse -listen" +spawn-at-startup "clipse" "-listen" spawn-at-startup "wl-clip-persist" "--clipboard" "regular" +// spawn-at-startup "swaybg" "-m" "fill" "-i" "~/Pictures/wallpapers/green_leaves.jpg" prefer-no-csd screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png" @@ -87,7 +91,7 @@ animations { float map(float value, float min1, float max1, float min2, float max2) { return min2 + (value - min1) * (max2 - min2) / (max1 - min1); } - vec4 open_color(vec3 coords_geo, vec3 size_geo) { + vec4 open_color(vec3 coords_geo, vec3 size_geo) { float cur = niri_clamped_progress; if (coords_geo.x > cur) { return vec4(0.0); @@ -153,7 +157,7 @@ binds { // Suggested binds for running programs: terminal, app launcher, screen locker. Mod+T { spawn "foot"; } - Mod+B { spawn "bash" "-c" "unset DISPLAY && google-chrome --enable-features=TouchpadOverscrollHistoryNavigation"; } + Mod+B { spawn "bash" "-c" "unset DISPLAY && google-chrome --enable-features=TouchpadOverscrollHistoryNavigation --enable-features=UseOzonePlatform --ozone-platform=wayland"; } Mod+Shift+P { spawn "~/.config/rofi/launchers/type-2/launcher.sh"; } Mod+Shift+B { spawn "firefox"; } @@ -207,8 +211,8 @@ binds { Mod+Ctrl+U { move-workspace-down; } Mod+Ctrl+I { move-workspace-up; } - Mod+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } - Mod+WheelScrollUp cooldown-ms=150 { focus-workspace-up; } + Mod+Shift+WheelScrollDown cooldown-ms=150 { focus-workspace-down; } + Mod+Shift+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+Ctrl+Shift+WheelScrollDown { scroll-viewport-left amount=0.1; } @@ -219,8 +223,15 @@ binds { 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+WheelScrollDown { focus-column-right; } + Mod+WheelScrollUp { focus-column-left; } + + // Mod+Shift+WheelScrollDown { scroll-viewport-right-by-column; } + // Mod+Shift+WheelScrollUp { scroll-viewport-left-by-column; } + + // Mod+Shift+WheelScrollDown { scroll-viewport-right-by-fraction amount=0.1; } + // Mod+Shift+WheelScrollUp { scroll-viewport-left-by-fraction amount=0.1; } + // Mod+Ctrl+Shift+WheelScrollDown { move-column-right; } // Mod+Ctrl+Shift+WheelScrollUp { move-column-left; } diff --git a/zed/.config/zed/keymap.json b/zed/.config/zed/keymap.json index 812e0e6..6b7d8bb 100644 --- a/zed/.config/zed/keymap.json +++ b/zed/.config/zed/keymap.json @@ -8,7 +8,9 @@ "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-shift-t": "pane::ReopenClosedItem", + "ctrl-o": "pane::GoBack", + "ctrl-i": "pane::GoForward" // "shift-escape": null } }, diff --git a/zed/.config/zed/settings.json b/zed/.config/zed/settings.json index 978560d..37eb0c8 100644 --- a/zed/.config/zed/settings.json +++ b/zed/.config/zed/settings.json @@ -1,8 +1,8 @@ { "assistant": { "default_model": { - "provider": "copilot_chat", - "model": "gpt-4o" + "provider": "anthropic", + "model": "claude-3-sonnet-latest" }, "version": "2" }, diff --git a/zsh/.config/zsh/abbreviations b/zsh/.config/zsh/abbreviations index 2b79509..2d20703 100644 --- a/zsh/.config/zsh/abbreviations +++ b/zsh/.config/zsh/abbreviations @@ -10,4 +10,4 @@ abbr gaa="git add --all" abbr gc="git commit" abbr gr="git rebase " abbr gs="git ss " - +abbr nvc="nvim ~/.config/"