diff options
| -rw-r--r-- | dotfiles/.config/alacritty/alacritty.toml | 2 | ||||
| -rw-r--r-- | dotfiles/.config/niri/config.kdl | 560 | ||||
| -rw-r--r-- | dotfiles/.config/waybar/config | 12 | ||||
| -rwxr-xr-x | dotfiles/.local/bin/lock-color | 12 | ||||
| -rwxr-xr-x | dotfiles/.local/bin/swaysession | 14 | ||||
| -rw-r--r-- | dotfiles/.profile | 11 |
6 files changed, 595 insertions, 16 deletions
diff --git a/dotfiles/.config/alacritty/alacritty.toml b/dotfiles/.config/alacritty/alacritty.toml index 8f8a89e..e21168c 100644 --- a/dotfiles/.config/alacritty/alacritty.toml +++ b/dotfiles/.config/alacritty/alacritty.toml @@ -19,7 +19,7 @@ multiplier = 10 [window] blur = true dynamic_padding = true -opacity = 0.95 +opacity = 1 padding = { x = 2, y = 2 } [[hints.enabled]] diff --git a/dotfiles/.config/niri/config.kdl b/dotfiles/.config/niri/config.kdl new file mode 100644 index 0000000..de5c15d --- /dev/null +++ b/dotfiles/.config/niri/config.kdl @@ -0,0 +1,560 @@ +// This config is in the KDL format: https://kdl.dev +// "/-" comments out the following node. +// Check the wiki for a full description of the configuration: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Overview + +// Input device configuration. +// Find the full list of options on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Input +input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + layout "us,es,ru" + options "lv3:ralt_switch,grp:alt_shift_toggle,misc:typo,caps:escape,grp_led:caps" + } + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + touchpad { + off + tap + // dwt + // dwtp + natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "two-finger" + // disabled-on-external-mouse + } + + mouse { + // off + // natural-scroll + // accel-speed 0.2 + // accel-profile "flat" + // scroll-method "no-scroll" + } + + trackpoint { + // off + // natural-scroll + accel-speed -0.2 + accel-profile "adaptive" + // scroll-method "on-button-down" + // scroll-button 273 + middle-emulation + } + + // Uncomment this to make the mouse warp to the center of newly focused windows. + warp-mouse-to-focus + + // Focus windows and outputs automatically when moving the mouse into them. + // Setting max-scroll-amount="0%" makes it work only on windows already fully on screen. + focus-follows-mouse + // focus-follows-mouse max-scroll-amount="0%" +} + +cursor { + hide-when-typing +} + + +// You can configure outputs by their name, which you can find +// by running `niri msg outputs` while inside a niri instance. +// The built-in laptop monitor is usually called "eDP-1". +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +output "eDP-1" { + // Uncomment this line to disable this output. + // off + + background-color "#000000" + + // Resolution and, optionally, refresh rate of the output. + // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>". + // If the refresh rate is omitted, niri will pick the highest refresh rate + // for the resolution. + // If the mode is omitted altogether or is invalid, niri will pick one automatically. + // Run `niri msg outputs` while inside a niri instance to list all outputs and their modes. + // mode "1920x1080@120.030" + + // You can use integer or fractional scale, for example use 1.5 for 150% scale. + // scale 2 + + // Transform allows to rotate the output counter-clockwise, valid values are: + // normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. + // transform "normal" + + // Position of the output in the global coordinate space. + // This affects directional monitor actions like "focus-monitor-left", and cursor movement. + // The cursor can only move between directly adjacent outputs. + // Output scale and rotation has to be taken into account for positioning: + // outputs are sized in logical, or scaled, pixels. + // For example, a 3840×2160 output with scale 2.0 will have a logical size of 1920×1080, + // so to put another output directly adjacent to it on the right, set its x to 1920. + // If the position is unset or results in an overlap, the output is instead placed + // automatically. + position x=0 y=800 +} + +output "DP-1" { + background-color "#000000" + position x=1536 y=0 +} + +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + gaps 5 + + // When to center a column when changing focus, options are: + // - "never", default behavior, focusing an off-screen column will keep at the left + // or right edge of the screen. + // - "always", the focused column will always be centered. + // - "on-overflow", focusing a column will center it if it doesn't fit + // together with the previously focused column. + center-focused-column "never" + + // You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. + preset-column-widths { + // Proportion sets the width as a fraction of the output width, taking gaps into account. + // For example, you can perfectly fit four windows sized "proportion 0.25" on an output. + // The default preset widths are 1/3, 1/2 and 2/3 of the output. + proportion 0.31 + proportion 0.5 + proportion 0.69 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can also customize the heights that "switch-preset-window-height" (Mod+Shift+R) toggles between. + // preset-window-heights { } + + // You can change the default width of the new windows. + default-column-width { proportion 0.5; } + // If you leave the brackets empty, the windows themselves will decide their initial width. + // default-column-width {} + + // By default focus ring and border are rendered as a solid background rectangle + // behind windows. That is, they will show up through semitransparent windows. + // This is because windows using client-side decorations can have an arbitrary shape. + // + // If you don't like that, you should uncomment `prefer-no-csd` below. + // Niri will draw focus ring and border *around* windows that agree to omit their + // client-side decorations. + // + // Alternatively, you can override it with a window rule called + // `draw-border-with-background`. + + // You can change how the focus ring looks. + focus-ring { + // Uncomment this line to disable the focus ring. + off + + // How many logical pixels the ring extends out from the windows. + width 2 + + // Colors can be set in a variety of ways: + // - CSS named colors: "red" + // - RGB hex: "#rgb", "#rgba", "#rrggbb", "#rrggbbaa" + // - CSS-like notation: "rgb(255, 127, 0)", rgba(), hsl() and a few others. + + // Color of the ring on the active monitor. + active-color "#5b8277" + + // Color of the ring on inactive monitors. + inactive-color "#4d4d42" + + // You can also use gradients. They take precedence over solid colors. + // Gradients are rendered the same as CSS linear-gradient(angle, from, to). + // The angle is the same as in linear-gradient, and is optional, + // defaulting to 180 (top-to-bottom gradient). + // You can use any CSS linear-gradient tool on the web to set these up. + // Changing the color space is also supported, check the wiki for more info. + // + // active-gradient from="#80c8ff" to="#bbddff" angle=45 + + // You can also color the gradient relative to the entire view + // of the workspace, rather than relative to just the window itself. + // To do that, set relative-to="workspace-view". + // + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can also add a border. It's similar to the focus ring, but always visible. + border { + // The settings are the same as for the focus ring. + // If you enable the border, you probably want to disable the focus ring. + // off + + width 4 + // active-color "#5b8277" + // inactive-color "#4d4d42" + + active-gradient from="#7fac96" to="#3f6e90" angle=225 relative-to="workspace-view" + inactive-gradient from="#33333a" to="#676775" angle=225 relative-to="workspace-view" + } + + // Struts shrink the area occupied by windows, similarly to layer-shell panels. + // You can think of them as a kind of outer gaps. They are set in logical pixels. + // Left and right struts will cause the next window to the side to always be visible. + // Top and bottom struts will simply add outer gaps in addition to the area occupied by + // layer-shell panels and regular gaps. + struts { + // left 64 + // right 64 + // top 64 + // bottom 64 + } + + insert-hint { + color "#5b8277" + } +} + +// Add lines like this to spawn processes at startup. +// Note that running niri as a session supports xdg-desktop-autostart, +// which may be more convenient to use. +// See the binds section below for more spawn examples. +// spawn-at-startup "alacritty" "-e" "fish" + +// Uncomment this line to ask the clients to omit their client-side decorations if possible. +// If the client will specifically ask for CSD, the request will be honored. +// Additionally, clients will be informed that they are tiled, removing some client-side rounded corners. +// This option will also fix border/focus ring drawing behind some semitransparent windows. +// After enabling or disabling this, you need to restart the apps for this to take effect. +prefer-no-csd + +// You can change the path where screenshots are saved. +// A ~ at the front will be expanded to the home directory. +// The path is formatted with strftime(3) to give you the screenshot date and time. +screenshot-path "~/pics/screenshots/niri-%Y-%m-%dT%H-%M-%S.png" + +// You can also set this to null to disable saving screenshots to disk. +// screenshot-path null + +// Animation settings. +// The wiki explains how to configure individual animations: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Animations +animations { + // Uncomment to turn off all animations. + // off + + // Slow down all animations by this factor. Values below 1 speed them up instead. + slowdown 0.3 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://github.com/YaLTeR/niri/wiki/Configuration:-Window-Rules + +// Work around WezTerm's initial configure bug +// by setting an empty default-column-width. +window-rule { + // This regular expression is intentionally made as specific as possible, + // since this is the default config, and we want no false positives. + // You can get away with just app-id="wezterm" if you want. + match app-id=r#"^org\.wezfurlong\.wezterm$"# + default-column-width {} +} + +// 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" + + // Use this instead if you want them visible on third-party screenshot tools. + // block-out-from "screencast" +} + +// Example: enable rounded corners for all windows. +// (This example rule is commented out with a "/-" in front.) +/-window-rule { + geometry-corner-radius 12 + clip-to-geometry true +} + +//spawn-at-startup "pipewire-restart" +spawn-at-startup "waybar_launch" +spawn-at-startup "playerctld daemon" +spawn-at-startup "mpd-restart" +spawn-at-startup "blueman-applet" +spawn-at-startup "mako" +spawn-at-startup "setsessionenv" +spawn-at-startup "bash" "-c" "GTK_IM_MODULE= fcitx5 -d" +spawn-at-startup "xwayland-satellite" + +environment { + DISPLAY ":0" +} + +spawn-at-startup "gsettings" "set" "org.gnome.desktop.interface" "gtk-theme" "Breeze" +spawn-at-startup "gsettings" "set" "org.gnome.desktop.interface" "icon-theme" "Arc" +spawn-at-startup "gsettings" "set" "org.gnome.desktop.interface" "font-name" "monospace 10" +spawn-at-startup "gsettings" "set" "org.gnome.desktop.interface" "color-scheme" "prefer-dark" + +spawn-at-startup "swaybg" "-i" "/home/yaroslav/.config/wall1.png" "-m" "fill" + +binds { + // Keys consist of modifiers separated by + signs, followed by an XKB key name + // in the end. To find an XKB name for a particular key, you may use a program + // like wev. + // + // "Mod" is a special modifier equal to Super when running on a TTY, and to Alt + // when running as a winit window. + // + // Most actions that you can bind here can also be invoked programmatically with + // `niri msg action do-something`. + + // Mod-Shift-/, which is usually the same as Mod-?, + // shows a list of important hotkeys. + Mod+Shift+Slash { show-hotkey-overlay; } + + // Suggested binds for running programs: terminal, app launcher, screen locker. + Mod+Return { spawn "alacritty"; } + Mod+D { spawn "rofi" "-show" "drun" "-sidebar-mode" "-modi" "drun,run,filebrowser,ssh,combi"; } + Mod+X { spawn "lock-color"; } + Mod+Shift+X { spawn "lock-color" "screenon"; } + + // You can also use a shell. Do this if you need pipes, multiple commands, etc. + // Note: the entire command goes as a single argument in the end. + // Mod+T { spawn "bash" "-c" "notify-send hello && exec alacritty"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } + + Mod+Q { 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-or-workspace-down; } + Mod+K { focus-window-or-workspace-up; } + Mod+L { focus-column-right; } + + Mod+Shift+Left { move-column-left; } + Mod+Shift+Down { move-window-down; } + Mod+Shift+Up { move-window-up; } + Mod+Shift+Right { move-column-right; } + Mod+Shift+H { move-column-left; } + Mod+Shift+J { move-window-down; } + Mod+Shift+K { move-window-up; } + Mod+Shift+L { move-column-right; } + + // Alternative commands that move across workspaces when reaching + // the first or last window in a column. + // Mod+J { focus-window-or-workspace-down; } + // Mod+K { focus-window-or-workspace-up; } + // Mod+Ctrl+J { move-window-down-or-to-workspace-down; } + // Mod+Ctrl+K { move-window-up-or-to-workspace-up; } + + Mod+Home { focus-column-first; } + Mod+End { focus-column-last; } + Mod+Ctrl+Home { move-column-to-first; } + Mod+Ctrl+End { move-column-to-last; } + Mod+G { focus-column-first; } + Mod+Shift+G { focus-column-last; } + Mod+Ctrl+G { move-column-to-first; } + Mod+Ctrl+Shift+G { move-column-to-last; } + + Mod+Ctrl+Left { focus-monitor-left; } + Mod+Ctrl+Down { focus-monitor-down; } + Mod+Ctrl+Up { focus-monitor-up; } + Mod+Ctrl+Right { focus-monitor-right; } + Mod+Ctrl+H { focus-monitor-left; } + Mod+Ctrl+J { focus-monitor-down; } + Mod+Ctrl+K { focus-monitor-up; } + Mod+Ctrl+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; } + Mod+Shift+Ctrl+Right { move-column-to-monitor-right; } + Mod+Shift+Ctrl+H { move-column-to-monitor-left; } + 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; } + + // Alternatively, there are commands to move just a single window: + // Mod+Shift+Ctrl+Left { move-window-to-monitor-left; } + // ... + + // And you can also move a whole workspace to another monitor: + // Mod+Shift+Ctrl+Left { move-workspace-to-monitor-left; } + // ... + + Mod+Page_Down { focus-workspace-down; } + Mod+Page_Up { focus-workspace-up; } + Mod+U { focus-workspace-down; } + Mod+I { focus-workspace-up; } + Mod+Ctrl+Page_Down { move-column-to-workspace-down; } + Mod+Ctrl+Page_Up { move-column-to-workspace-up; } + Mod+Ctrl+U { move-column-to-workspace-down; } + Mod+Ctrl+I { move-column-to-workspace-up; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+Page_Down { move-window-to-workspace-down; } + // ... + + Mod+Shift+Page_Down { move-workspace-down; } + Mod+Shift+Page_Up { move-workspace-up; } + Mod+Shift+U { move-workspace-down; } + Mod+Shift+I { move-workspace-up; } + + // You can bind mouse wheel scroll ticks using the following syntax. + // These binds will change direction based on the natural-scroll setting. + // + // To avoid scrolling through workspaces really fast, you can use + // the cooldown-ms property. The bind will be rate-limited to this value. + // You can set a cooldown on any bind, but it's most useful for the wheel. + Mod+WheelScrollDown cooldown-ms=250 { focus-workspace-down; } + Mod+WheelScrollUp cooldown-ms=250 { focus-workspace-up; } + Mod+Ctrl+WheelScrollDown cooldown-ms=250 { move-column-to-workspace-down; } + Mod+Ctrl+WheelScrollUp cooldown-ms=250 { move-column-to-workspace-up; } + + Mod+WheelScrollRight cooldown-ms=250 { focus-column-right; } + Mod+WheelScrollLeft cooldown-ms=250 { focus-column-left; } + Mod+Ctrl+WheelScrollRight cooldown-ms=250 { move-column-right; } + Mod+Ctrl+WheelScrollLeft cooldown-ms=250 { move-column-left; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + Mod+Shift+WheelScrollDown cooldown-ms=250 { focus-column-right; } + Mod+Shift+WheelScrollUp cooldown-ms=250 { focus-column-left; } + Mod+Ctrl+Shift+WheelScrollDown cooldown-ms=250 { move-column-right; } + Mod+Ctrl+Shift+WheelScrollUp cooldown-ms=250 { move-column-left; } + + // Similarly, you can bind touchpad scroll "ticks". + // Touchpad scrolling is continuous, so for these binds it is split into + // discrete intervals. + // These binds are also affected by touchpad's natural-scroll, so these + // example binds are "inverted", since we have natural-scroll enabled for + // touchpads by default. + // Mod+TouchpadScrollDown { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02+"; } + // Mod+TouchpadScrollUp { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.02-"; } + + // You can refer to workspaces by index. However, keep in mind that + // niri is a dynamic workspace system, so these commands are kind of + // "best effort". Trying to refer to a workspace index bigger than + // the current workspace count will instead refer to the bottommost + // (empty) workspace. + // + // For example, with 2 workspaces + 1 empty, indices 3, 4, 5 and so on + // will all refer to the 3rd workspace. + 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; } + Mod+Ctrl+4 { move-column-to-workspace 4; } + Mod+Ctrl+5 { move-column-to-workspace 5; } + Mod+Ctrl+6 { move-column-to-workspace 6; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + + // Alternatively, there are commands to move just a single window: + // Mod+Ctrl+1 { move-window-to-workspace 1; } + + // Switches focus between the current and the previous workspace. + // Mod+Tab { focus-workspace-previous; } + + // Consume one window from the right into the focused column. + Mod+Comma { consume-window-into-column; } + // Expel one window from the focused column to the right. + Mod+Period { expel-window-from-column; } + + // There are also commands that consume or expel a single window to the side. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + Mod+R { switch-preset-column-width; } + Mod+Shift+R { switch-preset-window-height; } + Mod+Ctrl+R { reset-window-height; } + Mod+F { maximize-column; } + Mod+Shift+F { fullscreen-window; } + Mod+C { center-column; } + + // Finer width adjustments. + // This command can also: + // * set width in pixels: "1000" + // * adjust width in pixels: "-5" or "+5" + // * set width as a percentage of screen width: "25%" + // * adjust width as a percentage of screen width: "-10%" or "+10%" + // Pixel sizes use logical, or scaled, pixels. I.e. on an output with scale 2.0, + // set-column-width "100" will make the column occupy 200 physical screen pixels. + 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%"; } + + // Actions to switch layouts. + // Note: if you uncomment these, make sure you do NOT have + // a matching layout switch hotkey configured in xkb options above. + // Having both at once on the same hotkey will break the switching, + // since it will switch twice upon pressing the hotkey (once by xkb, once by niri). + // Mod+Space { switch-layout "next"; } + // Mod+Shift+Space { switch-layout "prev"; } + + Print { screenshot; } + Ctrl+Print { screenshot-screen; } + Alt+Print { screenshot-window; } + Mod+Print { spawn "swayrecord"; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { spawn "rofi" "-show" "session" "-matching" "prefix" "-modi" "session:rofisession"; } + + // Powers off the monitors. To turn them back on, do any input like + // moving the mouse or pressing any other key. + Mod+Shift+P { power-off-monitors; } + + // Mako commands + Mod+Ctrl+Space { spawn "makoctl" "dismiss"; } + Mod+Ctrl+Shift+Space { spawn "makoctl" "restore"; } + + // Menus/Quick actions + Mod+F1 { spawn "menuman"; } + Mod+F2 { spawn "menumako"; } + Mod+F3 { spawn "rofi" "-show" "display" "-modi" "display:rofidisplay"; } + Mod+F4 { spawn "menublk"; } + Mod+F10 { spawn "chcolors"; } + Mod+Shift+N { spawn "networkmanager_dmenu"; } + Mod+Shift+C { spawn "rofi" "-show" "calc" "-modi" "calc" "-no-show-match" "-no-sort"; } + Mod+Grave { spawn "rofi" "-show" "moji" "-modi" "moji:rofimoji"; } + Mod+Ctrl+M { spawn "rofi" "-show" "audio" "-modi" "audio:rofiaudio"; } + + // Password manager + Mod+apostrophe { spawn "menupass"; } + Mod+Shift+apostrophe { spawn "menupass" "-l"; } + Mod+Ctrl+apostrophe { spawn "menupass" "-f"; } + Mod+Ctrl+Shift+apostrophe { spawn "menupass" "-s"; } +} + +switch-events { + lid-close { spawn "swaysession" "suspend"; } +} diff --git a/dotfiles/.config/waybar/config b/dotfiles/.config/waybar/config index 1422b05..7d7a192 100644 --- a/dotfiles/.config/waybar/config +++ b/dotfiles/.config/waybar/config @@ -1,9 +1,10 @@ // vim: filetype=json { "layer": "bottom", - "height": 30, + "height": 32, "modules-left": [ "sway/workspaces", + "niri/workspaces", "sway/mode", "custom/waybar-mpris", "pulseaudio" @@ -14,17 +15,15 @@ ], "modules-right": [ "custom/rec-status", + "niri/language", "custom/swaykbd", - "custom/ds4battery", "custom/mail-status", "custom/pac-status", - "custom/news-status", "memory", "backlight", "battery#bat0", "battery#bat1", "custom/batwatt", - "custom/torrent-status", "network", "tray" ], @@ -33,7 +32,7 @@ }, "custom/waybar-mpris": { "return-type": "json", - "exec": "waybar-mpris --autofocus --text-format=\"%i [%p] %a - %t\" --tooltip-format=\"%t by %a from %A\n%p/%d\n(%P)\" --pause='<span color=\"#5b8277\"></span>' --play='' --max-title 45", + "exec": "waybar-mpris --autofocus --text-format=\"%i [%p] %a - %t\" --tooltip-format=\"%t by %a from %A\n%p/%d\n(%P)\" --pause='<span color=\"#5b8277\"></span>' --play='' --max-title 30", "on-click": "lmc toggle", "on-click-right": "lmc next" }, @@ -230,5 +229,8 @@ "format": "{}", "exec": "swaykbd", "tooltip": false + }, + "niri/language": { + "format": "⌨️ {short}" } } diff --git a/dotfiles/.local/bin/lock-color b/dotfiles/.local/bin/lock-color index 2187d44..0611c29 100755 --- a/dotfiles/.local/bin/lock-color +++ b/dotfiles/.local/bin/lock-color @@ -1,13 +1,15 @@ #!/bin/sh -swaymsg input type:keyboard xkb_switch_layout 0 +if [ -n "$SWAYSOCK"]; then + swaymsg input type:keyboard xkb_switch_layout 0 -gpg-connect-agent --no-autostart reloadagent /bye - -if [ "$1" != "screenon" ]; then - swayidle timeout 30 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' & + if [ "$1" != "screenon" ]; then + swayidle timeout 30 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' & + fi fi +gpg-connect-agent --no-autostart reloadagent /bye + canberra-gtk-play -i Oxygen-Window-All-Desktops-Not & swaylock diff --git a/dotfiles/.local/bin/swaysession b/dotfiles/.local/bin/swaysession index 0beaa1c..218ff43 100755 --- a/dotfiles/.local/bin/swaysession +++ b/dotfiles/.local/bin/swaysession @@ -2,13 +2,21 @@ [ "$(cat /proc/1/comm)" = "systemd" ] && logind=systemctl || logind=loginctl +exit_session() { + if [ -n "$SWAYSOCK" ]; then + swaymsg exit + else + niri msg quit + fi +} + case "$1" in lock) lock-color ;; logout) canberra-gtk-play -i Oxygen-Sys-Log-Out & sleep 1.2 - swaymsg exit + exit_session clear if [ ! -e ~/.cache/dont-kill ]; then killall -u $(whoami) @@ -26,13 +34,13 @@ case "$1" in reboot) canberra-gtk-play -i Oxygen-Sys-Log-Out & sleep 1.2 clear - swaymsg exit + exit_session sudo reboot now ;; poweroff) canberra-gtk-play -i Oxygen-Sys-Log-Out & sleep 1.2 clear - swaymsg exit + exit_session # Having problems with logind poweroff and reboot after sway exit sudo poweroff now ;; diff --git a/dotfiles/.profile b/dotfiles/.profile index a675b1a..3f89bab 100644 --- a/dotfiles/.profile +++ b/dotfiles/.profile @@ -51,7 +51,14 @@ eval "$(dircolors "$HOME/.config/dir_colors")" . "$HOME/.config/lf/icons" # Start sway automatically upon login on tty1 or tty2 -if [ -z $DISPLAY ] && [ $(tty) = /dev/tty1 ] || [ $(tty) = /dev/tty2 ]; then - exec dbus-run-session sway 2> ~/.cache/sway.log +if [ -z $DISPLAY ]; then + if [ $(tty) = /dev/tty1 ] || [ $(tty) = /dev/tty2 ]; then + exec dbus-run-session sway 2> ~/.cache/sway.log + elif [ $(tty) = /dev/tty3 ]; then + pipewire & wireplumber & pipewire-pulse & pipewire-jack & + exec dbus-run-session niri --session + fi fi + + |