diff --git a/flake.lock b/flake.lock index 244e601b..3cd7de39 100644 --- a/flake.lock +++ b/flake.lock @@ -526,11 +526,11 @@ ] }, "locked": { - "lastModified": 1764135300, - "narHash": "sha256-5xOuutXM7UPTUcn3uDAD8UlPQsXmqPrX81cXoDOAGcA=", + "lastModified": 1765980955, + "narHash": "sha256-rB45jv4uwC90vM9UZ70plfvY/2Kdygs+zlQ07dGQFk4=", "owner": "nix-community", "repo": "home-manager", - "rev": "f4cb25928fafa9ae68660fe71f730fc820a59028", + "rev": "89c9508bbe9b40d36b3dc206c2483ef176f15173", "type": "github" }, "original": { @@ -600,62 +600,6 @@ "url": "ssh://git@github.com/ryan4yin/nix-secrets.git" } }, - "niri": { - "inputs": { - "niri-stable": "niri-stable", - "niri-unstable": "niri-unstable", - "nixpkgs": "nixpkgs_5", - "nixpkgs-stable": "nixpkgs-stable", - "xwayland-satellite-stable": "xwayland-satellite-stable", - "xwayland-satellite-unstable": "xwayland-satellite-unstable" - }, - "locked": { - "lastModified": 1764165116, - "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=", - "owner": "sodiboo", - "repo": "niri-flake", - "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94", - "type": "github" - }, - "original": { - "owner": "sodiboo", - "repo": "niri-flake", - "type": "github" - } - }, - "niri-stable": { - "flake": false, - "locked": { - "lastModified": 1756556321, - "narHash": "sha256-RLD89dfjN0RVO86C/Mot0T7aduCygPGaYbog566F0Qo=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "01be0e65f4eb91a9cd624ac0b76aaeab765c7294", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "ref": "v25.08", - "repo": "niri", - "type": "github" - } - }, - "niri-unstable": { - "flake": false, - "locked": { - "lastModified": 1764160906, - "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=", - "owner": "YaLTeR", - "repo": "niri", - "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95", - "type": "github" - }, - "original": { - "owner": "YaLTeR", - "repo": "niri", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -842,11 +786,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1765787323, - "narHash": "sha256-sNF/PZcuzYBHKRBkerEiPf5mkZM15A3fWD+lqpwKc60=", + "lastModified": 1766076739, + "narHash": "sha256-acPMRCAPgPykzkwATwD1EfF7xgmbraAvIJyCeR6bKxc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6812bcfd614abedbdb3f68d7b6554eda6ca3e014", + "rev": "e50ab9bb181f9fb3ce00e7a6007c70ddaa007203", "type": "github" }, "original": { @@ -889,22 +833,6 @@ } }, "nixpkgs-stable": { - "locked": { - "lastModified": 1763948260, - "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-25.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-stable_2": { "locked": { "lastModified": 1764020296, "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", @@ -964,27 +892,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", + "lastModified": 1764979303, + "narHash": "sha256-/US2Ei9JHXHVBAxV4FX49Q7H5s4UNBrIiOA6Xjzgq44=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { - "locked": { - "lastModified": 1763966396, - "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", + "rev": "0254eab410b90ef2420c1059f908ae777e3b02f9", "type": "github" }, "original": { @@ -1129,19 +1041,18 @@ "lanzaboote": "lanzaboote", "my-asahi-firmware": "my-asahi-firmware", "mysecrets": "mysecrets", - "niri": "niri", "nix-darwin": "nix-darwin", "nix-gaming": "nix-gaming", "nixos-apple-silicon": "nixos-apple-silicon", "nixos-generators": "nixos-generators", "nixpak": "nixpak", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_5", "nixpkgs-2505": "nixpkgs-2505", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", "nixpkgs-mesa": "nixpkgs-mesa", "nixpkgs-patched": "nixpkgs-patched", - "nixpkgs-stable": "nixpkgs-stable_2", + "nixpkgs-stable": "nixpkgs-stable", "nu_scripts": "nu_scripts", "nuenv": "nuenv", "nur-ryan4yin": "nur-ryan4yin", @@ -1308,39 +1219,6 @@ "type": "github" } }, - "xwayland-satellite-stable": { - "flake": false, - "locked": { - "lastModified": 1755491097, - "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "388d291e82ffbc73be18169d39470f340707edaa", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "ref": "v0.7", - "repo": "xwayland-satellite", - "type": "github" - } - }, - "xwayland-satellite-unstable": { - "flake": false, - "locked": { - "lastModified": 1763704521, - "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", - "type": "github" - }, - "original": { - "owner": "Supreeeme", - "repo": "xwayland-satellite", - "type": "github" - } - }, "zig": { "inputs": { "flake-compat": [ diff --git a/flake.nix b/flake.nix index 7a87e475..78524a94 100644 --- a/flake.nix +++ b/flake.nix @@ -143,8 +143,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - niri.url = "github:sodiboo/niri-flake"; - helix = { # Helix with steel as plugin system # https://github.com/helix-editor/helix/pull/8675 diff --git a/home/linux/gui/niri/conf/config.kdl b/home/linux/gui/niri/conf/config.kdl new file mode 100644 index 00000000..399932c7 --- /dev/null +++ b/home/linux/gui/niri/conf/config.kdl @@ -0,0 +1,232 @@ +// 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 + +// This is the main configuration file that includes all other config files +include "./keybindings.kdl" +include "./windowrules.kdl" +include "./spawn-at-startup.kdl" +include "./niri-hardware.kdl" + +// 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: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 + + // You can set the keyboard repeat parameters. The defaults match wlroots and sway. + // Delay is in milliseconds before the repeat starts. Rate is in characters per second. + // repeat-delay 600 + // repeat-rate 25 + + // Niri can remember the keyboard layout globally (the default) or per-window. + // - "global" - layout change is global for all windows. + // - "window" - layout is tracked for each window individually. + // track-layout "global" + } + + // 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 { + // tap // tap-to-click + dwt // disable-when-typing. + // dwtp // disable-when-trackpointing. + natural-scroll // inverts the scrolling direction. + // accel-speed 0.2 + // accel-profile "flat" + // tap-button-map "left-middle-right" + } + + mouse { + // natural-scroll // inverts the scrolling direction. + // accel-speed 0.2 + // accel-profile "flat" + } + + // 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%" +} + +// 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 8 + + // 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.333333 + proportion 0.500000 + proportion 0.666667 + + // Fixed sets the width in logical pixels exactly. + // fixed 1920 + } + + // You can change the default width of the new windows. + default-column-width { proportion 0.500000; } + // 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 4 + + // 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 "#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" + } + + // 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 + } +} + +cursor { + // Change the theme and size of the cursor as well as set the + // `XCURSOR_THEME` and `XCURSOR_SIZE` env variables. + // xcursor-theme "default" + // xcursor-size 24 +} + +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 3.0 +} + +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Window-Rules + +layer-rule { + match namespace="waybar" + opacity 0.800000 +} diff --git a/home/linux/gui/niri/conf/keybindings.kdl b/home/linux/gui/niri/conf/keybindings.kdl new file mode 100644 index 00000000..a298e098 --- /dev/null +++ b/home/linux/gui/niri/conf/keybindings.kdl @@ -0,0 +1,239 @@ +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 "foot"; } + Mod+Shift+Return { spawn "alacritty"; } + Mod+D { spawn "anyrun"; } + CTRL+Alt+L { 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. + // "-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"; } + XF86AudioMicMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"; } + + // Example media keys mapping using playerctl. + // This will work with any MPRIS-enabled media player. + XF86AudioPlay allow-when-locked=true { spawn-sh "playerctl play-pause"; } + XF86AudioStop allow-when-locked=true { spawn-sh "playerctl stop"; } + XF86AudioPrev allow-when-locked=true { spawn-sh "playerctl previous"; } + 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 { 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; } + "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 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 "1terminal"; } + Mod+2 { focus-workspace "2browser"; } + Mod+3 { focus-workspace "3chat"; } + Mod+4 { focus-workspace "4music"; } + Mod+5 { focus-workspace "5mail"; } + Mod+6 { focus-workspace "6file"; } + Mod+7 { focus-workspace 7; } + Mod+8 { focus-workspace 8; } + Mod+9 { focus-workspace 9; } + Mod+0 { focus-workspace "0other"; } + Mod+Ctrl+1 { move-column-to-workspace "1terminal"; } + Mod+Ctrl+2 { move-column-to-workspace "2browser"; } + Mod+Ctrl+3 { move-column-to-workspace "3chat"; } + Mod+Ctrl+4 { move-column-to-workspace "4music"; } + Mod+Ctrl+5 { move-column-to-workspace "5mail"; } + Mod+Ctrl+6 { move-column-to-workspace "6file"; } + Mod+Ctrl+7 { move-column-to-workspace 7; } + Mod+Ctrl+8 { move-column-to-workspace 8; } + Mod+Ctrl+9 { move-column-to-workspace 9; } + Mod+Ctrl+0 { move-column-to-workspace "0other"; } + + // 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/home/linux/gui/niri/conf/spawn-at-startup.kdl b/home/linux/gui/niri/conf/spawn-at-startup.kdl new file mode 100644 index 00000000..6cd4d762 --- /dev/null +++ b/home/linux/gui/niri/conf/spawn-at-startup.kdl @@ -0,0 +1,26 @@ +// 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" + +// To run a shell command (with variables, pipes, etc.), use spawn-sh-at-startup: +// spawn-sh-at-startup "qs -c ~/source/qs/MyAwesomeShell" + +// Terminal applications +spawn-at-startup "foot" +spawn-at-startup "alacritty" +spawn-at-startup "ghostty" + +// Network proxy +spawn-at-startup "clash-verge" + +// Web browsers +spawn-at-startup "firefox" +spawn-at-startup "google-chrome-stable" +spawn-at-startup "chromium-browser" + +// Communication applications +spawn-at-startup "Telegram" diff --git a/home/linux/gui/niri/conf/windowrules.kdl b/home/linux/gui/niri/conf/windowrules.kdl new file mode 100644 index 00000000..d687a116 --- /dev/null +++ b/home/linux/gui/niri/conf/windowrules.kdl @@ -0,0 +1,103 @@ +// Window rules let you adjust behavior for individual windows. +// Find more information on the wiki: +// https://yalter.github.io/niri/Configuration:-Window-Rules + +// Terminal applications - open in workspace 1 +window-rule { + match app-id="foot" + open-on-workspace "1terminal" + open-maximized true +} +window-rule { + match app-id="Alacritty" + open-on-workspace "1terminal" + open-maximized true +} +window-rule { + match app-id="com.mitchellh.ghostty" + open-on-workspace "1terminal" + open-maximized true +} + +// Web browsers - open in workspace 2 +window-rule { + match app-id="firefox" + open-on-workspace "2browser" + open-maximized true +} +window-rule { + match app-id="google-chrome" + open-on-workspace "2browser" + open-maximized true +} +window-rule { + match app-id="chromium-browser" + open-on-workspace "2browser" + open-maximized true +} + +// Chat applications - open in workspace 3 +window-rule { + match app-id="org.telegram.desktop" + open-on-workspace "3chat" +} +window-rule { + match app-id="wechat" + open-on-workspace "3chat" +} +window-rule { + match app-id="QQ" + open-on-workspace "3chat" +} + +// Gaming applications - open in workspace 4 +window-rule { + match app-id="steam" + open-on-workspace "4gaming" +} +window-rule { + match app-id="steam_app_default" + open-on-workspace "4gaming" +} +window-rule { + match app-id="heroic" + open-on-workspace "4gaming" +} +window-rule { + match app-id="net.lutris.Lutris" + open-on-workspace "4gaming" +} +window-rule { + match app-id="com.vysp3r.ProtonPlus" + open-on-workspace "4gaming" +} +window-rule { + // Run anime games on Linux + match app-id="^moe.launcher" + open-on-workspace "4gaming" +} +window-rule { + // All *.exe (Windows applications) + match app-id=".exe$" + open-on-workspace "4gaming" +} + +// File management applications - open in workspace 6 +window-rule { + match app-id="com.github.johnfactotum.Foliate" + open-on-workspace "6file" +} +window-rule { + match app-id="thunar" + open-on-workspace "6file" +} + +// Other applications - open in workspace 0 +window-rule { + match app-id="clash-verge" + open-on-workspace "0other" +} +window-rule { + match app-id="Zoom Workplace" + open-on-workspace "0other" +} diff --git a/home/linux/gui/niri/default.nix b/home/linux/gui/niri/default.nix index d46df8bc..6303a248 100644 --- a/home/linux/gui/niri/default.nix +++ b/home/linux/gui/niri/default.nix @@ -2,7 +2,6 @@ pkgs, config, lib, - niri, ... }@args: let @@ -11,27 +10,6 @@ in { options.modules.desktop.niri = { enable = lib.mkEnableOption "niri compositor"; - settings = lib.mkOption { - type = - with lib.types; - let - valueType = - nullOr (oneOf [ - bool - int - float - str - path - (attrsOf valueType) - (listOf valueType) - ]) - // { - description = "niri configuration value"; - }; - in - valueType; - default = { }; - }; }; config = lib.mkIf cfg.enable ( @@ -42,7 +20,35 @@ in xwayland-satellite ]; - programs.niri.config = cfg.settings; + xdg.configFile = + let + mkSymlink = config.lib.file.mkOutOfStoreSymlink; + confPath = "${config.home.homeDirectory}/nix-config/home/linux/gui/niri/conf"; + in + { + "niri/config.kdl".source = mkSymlink "${confPath}/config.kdl"; + "niri/keybindings.kdl".source = mkSymlink "${confPath}/keybindings.kdl"; + "niri/spawn-at-startup.kdl".source = mkSymlink "${confPath}/spawn-at-startup.kdl"; + "niri/windowrules.kdl".source = mkSymlink "${confPath}/windowrules.kdl"; + }; + + systemd.user.services.niri-flake-polkit = { + Unit = { + Description = "PolicyKit Authentication Agent provided by niri-flake"; + After = [ + "graphical-session.target" + ]; + Wants = [ "graphical-session-pre.target" ]; + }; + Install.WantedBy = [ "niri.service" ]; + Service = { + Type = "simple"; + ExecStart = "${pkgs.kdePackages.polkit-kde-agent-1}/libexec/polkit-kde-authentication-agent-1"; + Restart = "on-failure"; + RestartSec = 1; + TimeoutStopSec = 10; + }; + }; # NOTE: this executable is used by greetd to start a wayland session when system boot up # with such a vendor-no-locking script, we can switch to another wayland compositor without modifying greetd's config in NixOS module @@ -56,10 +62,6 @@ in executable = true; }; } - (import ./settings.nix niri) - (import ./keybindings.nix niri) - (import ./spawn-at-startup.nix niri) - (import ./windowrules.nix niri) ] ); diff --git a/home/linux/gui/niri/keybindings.nix b/home/linux/gui/niri/keybindings.nix deleted file mode 100644 index a9405fed..00000000 --- a/home/linux/gui/niri/keybindings.nix +++ /dev/null @@ -1,214 +0,0 @@ -niri: { - programs.niri.config = - let - inherit (niri.lib.kdl) - node - plain - leaf - flag - ; - in - [ - (plain "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. - (plain "Mod+Shift+Slash" [ (flag "show-hotkey-overlay") ]) - - # Suggested binds for running programs: terminal, app launcher, screen locker. - (plain "Mod+Return" [ (leaf "spawn" [ "foot" ]) ]) - (plain "Mod+Shift+Return" [ (leaf "spawn" [ "alacritty" ]) ]) - (plain "Mod+D" [ (leaf "spawn" [ "anyrun" ]) ]) - (plain "CTRL+Alt+L" [ (leaf "spawn" [ "swaylock" ]) ]) - - # You can also use a shell: - # (plain "Mod+T" [(leaf "spawn" [ "bash" "-c" "notify-send hello && exec alacritty" ])]) - - # Example volume keys mappings for PipeWire & WirePlumber. - (plain "XF86AudioRaiseVolume" [ - (leaf "spawn" [ - "wpctl" - "set-volume" - "@DEFAULT_AUDIO_SINK@" - "0.1+" - ]) - ]) - (plain "XF86AudioLowerVolume" [ - (leaf "spawn" [ - "wpctl" - "set-volume" - "@DEFAULT_AUDIO_SINK@" - "0.1-" - ]) - ]) - - (plain "Mod+Q" [ (flag "close-window") ]) - - (plain "Mod+Left" [ (flag "focus-column-left") ]) - (plain "Mod+Down" [ (flag "focus-window-down") ]) - (plain "Mod+Up" [ (flag "focus-window-up") ]) - (plain "Mod+Right" [ (flag "focus-column-right") ]) - (plain "Mod+H" [ (flag "focus-column-left") ]) - (plain "Mod+J" [ (flag "focus-window-down") ]) - (plain "Mod+K" [ (flag "focus-window-up") ]) - (plain "Mod+L" [ (flag "focus-column-right") ]) - - (plain "Mod+Ctrl+Left" [ (flag "move-column-left") ]) - (plain "Mod+Ctrl+Down" [ (flag "move-window-down") ]) - (plain "Mod+Ctrl+Up" [ (flag "move-window-up") ]) - (plain "Mod+Ctrl+Right" [ (flag "move-column-right") ]) - (plain "Mod+Ctrl+H" [ (flag "move-column-left") ]) - (plain "Mod+Ctrl+J" [ (flag "move-window-down") ]) - (plain "Mod+Ctrl+K" [ (flag "move-window-up") ]) - (plain "Mod+Ctrl+L" [ (flag "move-column-right") ]) - - # Alternative commands that move across workspaces when reaching - # the first or last window in a column. - # (plain "Mod+J" [(flag "focus-window-or-workspace-down")]) - # (plain "Mod+K" [(flag "focus-window-or-workspace-up")]) - # (plain "Mod+Ctrl+J" [(flag "move-window-down-or-to-workspace-down")]) - # (plain "Mod+Ctrl+K" [(flag "move-window-up-or-to-workspace-up")]) - - (plain "Mod+Home" [ (flag "focus-column-first") ]) - (plain "Mod+End" [ (flag "focus-column-last") ]) - (plain "Mod+Ctrl+Home" [ (flag "move-column-to-first") ]) - (plain "Mod+Ctrl+End" [ (flag "move-column-to-last") ]) - - (plain "Mod+Shift+Left" [ (flag "focus-monitor-left") ]) - (plain "Mod+Shift+Down" [ (flag "focus-monitor-down") ]) - (plain "Mod+Shift+Up" [ (flag "focus-monitor-up") ]) - (plain "Mod+Shift+Right" [ (flag "focus-monitor-right") ]) - (plain "Mod+Shift+H" [ (flag "focus-monitor-left") ]) - (plain "Mod+Shift+J" [ (flag "focus-monitor-down") ]) - (plain "Mod+Shift+K" [ (flag "focus-monitor-up") ]) - (plain "Mod+Shift+L" [ (flag "focus-monitor-right") ]) - - (plain "Mod+Shift+Ctrl+Left" [ (flag "move-column-to-monitor-left") ]) - (plain "Mod+Shift+Ctrl+Down" [ (flag "move-column-to-monitor-down") ]) - (plain "Mod+Shift+Ctrl+Up" [ (flag "move-column-to-monitor-up") ]) - (plain "Mod+Shift+Ctrl+Right" [ (flag "move-column-to-monitor-right") ]) - (plain "Mod+Shift+Ctrl+H" [ (flag "move-column-to-monitor-left") ]) - (plain "Mod+Shift+Ctrl+J" [ (flag "move-column-to-monitor-down") ]) - (plain "Mod+Shift+Ctrl+K" [ (flag "move-column-to-monitor-up") ]) - (plain "Mod+Shift+Ctrl+L" [ (flag "move-column-to-monitor-right") ]) - - # Alternatively, there are commands to move just a single window: - # (plain "Mod+Shift+Ctrl+Left" [(flag "move-window-to-monitor-left")]) - # ... - - # And you can also move a whole workspace to another monitor: - # (plain "Mod+Shift+Ctrl+Left" [(flag "move-workspace-to-monitor-left")]) - # ... - - (plain "Mod+Page_Down" [ (flag "focus-workspace-down") ]) - (plain "Mod+Page_Up" [ (flag "focus-workspace-up") ]) - (plain "Mod+U" [ (flag "focus-workspace-down") ]) - (plain "Mod+I" [ (flag "focus-workspace-up") ]) - (plain "Mod+Ctrl+Page_Down" [ (flag "move-column-to-workspace-down") ]) - (plain "Mod+Ctrl+Page_Up" [ (flag "move-column-to-workspace-up") ]) - (plain "Mod+Ctrl+U" [ (flag "move-column-to-workspace-down") ]) - (plain "Mod+Ctrl+I" [ (flag "move-column-to-workspace-up") ]) - - # Alternatively, there are commands to move just a single window: - # (plain "Mod+Ctrl+Page_Down" [(flag "move-window-to-workspace-down")]) - # ... - - (plain "Mod+Shift+Page_Down" [ (flag "move-workspace-down") ]) - (plain "Mod+Shift+Page_Up" [ (flag "move-workspace-up") ]) - (plain "Mod+Shift+U" [ (flag "move-workspace-down") ]) - (plain "Mod+Shift+I" [ (flag "move-workspace-up") ]) - - # 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. - (plain "Mod+1" [ (leaf "focus-workspace" "1terminal") ]) - (plain "Mod+2" [ (leaf "focus-workspace" "2browser") ]) - (plain "Mod+3" [ (leaf "focus-workspace" "3chat") ]) - (plain "Mod+4" [ (leaf "focus-workspace" "4music") ]) - (plain "Mod+5" [ (leaf "focus-workspace" "5mail") ]) - (plain "Mod+6" [ (leaf "focus-workspace" "6file") ]) - (plain "Mod+7" [ (leaf "focus-workspace" 7) ]) - (plain "Mod+8" [ (leaf "focus-workspace" 8) ]) - (plain "Mod+9" [ (leaf "focus-workspace" 9) ]) - (plain "Mod+0" [ (leaf "focus-workspace" "0other") ]) - (plain "Mod+Ctrl+1" [ (leaf "move-column-to-workspace" "1terminal") ]) - (plain "Mod+Ctrl+2" [ (leaf "move-column-to-workspace" "2browser") ]) - (plain "Mod+Ctrl+3" [ (leaf "move-column-to-workspace" "3chat") ]) - (plain "Mod+Ctrl+4" [ (leaf "move-column-to-workspace" "4music") ]) - (plain "Mod+Ctrl+5" [ (leaf "move-column-to-workspace" "5mail") ]) - (plain "Mod+Ctrl+6" [ (leaf "move-column-to-workspace" "6file") ]) - (plain "Mod+Ctrl+7" [ (leaf "move-column-to-workspace" 7) ]) - (plain "Mod+Ctrl+8" [ (leaf "move-column-to-workspace" 8) ]) - (plain "Mod+Ctrl+9" [ (leaf "move-column-to-workspace" 9) ]) - (plain "Mod+Ctrl+0" [ (leaf "move-column-to-workspace" "0other") ]) - - # Alternatively, there are commands to move just a single window: - # (plain "Mod+Ctrl+1" [(leaf "move-window-to-workspace" 1)]) - - (plain "Mod+Comma" [ (flag "consume-window-into-column") ]) - (plain "Mod+Period" [ (flag "expel-window-from-column") ]) - - # There are also commands that consume or expel a single window to the side. - # (plain "Mod+BracketLeft" [(flag "consume-or-expel-window-left")]) - # (plain "Mod+BracketRight" [(flag "consume-or-expel-window-right")]) - - (plain "Mod+R" [ (flag "switch-preset-column-width") ]) - (plain "Mod+F" [ (flag "maximize-column") ]) - (plain "Mod+Shift+F" [ (flag "fullscreen-window") ]) - (plain "Mod+C" [ (flag "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, - # (leaf "set-column-width" "100") will make the column occupy 200 physical screen pixels. - (plain "Mod+Minus" [ (leaf "set-column-width" "-10%") ]) - (plain "Mod+Equal" [ (leaf "set-column-width" "+10%") ]) - - # Finer height adjustments when in column with other windows. - (plain "Mod+Shift+Minus" [ (leaf "set-window-height" "-10%") ]) - (plain "Mod+Shift+Equal" [ (leaf "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). - # (plain "Mod+Space" [(leaf "switch-layout" "next")]) - # (plain "Mod+Shift+Space" [(leaf "switch-layout" "prev")]) - - # Take an area screenshot. Select the area to screenshot with mouse - (plain "Print" [ (flag "screenshot") ]) - # Take a screenshot of the focused monitor - (plain "Ctrl+Print" [ (flag "screenshot-screen") ]) - # Take a screenshot of the focused window - (plain "Alt+Print" [ (flag "screenshot-window") ]) - - (plain "Mod+Shift+E" [ (leaf "spawn" [ "wlogout" ]) ]) - - (plain "Mod+Shift+P" [ (flag "power-off-monitors") ]) - - # This debug bind will tint all surfaces green, unless they are being - # directly scanned out. It's therefore useful to check if direct scanout - # is working. - # (plain "Mod+Shift+Ctrl+T" [(flag "toggle-debug-tint")]) - ]) - ]; -} diff --git a/home/linux/gui/niri/settings.nix b/home/linux/gui/niri/settings.nix deleted file mode 100644 index f23519c3..00000000 --- a/home/linux/gui/niri/settings.nix +++ /dev/null @@ -1,276 +0,0 @@ -niri: { - programs.niri.config = - let - inherit (niri.lib.kdl) - node - plain - leaf - flag - ; - in - [ - (plain "input" [ - (plain "keyboard" [ - (plain "xkb" [ - # You can set rules, model, layout, variant and options. - # For more information, see xkeyboard-config(7). - - # For example: - # (leaf "layout" "us,ru") - # (leaf "options" "grp:win_space_toggle,compose:ralt,ctrl:nocaps") - ]) - - # You can set the keyboard repeat parameters. The defaults match wlroots and sway. - # Delay is in milliseconds before the repeat starts. Rate is in characters per second. - # (leaf "repeat-delay" 600) - # (leaf "repeat-rate" 25) - - # Niri can remember the keyboard layout globally (the default) or per-window. - # - "global" - layout change is global for all windows. - # - "window" - layout is tracked for each window individually. - # (leaf "track-layout" "global") - ]) - - # Next sections include libinput settings. - # Omitting settings disables them, or leaves them at their default values. - (plain "touchpad" [ - # (flag "tap") # tap-to-click - (flag "dwt") # disable-when-typing. - # (flag "dwtp") # disable-when-trackpointing. - (flag "natural-scroll") # inverts the scrolling direction. - # (leaf "accel-speed" 0.2) - # (leaf "accel-profile" "flat") - # (leaf "tap-button-map" "left-middle-right") - ]) - - (plain "mouse" [ - # (flag "natural-scroll") # inverts the scrolling direction. - # (leaf "accel-speed" 0.2) - # (leaf "accel-profile" "flat") - ]) - - # By default, niri will take over the power button to make it sleep - # instead of power off. - # Uncomment this if you would like to configure the power button elsewhere - # (i.e. logind.conf). - # (flag "disable-power-key-handling") - ]) - - (plain "layout" [ - # 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. - - # You can change how the focus ring looks. - (plain "focus-ring" [ - # Uncomment this line to disable the focus ring. - # (flag "off") - - # How many logical pixels the ring extends out from the windows. - (leaf "width" 4) - - # 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. - (leaf "active-color" "#7fc8ff") - - # Color of the ring on inactive monitors. - (leaf "inactive-color" "#505050") - - # Additionally, there's a legacy RGBA syntax: - # (leaf "active-color" [ 127 200 255 255 ]) - - # 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. - # - # (leaf "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"; - # - # (leaf "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. - (plain "border" [ - # The settings are the same as for the focus ring. - # If you enable the border, you probably want to disable the focus ring. - (flag "off") - - (leaf "width" 4) - (leaf "active-color" "#ffc87f") - (leaf "inactive-color" "#505050") - - # (leaf "active-gradient" { from="#ffbb66"; to="#ffc880"; angle=45; relative-to="workspace-view"; }) - # (leaf "inactive-gradient" { from="#505050"; to="#808080"; angle=45; relative-to="workspace-view"; }) - ]) - - # You can customize the widths that "switch-preset-column-width" (Mod+R) toggles between. - (plain "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. - (leaf "proportion" (1.0 / 3.0)) - (leaf "proportion" (1.0 / 2.0)) - (leaf "proportion" (2.0 / 3.0)) - - # Fixed sets the width in logical pixels exactly. - # (leaf "fixed" 1920) - ]) - - # You can change the default width of the new windows. - (plain "default-column-width" [ - (leaf "proportion" 0.5) - ]) - # If you leave the children empty, the windows themselves will decide their initial width. - # (plain "default-column-width" []) - - # Set gaps around windows in logical pixels. - (leaf "gaps" 8) - - # 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. - (plain "struts" [ - # (leaf "left" 64) - # (leaf "right" 64) - # (leaf "top" 64) - # (leaf "bottom" 64) - ]) - - # 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. - # - "on-overflow", focusing a column will center it if it doesn't fit - # together with the previously focused column. - # - "always", the focused column will always be centered. - (leaf "center-focused-column" "never") - ]) - - (plain "cursor" [ - # Change the theme and size of the cursor as well as set the - # `XCURSOR_THEME` and `XCURSOR_SIZE` env variables. - # (leaf "xcursor-theme" "default") - # (leaf "xcursor-size" 24) - ]) - - # 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 rounded corners. - # (flag "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. - (leaf "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. - # (leaf "screenshot-path" null) - - # Settings for the "Important Hotkeys" overlay. - (plain "hotkey-overlay" [ - # Uncomment this line if you don't want to see the hotkey help at niri startup. - # (flag "skip-at-startup") - ]) - - (plain "layer-rule" [ - (leaf "match" { namespace = "waybar"; }) - (leaf "opacity" 0.8) - ]) - - # Animation settings. - (plain "animations" [ - # Uncomment to turn off all animations. - # (flag "off") - - # Slow down all animations by this factor. Values below 1 speed them up instead. - # (leaf "slowdown" 3.0) - - # You can configure all individual animations. - # Available settings are the same for all of them. - # - off disables the animation. - # - # Niri supports two animation types: easing and spring. - # You can set properties for only ONE of them. - # - # Easing has the following settings: - # - duration-ms sets the duration of the animation in milliseconds. - # - curve sets the easing curve. Currently, available curves - # are "ease-out-cubic" and "ease-out-expo". - # - # Spring animations work better with touchpad gestures, because they - # take into account the velocity of your fingers as you release the swipe. - # The parameters are less obvious and generally should be tuned - # with trial and error. Notably, you cannot directly set the duration. - # You can use this app to help visualize how the spring parameters - # change the animation: https://flathub.org/apps/app.drey.Elastic - # - # A spring animation is configured like this: - # - (leaf "spring" { damping-ratio=1.0; stiffness=1000; epsilon=0.0001; }) - # - # The damping ratio goes from 0.1 to 10.0 and has the following properties: - # - below 1.0: underdamped spring, will oscillate in the end. - # - above 1.0: overdamped spring, won't oscillate. - # - 1.0: critically damped spring, comes to rest in minimum possible time - # without oscillations. - # - # However, even with damping ratio = 1.0 the spring animation may oscillate - # if "launched" with enough velocity from a touchpad swipe. - # - # Lower stiffness will result in a slower animation more prone to oscillation. - # - # Set epsilon to a lower value if the animation "jumps" in the end. - # - # The spring mass is hardcoded to 1.0 and cannot be changed. Instead, change - # stiffness proportionally. E.g. increasing mass by 2x is the same as - # decreasing stiffness by 2x. - - # Animation when switching workspaces up and down, - # including after the touchpad gesture. - (plain "workspace-switch" [ - # (flag "off") - # (leaf "spring" { damping-ratio=1.0; stiffness=1000; epsilon=0.0001; }) - ]) - - # All horizontal camera view movement: - # - When a window off-screen is focused and the camera scrolls to it. - # - When a new window appears off-screen and the camera scrolls to it. - # - When a window resizes bigger and the camera scrolls to show it in full. - # - And so on. - (plain "horizontal-view-movement" [ - # (flag "off") - # (leaf "spring" { damping-ratio=1.0; stiffness=800; epsilon=0.0001; }) - ]) - - # Window opening animation. Note that this one has different defaults. - (plain "window-open" [ - # (flag "off") - # (leaf "duration-ms" 150) - # (leaf "curve" "ease-out-expo") - - # Example for a slightly bouncy window opening: - # (leaf "spring" { damping-ratio=0.8; stiffness=1000; epsilon=0.0001; }) - ]) - - # Config parse error and new default config creation notification - # open/close animation. - (plain "config-notification-open-close" [ - # (flag "off") - # (leaf "spring" { damping-ratio=0.6; stiffness=1000; epsilon=0.001; }) - ]) - ]) - ]; -} diff --git a/home/linux/gui/niri/spawn-at-startup.nix b/home/linux/gui/niri/spawn-at-startup.nix deleted file mode 100644 index cadafdf3..00000000 --- a/home/linux/gui/niri/spawn-at-startup.nix +++ /dev/null @@ -1,28 +0,0 @@ -niri: { - programs.niri.config = - let - inherit (niri.lib.kdl) - node - plain - leaf - flag - ; - in - [ - # 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. - # --------------- Terminal --------------- - (leaf "spawn-at-startup" [ "foot" ]) - (leaf "spawn-at-startup" [ "alacritty" ]) - (leaf "spawn-at-startup" [ "ghostty" ]) - # --------------- Networking --------------- - (leaf "spawn-at-startup" [ "clash-verge" ]) - # --------------- Browser --------------- - (leaf "spawn-at-startup" [ "firefox" ]) - (leaf "spawn-at-startup" [ "google-chrome-stable" ]) - (leaf "spawn-at-startup" [ "chromium-browser" ]) - # --------------- Chatting --------------- - (leaf "spawn-at-startup" [ "Telegram" ]) - ]; -} diff --git a/home/linux/gui/niri/windowrules.nix b/home/linux/gui/niri/windowrules.nix deleted file mode 100644 index 1c511f9b..00000000 --- a/home/linux/gui/niri/windowrules.nix +++ /dev/null @@ -1,122 +0,0 @@ -niri: { - programs.niri.config = - let - inherit (niri.lib.kdl) - node - plain - leaf - flag - ; - in - [ - # ============= Window Rules ============= - # Get all the window's information via: - # niri msg windows - - # --------------- 1Terminal --------------- - (plain "window-rule" [ - (leaf "match" { app-id = "foot"; }) - (leaf "open-on-workspace" "1terminal") - (leaf "open-maximized" true) - ]) - - (plain "window-rule" [ - (leaf "match" { app-id = "Alacritty"; }) - (leaf "open-on-workspace" "1terminal") - (leaf "open-maximized" true) - ]) - - (plain "window-rule" [ - (leaf "match" { app-id = "com.mitchellh.ghostty"; }) - (leaf "open-on-workspace" "1terminal") - (leaf "open-maximized" true) - ]) - - # --------------- 2Browser --------------- - - (plain "window-rule" [ - (leaf "match" { app-id = "firefox"; }) - (leaf "open-on-workspace" "2browser") - (leaf "open-maximized" true) - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "google-chrome"; }) - (leaf "open-on-workspace" "2browser") - (leaf "open-maximized" true) - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "chromium-browser"; }) - (leaf "open-on-workspace" "2browser") - (leaf "open-maximized" true) - ]) - - # --------------- 3Chatting --------------- - (plain "window-rule" [ - (leaf "match" { app-id = "org.telegram.desktop"; }) - (leaf "open-on-workspace" "3chat") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "wechat"; }) - (leaf "open-on-workspace" "3chat") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "QQ"; }) - (leaf "open-on-workspace" "3chat") - ]) - - # --------------- 4Gaming --------------- - - (plain "window-rule" [ - (leaf "match" { app-id = "steam"; }) - (leaf "open-on-workspace" "4gaming") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "steam_app_default"; }) - (leaf "open-on-workspace" "4gaming") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "heroic"; }) - (leaf "open-on-workspace" "4gaming") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "net.lutris.Lutris"; }) - (leaf "open-on-workspace" "4gaming") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "com.vysp3r.ProtonPlus"; }) - (leaf "open-on-workspace" "4gaming") - ]) - (plain "window-rule" [ - # Run anime games on Linux - (leaf "match" { app-id = "^moe.launcher"; }) - (leaf "open-on-workspace" "4gaming") - ]) - (plain "window-rule" [ - # All *.exe (Windows APPs) - (leaf "match" { app-id = "\.exe$"; }) - (leaf "open-on-workspace" "4gaming") - ]) - - # --------------- 6File --------------- - (plain "window-rule" [ - (leaf "match" { app-id = "com.github.johnfactotum.Foliate"; }) - (leaf "open-on-workspace" "6file") - ]) - (plain "window-rule" [ - (leaf "match" { app-id = "thunar"; }) - (leaf "open-on-workspace" "6file") - ]) - - # --------------- 0Other --------------- - - (plain "window-rule" [ - (leaf "match" { app-id = "clash-verge"; }) - (leaf "open-on-workspace" "0other") - ]) - - (plain "window-rule" [ - (leaf "match" { app-id = "Zoom Workplace"; }) - (leaf "open-on-workspace" "0other") - ]) - ]; -} diff --git a/hosts/12kingdoms-shoukei/apple-silicon.nix b/hosts/12kingdoms-shoukei/apple-silicon.nix index be9eaa04..2e7ce771 100644 --- a/hosts/12kingdoms-shoukei/apple-silicon.nix +++ b/hosts/12kingdoms-shoukei/apple-silicon.nix @@ -13,11 +13,11 @@ zramSwap.memoryPercent = lib.mkForce 75; - # Workaround for Mesa 25.3.0 regression + # Workaround for Mesa 25.3.1 regression # https://github.com/nix-community/nixos-apple-silicon/issues/380 # https://github.com/NixOS/nixpkgs/pull/461866 hardware.graphics.package = - assert pkgs.mesa.version == "25.3.0"; + assert pkgs.mesa.version == "25.3.1"; (import nixpkgs-mesa { localSystem = pkgs.stdenv.hostPlatform; }).mesa; nix.settings = { diff --git a/hosts/12kingdoms-shoukei/home.nix b/hosts/12kingdoms-shoukei/home.nix index 21f8ebde..8a8acdb9 100644 --- a/hosts/12kingdoms-shoukei/home.nix +++ b/hosts/12kingdoms-shoukei/home.nix @@ -1,6 +1,7 @@ -{ config, niri, ... }: +{ config, ... }: let hostName = "shoukei"; # Define your hostname. + mkSymlink = config.lib.file.mkOutOfStoreSymlink; in { programs.ssh.matchBlocks."github.com".identityFile = @@ -11,44 +12,6 @@ in "${config.home.homeDirectory}/nix-config/hosts/12kingdoms-shoukei/hypr-hardware.conf" ]; - modules.desktop.niri = { - settings = - let - inherit (niri.lib.kdl) - node - plain - leaf - flag - ; - in - [ - (node "output" "eDP-1" [ - (leaf "scale" 1.5) - (leaf "transform" "normal") - (leaf "mode" "2560x1600@60") - (leaf "position" { - x = 0; - y = 0; - }) - ]) - - # ============= Named Workspaces ============= - (node "workspace" "1terminal" [ (leaf "open-on-output" "eDP-1") ]) - (node "workspace" "2browser" [ (leaf "open-on-output" "eDP-1") ]) - (node "workspace" "3chat" [ (leaf "open-on-output" "eDP-1") ]) - (node "workspace" "4music" [ (leaf "open-on-output" "eDP-1") ]) - (node "workspace" "5mail" [ (leaf "open-on-output" "eDP-1") ]) - (node "workspace" "6file" [ (leaf "open-on-output" "eDP-1") ]) - (node "workspace" "0other" [ (leaf "open-on-output" "eDP-1") ]) - - # Settings for debugging. Not meant for normal use. - # These can change or stop working at any point with little notice. - (plain "debug" [ - # Override the DRM device that niri will use for all rendering. - # Fix: niri fails to correctly detect the primary render device - (leaf "render-drm-device" "/dev/dri/renderD128") - ]) - ]; - }; - + xdg.configFile."niri/niri-hardware.kdl".source = + mkSymlink "${config.home.homeDirectory}/nix-config/hosts/12kingdoms-shoukei/niri-hardware.kdl"; } diff --git a/hosts/12kingdoms-shoukei/niri-hardware.kdl b/hosts/12kingdoms-shoukei/niri-hardware.kdl new file mode 100644 index 00000000..2c11d0c5 --- /dev/null +++ b/hosts/12kingdoms-shoukei/niri-hardware.kdl @@ -0,0 +1,15 @@ +output "eDP-1" { + scale 1.500000 + transform "normal" + mode "2560x1600@60" + position x=0 y=0 +} +workspace "1terminal" { open-on-output "eDP-1"; } +workspace "2browser" { open-on-output "eDP-1"; } +workspace "3chat" { open-on-output "eDP-1"; } +workspace "4music" { open-on-output "eDP-1"; } +workspace "5mail" { open-on-output "eDP-1"; } +workspace "6file" { open-on-output "eDP-1"; } +workspace "0other" { open-on-output "eDP-1"; } +debug { render-drm-device "/dev/dri/renderD128"; } + diff --git a/hosts/idols-ai/home.nix b/hosts/idols-ai/home.nix index 095b99bc..31dec013 100644 --- a/hosts/idols-ai/home.nix +++ b/hosts/idols-ai/home.nix @@ -1,4 +1,7 @@ -{ config, niri, ... }: +{ config, ... }: +let + mkSymlink = config.lib.file.mkOutOfStoreSymlink; +in { programs.ssh.matchBlocks."github.com".identityFile = "${config.home.homeDirectory}/.ssh/idols-ai"; @@ -7,71 +10,6 @@ modules.desktop.hyprland.settings.source = [ "${config.home.homeDirectory}/nix-config/hosts/idols-ai/hypr-hardware.conf" ]; - - modules.desktop.niri = { - settings = - let - inherit (niri.lib.kdl) - node - plain - leaf - flag - ; - in - [ - # running `niri msg outputs` to find outputs - (node "output" "DP-2" [ - # Uncomment this line to disable this output. - # (flag "off") - - # Scale is a floating-point number, but at the moment only integer values work. - (leaf "scale" 1.5) - - # Transform allows to rotate the output counter-clockwise, valid values are: - # normal, 90, 180, 270, flipped, flipped-90, flipped-180 and flipped-270. - (leaf "transform" "normal") - - # 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. - (leaf "mode" "3840x2160@144") - - # 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 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. - # It the position is unset or results in an overlap, the output is instead placed - # automatically. - (leaf "position" { - x = 0; - y = 0; - }) - ]) - (node "output" "HDMI-A-1" [ - (leaf "scale" 1.5) - (leaf "transform" "normal") - (leaf "mode" "3840x2160@60") - (leaf "position" { - x = 2560; # on the right of DP-2 - y = 0; - }) - ]) - - # ============= Named Workspaces ============= - (node "workspace" "2browser" [ (leaf "open-on-output" "DP-2") ]) - (node "workspace" "4gaming" [ (leaf "open-on-output" "DP-2") ]) - (node "workspace" "5music" [ (leaf "open-on-output" "DP-2") ]) - - (node "workspace" "1terminal" [ (leaf "open-on-output" "HDMI-A-1") ]) - (node "workspace" "3chat" [ (leaf "open-on-output" "HDMI-A-1") ]) - (node "workspace" "6file" [ (leaf "open-on-output" "HDMI-A-1") ]) - (node "workspace" "0other" [ (leaf "open-on-output" "HDMI-A-1") ]) - ]; - }; + xdg.configFile."niri/niri-hardware.kdl".source = + mkSymlink "${config.home.homeDirectory}/nix-config/hosts/idols-ai/niri-hardware.kdl"; } diff --git a/hosts/idols-ai/niri-hardware.kdl b/hosts/idols-ai/niri-hardware.kdl new file mode 100644 index 00000000..97ed613d --- /dev/null +++ b/hosts/idols-ai/niri-hardware.kdl @@ -0,0 +1,47 @@ +// running `niri msg outputs` to find outputs +output "DP-2" { + // Uncomment this line to disable this output. + // off + + // Scale is a floating-point number, but at the moment only integer values work. + scale 1.5 + + // 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" + + // 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 "3840x2160@144" + + // 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 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. + // It the position is unset or results in an overlap, the output is instead placed + // automatically. + position x=0 y=0 +} +output "HDMI-A-1" { + scale 1.5 + transform "normal" + mode "3840x2160@60" + position x=2560 y=0 // on the right of DP-2 +} + +// ============= Named Workspaces ============= +workspace "2browser" { open-on-output "DP-2"; } +workspace "4gaming" { open-on-output "DP-2"; } +workspace "5music" { open-on-output "DP-2"; } + +workspace "1terminal" { open-on-output "HDMI-A-1"; } +workspace "3chat" { open-on-output "HDMI-A-1"; } +workspace "6file" { open-on-output "HDMI-A-1"; } +workspace "0other" { open-on-output "HDMI-A-1"; } \ No newline at end of file diff --git a/modules/nixos/desktop/xdg.nix b/modules/nixos/desktop/xdg.nix index dae9a1d5..561135f5 100644 --- a/modules/nixos/desktop/xdg.nix +++ b/modules/nixos/desktop/xdg.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: { xdg.terminal-exec = { enable = true; @@ -23,6 +23,13 @@ }; }; + xdg = { + autostart.enable = lib.mkDefault true; + menus.enable = lib.mkDefault true; + mime.enable = lib.mkDefault true; + icons.enable = lib.mkDefault true; + }; + xdg.portal = { enable = true; diff --git a/outputs/aarch64-linux/src/12kingdoms-shoukei.nix b/outputs/aarch64-linux/src/12kingdoms-shoukei.nix index cddefced..771cc637 100644 --- a/outputs/aarch64-linux/src/12kingdoms-shoukei.nix +++ b/outputs/aarch64-linux/src/12kingdoms-shoukei.nix @@ -27,7 +27,6 @@ let "hardening/bwraps" ]) ++ [ - inputs.niri.nixosModules.niri { modules.desktop.fonts.enable = true; modules.desktop.wayland.enable = true; diff --git a/outputs/x86_64-linux/src/idols-ai.nix b/outputs/x86_64-linux/src/idols-ai.nix index e888c16f..2029ad7f 100644 --- a/outputs/x86_64-linux/src/idols-ai.nix +++ b/outputs/x86_64-linux/src/idols-ai.nix @@ -28,7 +28,6 @@ let "hardening/bwraps" ]) ++ [ - inputs.niri.nixosModules.niri { modules.desktop.fonts.enable = true; modules.desktop.wayland.enable = true;