diff --git a/.config/emacs/config.el b/.config/emacs/config.el index 8bee678..a0db122 100644 --- a/.config/emacs/config.el +++ b/.config/emacs/config.el @@ -533,6 +533,7 @@ (use-package dart-mode) (use-package haskell-mode) +(use-package kdl-mode) (use-package lua-mode) (use-package php-mode) diff --git a/.config/emacs/config.org b/.config/emacs/config.org index 322fbf3..98725bd 100644 --- a/.config/emacs/config.org +++ b/.config/emacs/config.org @@ -722,6 +722,7 @@ Emacs has built-in programming language modes for Lisp, Scheme, DSSSL, Ada, ASM, #+begin_src emacs-lisp (use-package dart-mode) (use-package haskell-mode) +(use-package kdl-mode) (use-package lua-mode) (use-package php-mode) diff --git a/.config/niri/config.kdl b/.config/niri/config.kdl index 2648693..1e8e9e3 100644 --- a/.config/niri/config.kdl +++ b/.config/niri/config.kdl @@ -11,25 +11,11 @@ include "monitors.kdl" 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:win_space_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 @@ -71,42 +57,7 @@ input { 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 "eDP-1" { - // Uncomment this line to disable this output. - // off - - // Resolution and, optionally, refresh rate of the output. - // The format is "x" or "x@". - // 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=1280 y=0 -} +// Adding this in case it helps for Java programs environment { DISPLAY ":1" // # Optional: You may also need to add the following for some specific issues @@ -130,17 +81,8 @@ gestures { // Find more information on the wiki: // https://yalter.github.io/niri/Configuration:-Layout layout { - // Set gaps around windows in logical pixels. gaps 14 - - // 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. @@ -149,65 +91,20 @@ layout { 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 3 - - // 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 "#7fc8ff" - - // 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 "#282c34" - // 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" } @@ -216,56 +113,14 @@ layout { // 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 3 - active-color "#ffc87f" - inactive-color "#282c34" - - // 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" } @@ -283,43 +138,25 @@ layout { } // 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 "kanshi" spawn-at-startup "swayidle" "-w" \ "timeout" "600" "niri msg action power-off-monitors" spawn-at-startup "xwayland-satellite" spawn-at-startup "waypaper" "--backend" "swaybg" "--restore" -//spawn-at-startup "waybar" spawn-sh-at-startup "dms run" spawn-at-startup "/usr/bin/emacs" "--daemon" spawn-at-startup "nextcloud" -// 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 "~/Screenshots/scrot-%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 @@ -332,20 +169,6 @@ animations { } // 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") @@ -364,41 +187,14 @@ window-rule { 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 6 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 hotkey-overlay-title="Show important bindings" { show-hotkey-overlay; } - - // Suggested binds for running programs: terminal, app launcher, screen locker. // Mod+Shift+Return hotkey-overlay-title="Run an Application: fuzzel" { spawn "fuzzel" "-f" "Ubuntu:weight=regular:size=12" "-w" "60" "-x" "14" "-y" "14" "-b" "#282c34ff" "-t" "#abb2bfff" "-m" "#51afefff" "-s" "#1c1f24ff" "-S" "#abb2bfff" "-M" "#51afefff" "-C" "#51afefff" "-p" "RUN:"; } Mod+Return hotkey-overlay-title="Open terminal: alacritty" { spawn "alacritty"; } Mod+Shift+Return hotkey-overlay-title="Run launcher: rofi" { spawn "rofi" "-show" "drun" "-show-icons"; } @@ -408,15 +204,7 @@ binds { Mod+Shift+P hotkey-overlay-title="Password menu" { spawn "rofi-pass-wl"; } Mod+Shift+Q hotkey-overlay-title="Quit out of niri" { quit; } - // 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). - // Mod+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. - // "-l 1.0" limits the volume to 100%. XF86AudioRaiseVolume allow-when-locked=true { spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+ -l 1.0"; } 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"; } @@ -430,16 +218,13 @@ binds { XF86AudioNext allow-when-locked=true { spawn-sh "playerctl next"; } // 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 hotkey-overlay-title="Toggle overview" { toggle-overview; } - + + // Close window with focus Mod+Shift+C repeat=false hotkey-overlay-title="Close window" { close-window; } // Move focus right, down, up, left @@ -486,11 +271,6 @@ binds { Mod+Ctrl+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; } @@ -513,9 +293,6 @@ binds { // "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; }