Merge branch 'master' into cla

3 files changed, 28 insertions, 5 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 2dab414..6c597aa 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -263,6 +263,12 @@ bind = $mainMod+SHIFT, R, layoutmsg, colresize +conf #HYPRSCROLLING
 bind = $mainMod+SHIFT, Return, layoutmsg, promote #HYPRSCROLLING
 #}}}
 
+#{{{ tab binds
+bind = $mainMod+ALT, O, togglegroup
+bind = $mainMod+ALT, J, changegroupactive, f
+bind = $mainMod+ALT, K, changegroupactive, b
+#}}}
+
 #{{{ Group binds
 # Group binds
 #bind = $mainMod CONTROL, G, togglegroup,
diff --git a/niri/config.kdl b/niri/config.kdl
index 9971a8d..cab419f 100644
--- a/niri/config.kdl
+++ b/niri/config.kdl
@@ -15,6 +15,8 @@ input {
             // For example:
             // layout "us,ru"
             // options "grp:win_space_toggle,compose:ralt,ctrl:nocaps"
+            layout "us"
+            options "escape:nocaps"
         }
 
         // Enable numlock on startup, omitting this setting disables it.
@@ -69,9 +71,9 @@ input {
 // Find more information on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Outputs
 // Remember to uncomment the node by removing "/-"!
-output "eDP-1" {
+/-output "eDP-1" {
     // Uncomment this line to disable this output.
-    // off
+    //off
 
     // Resolution and, optionally, refresh rate of the output.
     // The format is "<width>x<height>" or "<width>x<height>@<refresh rate>".
@@ -100,6 +102,20 @@ output "eDP-1" {
     position x=0 y=0
 }
 
+/-output "DP-2" {
+  mode "1920x1080@75.000"
+  scale 1
+  transform "normal"
+  position x=0 y=0
+}
+
+/-output "HDMI-A-1" {
+  mode "1920x1080@75.000"
+  scale 1
+  transform "normal"
+  position x=1920 y=0
+}
+
 // Settings that influence how windows are positioned and sized.
 // Find more information on the wiki:
 // https://github.com/YaLTeR/niri/wiki/Configuration:-Layout
@@ -189,8 +205,8 @@ layout {
         off
 
         width 4
-        active-color "#ffc87f"
-        inactive-color "#505050"
+        active-color "#198844"
+        inactive-color "#1b1d1c"
 
         // Color of the border around windows that request your attention.
         urgent-color "#9b0000"
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 4ca4d31..d6e7718 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -120,5 +120,6 @@ bindkey -M vicmd "k" history-substring-search-up
 bindkey -M vicmd "j" history-substring-search-down
 
 #source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-zinit light zsh-users/zsh-syntax-highlighting
+zinit light 'zsh-users/zsh-syntax-highlighting'
+zinit ice wait atload'_history_substring_search_config'
 #zprof