From 1cc41d3fff4374203fb5b31b1f70b20c48086d63 Mon Sep 17 00:00:00 2001 From: Nefrace Date: Sat, 25 Oct 2025 01:14:23 +0300 Subject: [PATCH] Added niri and waybar --- bash/.bashrc | 4 + bin/fuzzel-powermenu | 29 ++ bin/fuzzel-tscale | 27 ++ gtk/.config/gtk-3.0/settings.ini | 2 +- kitty/.config/kitty/kitty.conf | 8 +- niri/.config/niri/config.kdl | 628 +++++++++++++++++++++++++ prepare.sh | 1 + waybar/.config/waybar/config | 59 +++ waybar/.config/waybar/get_kbdlayout.sh | 2 + waybar/.config/waybar/get_media.sh | 15 + waybar/.config/waybar/get_network.sh | 15 + waybar/.config/waybar/get_ping.sh | 2 + waybar/.config/waybar/style.css | 147 ++++++ waybar/.config/waybar/tscale | 32 ++ 14 files changed, 966 insertions(+), 5 deletions(-) create mode 100755 bin/fuzzel-powermenu create mode 100755 bin/fuzzel-tscale create mode 100644 niri/.config/niri/config.kdl create mode 100644 waybar/.config/waybar/config create mode 100755 waybar/.config/waybar/get_kbdlayout.sh create mode 100755 waybar/.config/waybar/get_media.sh create mode 100755 waybar/.config/waybar/get_network.sh create mode 100755 waybar/.config/waybar/get_ping.sh create mode 100644 waybar/.config/waybar/style.css create mode 100755 waybar/.config/waybar/tscale diff --git a/bash/.bashrc b/bash/.bashrc index c755739..90758d9 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -126,3 +126,7 @@ eval "$(zoxide init bash)" source ~/.dotfiles/nfrc.sh export QT_QPA_PLATFORMTHEME=qt5ct + +export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/ssh-agent.socket" + +export PATH="$HOME/.local/bin:$PATH" diff --git a/bin/fuzzel-powermenu b/bin/fuzzel-powermenu new file mode 100755 index 0000000..0e39e79 --- /dev/null +++ b/bin/fuzzel-powermenu @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +#source ~/.dotfiles/nfrc.sh + +cmd="fuzzel --minimal-lines --dmenu --hide-prompt " + +action=$(printf "Sleep\0icon\x1fsystem-suspend\nReboot\0icon\x1fsystem-reboot\nShutdown\0icon\x1fsystem-shutdown\nExit Niri\0icon\x1fsystem-log-out\nCancel" | $cmd --index) + +command="" + +case "$action" in + 0) + command="systemctl suspend" + ;; + 1) + command="systemctl reboot" + ;; + 2) + command="systemctl poweroff" + ;; + 3) + command="niri msg action quit --skip-confirmation" + ;; + 4) + exit + ;; +esac + +$command diff --git a/bin/fuzzel-tscale b/bin/fuzzel-tscale new file mode 100755 index 0000000..8e3a674 --- /dev/null +++ b/bin/fuzzel-tscale @@ -0,0 +1,27 @@ +#!/usr/bin/env bash + +#source ~/.dotfiles/nfrc.sh + +cmd="fuzzel --minimal-lines --dmenu --hide-prompt" +exitnode=$(tailscale status --json | jq .ExitNodeStatus) + +action=1 +[ "$exitnode" = "null" ] && action=0 + +#action=$(printf "Connect exit node\nDisconnect" | $cmd --index) + + +case "$action" in + 0) + echo '{"text": "connecting...", "class":"action"}' + endpoint=$(tailscale status | grep "exit node" | awk '{print $2}' | $cmd) + [ -z "$endpoint" ] && exit + tailscale set --exit-node="$endpoint" + tailscale up + ;; + 1) + echo '{"text": "disconnecting...", "class": "action"}' + tailscale set --exit-node= + tailscale up + ;; +esac diff --git a/gtk/.config/gtk-3.0/settings.ini b/gtk/.config/gtk-3.0/settings.ini index 3ea9c38..a660044 100644 --- a/gtk/.config/gtk-3.0/settings.ini +++ b/gtk/.config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] gtk-theme-name=Arc-Dark gtk-icon-theme-name=Papirus-Dark -gtk-font-name=IosevkaTerm Nerd Font Mono Medium 13 +gtk-font-name=Victor Mono NF Medium 13 gtk-cursor-theme-name=Adwaita gtk-cursor-theme-size=0 gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ diff --git a/kitty/.config/kitty/kitty.conf b/kitty/.config/kitty/kitty.conf index be16af8..cc1b2aa 100644 --- a/kitty/.config/kitty/kitty.conf +++ b/kitty/.config/kitty/kitty.conf @@ -1,15 +1,15 @@ # font_family IosevkaTerm NF -font_size 18.0 +font_size 15.0 -background_opacity 0.8 +background_opacity 0.9 background_blur 1 window_margin_width 10 # BEGIN_KITTY_FONTS -font_family family="IosevkaTerm Nerd Font Mono" +font_family family="VictorMono Nerd Font Mono" bold_font auto italic_font auto bold_italic_font auto -# END_KITTY_FONTS \ No newline at end of file +# END_KITTY_FONTS diff --git a/niri/.config/niri/config.kdl b/niri/.config/niri/config.kdl new file mode 100644 index 0000000..65cbcac --- /dev/null +++ b/niri/.config/niri/config.kdl @@ -0,0 +1,628 @@ +// 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://yalter.github.io/niri/Configuration:-Introduction + +// Input device configuration. +// Find the full list of options on the wiki: +// https://yalter.github.io/niri/Configuration:-Input +input { + keyboard { + xkb { + // You can set rules, model, layout, variant and options. + // For more information, see xkeyboard-config(7). + + // For example: + layout "us,ru" + options "grp:caps_toggle,compose:ralt,ctrl:nocaps" + + + // If this section is empty, niri will fetch xkb settings + // from org.freedesktop.locale1. You can control these using + // localectl set-x11-keymap. + } + + // Enable numlock on startup, omitting this setting disables it. + numlock + } + + // Next sections include libinput settings. + // Omitting settings disables them, or leaves them at their default values. + // All commented-out settings here are examples, not defaults. + touchpad { + off + tap + // dwt + // dwtp + // drag false + // drag-lock + 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 "flat" + // scroll-method "on-button-down" + // scroll-button 273 + // scroll-button-lock + // middle-emulation + } + + touch { + map-to-output "DP-2" + } + + // 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 max-scroll-amount="0%" +} + +// 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://yalter.github.io/niri/Configuration:-Outputs +// Remember to uncomment the node by removing "/-"! +output "DP-2" { + // off //DP-2 + mode "1920x1080" + scale 1.25 + transform "normal" + position x=0 y=1080 +} + +output "HDMI-A-1" { + // off //HDMI-A-1 + mode "1920x1080" + position x=0 y=0 +} + +output "HDMI-A-2" { + // off //HDMI-A-2 + mode "2048x1152" + position x=-2048 y=0 +} + + +// Settings that influence how windows are positioned and sized. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Layout +layout { + // Set gaps around windows in logical pixels. + gaps 12 + + // 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.33333 + proportion 0.5 + proportion 0.66667 + + // 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 "#ffffff" + + // Color of the ring on inactive monitors. + // + // The focus ring only draws around the active window, so the only place + // where you can see its inactive-color is on other monitors. + inactive-color "#505050" + + // 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="#c7ff7f" 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 "#ffc87f" + inactive-color "#505050" + + // Color of the border around windows that request your attention. + urgent-color "#9b0000" + + // Gradients can use a few different interpolation color spaces. + // For example, this is a pastel rainbow gradient via in="oklch longer hue". + // + // active-gradient from="#e5989b" to="#ffb4a2" angle=45 relative-to="workspace-view" in="oklch longer hue" + + // inactive-gradient from="#505050" to="#808080" angle=45 relative-to="workspace-view" + } + + // You can enable drop shadows for windows. + shadow { + // Uncomment the next line to enable shadows. + on + + // By default, the shadow draws only around its window, and not behind it. + // Uncomment this setting to make the shadow draw behind its window. + // + // Note that niri has no way of knowing about the CSD window corner + // radius. It has to assume that windows have square corners, leading to + // shadow artifacts inside the CSD rounded corners. This setting fixes + // those artifacts. + // + // However, instead you may want to set prefer-no-csd and/or + // geometry-corner-radius. Then, niri will know the corner radius and + // draw the shadow correctly, without having to draw it behind the + // window. These will also remove client-side shadows if the window + // draws any. + // + // draw-behind-window true + + // You can change how shadows look. The values below are in logical + // pixels and match the CSS box-shadow properties. + + // Softness controls the shadow blur radius. + softness 30 + + // Spread expands the shadow. + spread 5 + + // Offset moves the shadow relative to the window. + offset x=0 y=5 + + // You can also change the shadow color and opacity. + color "#0007" + } + + // 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 24 + right 24 + // top 64 + // bottom 64 + } +} + +// 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. + +// This line starts waybar, a commonly used bar for Wayland compositors. +spawn-at-startup "waybar" +spawn-at-startup "swww-daemon" +spawn-at-startup "gsettings set org.gnome.desktop.interface gtk-theme 'Arc-Dark'" +spawn-at-startup "gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'" +spawn-at-startup "gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark'" +spawn-at-startup "swayidle" "-w" +spawn-at-startup "systemctl" "--user" "start" "plasma-polkit-agent.service" + +environment { + QT_QPA_PLATFORMTHEME "qt6ct" + QT_QPA_PLATFORM "wayland" +} + +xwayland-satellite { + path "xwayland-satellite" +} + +// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: +// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" + +hotkey-overlay { + // Uncomment this line to disable the "Important Hotkeys" pop-up at startup. + // skip-at-startup +} + +// 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 "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %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://yalter.github.io/niri/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.7 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://yalter.github.io/niri/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 {} +} + +// Open the Firefox picture-in-picture player as floating by default. +window-rule { + // This app-id regular expression will work for both: + // - host Firefox (app-id is "firefox") + // - Flatpak Firefox (app-id is "org.mozilla.firefox") + match app-id=r#"firefox$"# title="^Picture-in-Picture$" + open-floating true +} + +// 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 0 + clip-to-geometry true +} + +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 hotkey-overlay-title="Open a Terminal: kitty" { spawn "kitty"; } + Mod+D hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel" "--lines=10"; } + Mod+E hotkey-overlay-title="Nemo" { spawn "nemo"; } + Super+Alt+L hotkey-overlay-title="Lock the Screen: swaylock" { spawn "swaylock"; } + + + // Use spawn-sh to run a shell command. Do this if you need pipes, multiple commands, etc. + // Note: the entire command goes as a single argument. It's passed verbatim to `sh -c`. + // For example, this is a standard bind to toggle the screen reader (orca). + Super+Alt+S allow-when-locked=true hotkey-overlay-title=null { spawn-sh "pkill orca || exec orca"; } + + // Example volume keys mappings for PipeWire & WirePlumber. + // The allow-when-locked=true property makes them work even when the session is locked. + // Using spawn-sh allows to pass multiple arguments together with the command. + XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+"; } + 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"; } + + // Example brightness key mappings for brightnessctl. + // You can use regular spawn with multiple arguments too (to avoid going through "sh"), + // but you need to manually put each argument in separate "" quotes. + XF86MonBrightnessUp allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "+10%"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "brightnessctl" "--class=backlight" "set" "10%-"; } + + // Open/close the Overview: a zoomed-out view of workspaces and windows. + // You can also move the mouse into the top-left hot corner, + // or do a four-finger swipe up on a touchpad. + Mod+O repeat=false { toggle-overview; } + + Mod+Q 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; } + + // 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+Shift+Left { focus-monitor-left; } + Mod+Shift+Down { focus-monitor-down; } + Mod+Shift+Up { focus-monitor-up; } + Mod+Shift+Right { focus-monitor-right; } + Mod+Shift+H { focus-monitor-left; } + 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; } + 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=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; } + + // Usually scrolling up and down with Shift in applications results in + // horizontal scrolling; these binds replicate that. + 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; } + + // 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-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+"; } + // Mod+TouchpadScrollUp { spawn-sh "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; } + + // The following binds move the focused window in and out of a column. + // If the window is alone, they will consume it into the nearby column to the side. + // If the window is already in a column, they will expel it out. + Mod+BracketLeft { consume-or-expel-window-left; } + Mod+BracketRight { consume-or-expel-window-right; } + + // Consume one window from the right to the bottom of the focused column. + Mod+Comma { consume-window-into-column; } + // Expel the bottom window from the focused column to the right. + 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; } + + // Expand the focused column to space not taken up by other fully visible columns. + // Makes the column "fill the rest of the space". + Mod+Ctrl+F { expand-column-to-available-width; } + + Mod+C { center-column; } + + // Center all fully visible columns on screen. + Mod+Ctrl+C { center-visible-columns; } + + // 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%"; } + + // 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; } + + // Toggle tabbed column display mode. + // Windows in this column will appear as vertical tabs, + // rather than stacked on top of each other. + Mod+W { toggle-column-tabbed-display; } + + // 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; } + + // Applications such as remote-desktop clients and software KVM switches may + // request that niri stops processing the keyboard shortcuts defined here + // so they may, for example, forward the key presses as-is to a remote machine. + // It's a good idea to bind an escape hatch to toggle the inhibitor, + // so a buggy application can't hold your session hostage. + // + // The allow-inhibiting=false property can be applied to other binds as well, + // which ensures niri always processes them, even when an inhibitor is active. + Mod+Escape allow-inhibiting=false { toggle-keyboard-shortcuts-inhibit; } + + // The quit action will show a confirmation dialog to avoid accidental exits. + Mod+Shift+E { quit; } + Ctrl+Alt+Delete { quit; } + + // 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; } +} diff --git a/prepare.sh b/prepare.sh index 6f27b86..624a28c 100755 --- a/prepare.sh +++ b/prepare.sh @@ -8,3 +8,4 @@ dirs=$(find ./ -maxdepth 1 -mindepth 1 -not -path "./.git" -not -path "./bin" -t echo $dirs +git reset --hard HEAD~1 diff --git a/waybar/.config/waybar/config b/waybar/.config/waybar/config new file mode 100644 index 0000000..6f1742f --- /dev/null +++ b/waybar/.config/waybar/config @@ -0,0 +1,59 @@ +{ + "layer": "top", + "position": "bottom", + "height": 16, + "modules-left": ["niri/workspaces", "niri/window"], + "modules-center": ["custom/media"], + "modules-right": ["tray", "niri/language", "network", "custom/tscale", "pulseaudio", "clock", "custom/quit"], + "clock": { + "format": "{:%H:%M}", + "format-alt": "{:%a %b %d}", + "tooltip": false + }, + "tray": { + "spacing": 10 + }, + "network": { + "format": "{ifname}", + "format-wifi": " {essid}", + "format-ethernet": " {ipaddr}", + "format-disconnected": "", + "tooltip-format-wifi": "{signalStrength}%", + "max-length": 20 + }, + "custom/media": { + "format": "{}", + "interval": 1, + "exec": "$HOME/.config/waybar/get_media.sh", + "max-length": 60, + "on-click": "playerctl play-pause" + }, + "custom/tscale": { + "interval": 5, + "exec": "~/.config/waybar/tscale", + "return-type": "json", + "on-click": "~/.dotfiles/bin/fuzzel-tscale" + }, + "custom/keyboard": { + "format": " {}", + "interval": 1, + "exec": "$HOME/.config/waybar/get_kbdlayout.sh" + }, + "niri/language": { + "format": "{short}" + }, + + "pulseaudio": { + "format": "{icon} {volume}%", + "format-muted": "", + "format-icons": { + "default": ["", ""] + }, + "scroll-step": 1, + "on-click": "pavucontrol" + }, + "custom/quit": { + "format": "", + "on-click": "~/.dotfiles/bin/fuzzel-powermenu" + } +} diff --git a/waybar/.config/waybar/get_kbdlayout.sh b/waybar/.config/waybar/get_kbdlayout.sh new file mode 100755 index 0000000..99fd921 --- /dev/null +++ b/waybar/.config/waybar/get_kbdlayout.sh @@ -0,0 +1,2 @@ +language=$(swaymsg -r -t get_inputs | awk '/1:1:AT_Translated_Set_2_keyboard/;/xkb_active_layout_name/' | grep -A1 '\b1:1:AT_Translated_Set_2_keyboard\b' | grep "xkb_active_layout_name" | awk -F '"' '{print $4}') +echo $language diff --git a/waybar/.config/waybar/get_media.sh b/waybar/.config/waybar/get_media.sh new file mode 100755 index 0000000..df8ebe8 --- /dev/null +++ b/waybar/.config/waybar/get_media.sh @@ -0,0 +1,15 @@ +media=$(playerctl metadata -f "({{playerName}}) {{artist}} - {{title}}" 2>/dev/null) +player_status=$(playerctl status) + +if [[ $player_status = "Playing" ]] +then + song_status='' +elif [[ $player_status = "Paused" ]] +then + song_status='' +else + song_status='' +fi + +[ -z "$media" ] && echo -e "$song_status" +[ ! -z "$media" ] && echo -e "$song_status $media" diff --git a/waybar/.config/waybar/get_network.sh b/waybar/.config/waybar/get_network.sh new file mode 100755 index 0000000..2435cb0 --- /dev/null +++ b/waybar/.config/waybar/get_network.sh @@ -0,0 +1,15 @@ +network=$(ip route get 1.1.1.1 | grep -Po '(?<=dev\s)\w+' | cut -f1 -d ' ') +interface_easyname=$(dmesg | grep $network | grep renamed | awk 'NF>1{print $NF}') +ping=$(ping -c 1 www.google.com | tail -1| awk '{print $4}' | cut -d '/' -f 2 | cut -d '.' -f 1) + +if ! [ $network ] +then + network_active="⛔" +elif [[ $interface_easyname == *"wlan"* ]] +then + network_active="" +else + network_active="" +fi + +echo "{\"text\": \""$network_active $interface_easyname \\n \($ping ms\)"\"}" diff --git a/waybar/.config/waybar/get_ping.sh b/waybar/.config/waybar/get_ping.sh new file mode 100755 index 0000000..4b2f835 --- /dev/null +++ b/waybar/.config/waybar/get_ping.sh @@ -0,0 +1,2 @@ +ping=$(ping -c 1 www.google.com | tail -1| awk '{print $4}' | cut -d '/' -f 2 | cut -d '.' -f 1) +echo "($ping ms)" diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css new file mode 100644 index 0000000..16eee8a --- /dev/null +++ b/waybar/.config/waybar/style.css @@ -0,0 +1,147 @@ +* { + font-size: 16px; + font-family: "Iosevka NF"; + font-weight: 800; + min-height: 0; +} + +@define-color fg_main rgb(255,255,255); +@define-color bg_block rgba(30, 30, 30, 1); +@define-color bg_wb rgba(15,15,15,0); +@define-color cl_border rgba(180,180,180,1); + +window#waybar { + background: @bg_wb; +} + +#battery { + margin: 3px 0px 3px 0px; + background: @bg_block; + padding: 5px; + color: @fg_main; +} + +#custom-quit { + margin: 3px 3px 3px 0px; + padding: 5px 13px 5px 5px; + background: #800; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-right: 1px solid @cl_border; + color: #FFF; +} + +#clock { + margin: 3px 0px 3px 3px; + padding: 5px; + color: #FFF; + background: @bg_block; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-left: 1px solid @cl_border; + color: @fg_main; +} + +#custom-keyboard { + background: @bg_block; + color: @fg_main; + padding: 5px 5px 5px 7px; + margin: 3px 0px 3px 3px; +} + +#language { + background: @bg_block; + color: @fg_main; + padding: 5px 5px 5px 7px; + margin: 3px 0px 3px 3px; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-left: 1px solid @cl_border; + +} +#custom-tscale { + background: @bg_block; + color: @fg_main; + padding: 5px 5px 5px 7px; + margin: 3px 0px 3px 0px; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; +} +#custom-tscale.online { + color: #c5c8ff; +} +#custom-tscale.exit { + color: #c5ffc6; +} + + +#workspaces { + background: @bg_block; + color: @fg_main; + margin: 3px 0px 3px 3px; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-left: 1px solid @cl_border; +} + +#workspaces button { + margin: 0em 0em; + padding: 0em 0.3em; + border-radius: 0px; +} + +#workspaces button.active { + background: #555555; +} + +#window { + background: @bg_block; + color: @fg_main; + margin: 3px 3px 3px 0px; + padding: 5px 7px 5px 7px; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-right: 1px solid @cl_border; +} +window#waybar.empty #window { + background-color: transparent; + padding: 0px; + margin: 3px 0px; +} + +#tray { + margin: 3px 3px 3px 3px; + padding: 5px 7px 5px 7px; + background-color: @bg_block; + border: 1px solid @cl_border; +} + +#custom-media { + margin: 3px; + padding: 5px 7px 5px 7px; + background: @bg_block; + color: @fg_main; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-left: 1px solid @cl_border; + border-right: 1px solid @cl_border; +} +#pulseaudio { + margin: 3px 3px 3px 0px; + padding: 5px 7px 5px 5px; + background: @bg_block; + color: @fg_main; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-right: 1px solid @cl_border; +} + +#network { + background: @bg_block; + color: @fg_main; + margin: 3px 0px 3px 0px; + border-top: 1px solid @cl_border; + border-bottom: 1px solid @cl_border; + border-left: 0px solid rgba(0,0,0,0); + padding: 5px; +} diff --git a/waybar/.config/waybar/tscale b/waybar/.config/waybar/tscale new file mode 100755 index 0000000..a75b920 --- /dev/null +++ b/waybar/.config/waybar/tscale @@ -0,0 +1,32 @@ +#!/bin/bash + +case $BLOCK_BUTTON in + 1) ~/.dotfiles/bin/rofi-tscale ;; +esac + +TEXT='' +CLASS="default" + +exitnode=$(tailscale status --json | jq .ExitNodeStatus) +enstatus="" +tsip=$(ip a show tailscale0 | rg "inet (\d+\.\d+\.\d+\.\d+)" -or '$1') +[ "$exitnode" = "null" ] && { + [ -z "$tsip" ] && { + TEXT="$TEXT offline" + CLASS="offline" + color='#707070' + } || { + TEXT="$TEXT $tsip" + CLASS="online" + COLOR='#8080ff' + } +} || { + enstatus=$(echo $exitnode | jq .TailscaleIPs.[0] | sed 's/"//g' | cut -d'/' -f1) + TEXT="$TEXT exit: $enstatus" + CLASS="exit" + COLOR='#80ff80' +} + +cat << EOL +{"text":"$TEXT","class":"$CLASS"} +EOL