Merge

modules/bspwm/home.nix

@@ -61,7 +61,7 @@
       # };
 
       extraConfigEarly = ''
-      bspc monitor -d I II III IV V
+      bsp-auto-monitors
       '';
 
       settings = with config.custom.colors; {

modules/bspwm/scripts/bsp-auto-monitors

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+monitors=($(xrandr | grep " connected " | awk '{ print$1 }'))
+monitorcount=${#monitors[*]}
+names=(I II III IV V)
+
+if [ $monitorcount -eq 1 ]; then
+  bspc monitor -d ${names[@]}
+else
+  for((i=0; i<${monitorcount}; i++)); do
+    name=${names[$i]}
+	  bspc monitor ${monitors[$i]} -d ${name}-0 ${name}-1
+  done
+fi

modules/bspwm/sxhkdrc

@@ -100,9 +100,12 @@ super + {h,j,k,l,Left,Down,Up,Right}
 super + {p,b,comma,period}
 	bspc node -f @{parent,brother,first,second}
 
-# focus the next/previous window in the current desktop
-super + {a,d}
-	bspc node -f {next,prev}.local.!hidden.window
+# # focus the next/previous window in the current desktop
+# super + {a,d}
+# 	bspc node -f {next,prev}.local.!hidden.window
+# Rotate tree
+super + {d,a}
+    bspc node @/ -C {forward,backward}
 
 # focus the next/previous desktop in the current monitor
 super + bracket{left,right}

modules/hyprland/home.nix

@@ -8,6 +8,11 @@
   # options.custom.hyprland.enable = lib.mkEnable "hyprland";
 
   config = {
+    # Tell electron apps it's wayland time
+    home.sessionVariables = {
+      "NIXOS_OZONE_WL = 1"
+    }
+
     home.packages = [
       pkgs.swaybg
     ];

modules/kitty/colors.nix

@@ -1,7 +1,14 @@
 { config, lib,  ... }:
 
 {
-  config = {
+  options.custom.colors.kitty = {
+    enable = lib.mkOption {
+      type = lib.types.bool;
+      default = true;
+    };
+  };
+
+  config = lib.mkDefault {
     programs.kitty.settings = with config.custom.colors; {
       # Based on https://github.com/mk12/base16-kitty