diff --git a/.dotter/aleidk-work-laptop.toml b/.dotter/aleidk-work-laptop.toml index b1fe098..66baeae 100644 --- a/.dotter/aleidk-work-laptop.toml +++ b/.dotter/aleidk-work-laptop.toml @@ -3,31 +3,6 @@ packages = ["default"] [files] "configs/hypr/work-laptop/hyprland.conf" = "~/.config/hypr/include/work-laptop.conf" - - -[files."configs/niri/config.kdl"] -target = "~/.config/niri/config.kdl" -type = "template" -append = """ -window-rule { - match app-id="brave-work" - open-on-workspace "1" - open-focused true - - default-column-width { - proportion 0.5 - } -} -window-rule { - match app-id="brave-personal" - open-on-workspace "2" - open-focused false - - default-column-width { - proportion 0.5 - } -} - -""" +"configs/niri/work-laptop/local.kdl" = "~/.config/niri/include/local.kdl" [variables] diff --git a/.dotter/global.toml b/.dotter/global.toml index 36b6ef0..ff29554 100644 --- a/.dotter/global.toml +++ b/.dotter/global.toml @@ -39,4 +39,4 @@ depends = ["niri"] [default.variables] [niri.files] -"configs/niri" = "~/.config/niri" +"configs/niri/base" = "~/.config/niri" diff --git a/.stylua.toml b/.stylua.toml index f0f7a59..c38f62a 100644 --- a/.stylua.toml +++ b/.stylua.toml @@ -1,7 +1,7 @@ syntax = "All" column_width = 120 line_endings = "Unix" -indent_type = "indent_type" +indent_type = "Spaces" indent_width = 2 quote_style = "AutoPreferDouble" call_parentheses = "Always" diff --git a/configs/niri/config.kdl b/configs/niri/base/config.kdl similarity index 97% rename from configs/niri/config.kdl rename to configs/niri/base/config.kdl index 68c2792..4f340da 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/base/config.kdl @@ -1,10 +1,11 @@ +include "include/local.kdl" // ╭─────────────────────────────────────────────────────────╮ // │ Windows Rules │ // ╰─────────────────────────────────────────────────────────╯ 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. + // You can get away with just app-id="wezterm" f you want. match app-id="^org\\.wezfurlong\\.wezterm$" default-column-width { @@ -109,10 +110,10 @@ binds { spawn "rofi" "-show" "drun" "-run-command" "uwsm app -- {cmd}" } XF86AudioRaiseVolume allow-when-locked=true { - spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+" + spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.025+" } XF86AudioLowerVolume allow-when-locked=true { - spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-" + spawn-sh "wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.025-" } XF86AudioMute allow-when-locked=true { spawn-sh "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle" @@ -151,10 +152,10 @@ binds { focus-window-or-workspace-up } Mod+Right { - focus-column-right + focus-column-or-monitor-right } Mod+H { - focus-column-left + focus-column-or-monitor-left } Mod+J { focus-window-or-workspace-down @@ -163,7 +164,7 @@ binds { focus-window-or-workspace-up } Mod+L { - focus-column-right + focus-column-or-monitor-right } Mod+Shift+Left { move-column-left @@ -423,16 +424,10 @@ environment { TERMINAL "/usr/bin/kitty" } // ── Display Options ───────────────────────────────────────────────── -output "eDP-1" { - off -} output "HDMI-A-1" { scale 1 mode "3440x1440" } -output "DP-1" { - variable-refresh-rate on-demand=true -} // ── Input Options ─────────────────────────────────────────────────── input { keyboard { diff --git a/configs/niri/base/include/.gitkeep b/configs/niri/base/include/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/configs/niri/work-laptop/local.kdl b/configs/niri/work-laptop/local.kdl new file mode 100644 index 0000000..0e93f89 --- /dev/null +++ b/configs/niri/work-laptop/local.kdl @@ -0,0 +1,32 @@ +window-rule { + match app-id="brave-work" + open-on-workspace "1" + open-focused true + default-column-width { + proportion 0.5 + } +} +window-rule { + match app-id="brave-personal" + open-on-workspace "2" + open-focused false + default-column-width { + proportion 0.5 + } +} +output "HDMI-A-1" { + scale 1 + mode "3440x1440" + focus-at-startup + position x=1920 y=0 +} +output "eDP-1" { + mode "1920x1080@60.000" + position x=0 y=720 + layout { + default-column-width { + proportion 1.0 + } + } +} +