From da8fc92ee84b32f479d47e0a756c4345649945e5 Mon Sep 17 00:00:00 2001
From: Daniel Patterson <me@danielpatterson.dev>
Date: Fri, 10 Feb 2023 01:12:38 +0000
Subject: [PATCH] Split out laptop and desktop configs

---
 .../configs/desktop/hyprland/default.nix      |  3 +-
 .../configs/desktop/hyprland/dingbox.conf     |  5 ++++
 .../configs/desktop/hyprland/hyprland.conf    | 28 ++++++-------------
 .../configs/desktop/hyprland/pingbox.conf     |  5 ++++
 .../daniel/configs/desktop/waybar/config.json |  5 +++-
 5 files changed, 25 insertions(+), 21 deletions(-)
 create mode 100644 users/daniel/configs/desktop/hyprland/dingbox.conf
 create mode 100644 users/daniel/configs/desktop/hyprland/pingbox.conf

diff --git a/users/daniel/configs/desktop/hyprland/default.nix b/users/daniel/configs/desktop/hyprland/default.nix
index 304a30e..47edf34 100644
--- a/users/daniel/configs/desktop/hyprland/default.nix
+++ b/users/daniel/configs/desktop/hyprland/default.nix
@@ -2,6 +2,7 @@
   config,
   lib,
   pkgs,
+  hostname,
   ...
 }: {
   wayland.windowManager.hyprland = {
@@ -12,6 +13,6 @@
       hidpi = true;
     };
     nvidiaPatches = true;
-    extraConfig = builtins.readFile ./hyprland.conf;
+    extraConfig = (builtins.readFile ./${hostname}.conf) + (builtins.readFile ./hyprland.conf);
   };
 }
diff --git a/users/daniel/configs/desktop/hyprland/dingbox.conf b/users/daniel/configs/desktop/hyprland/dingbox.conf
new file mode 100644
index 0000000..f6f6ed2
--- /dev/null
+++ b/users/daniel/configs/desktop/hyprland/dingbox.conf
@@ -0,0 +1,5 @@
+monitor=,preferred,auto,1.25
+
+$mainMod = CTRL + SHIFT + ALT
+
+bind = $mainMod + SUPER, Q, exit,
diff --git a/users/daniel/configs/desktop/hyprland/hyprland.conf b/users/daniel/configs/desktop/hyprland/hyprland.conf
index a2b6c39..bd27bcf 100644
--- a/users/daniel/configs/desktop/hyprland/hyprland.conf
+++ b/users/daniel/configs/desktop/hyprland/hyprland.conf
@@ -1,6 +1,3 @@
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,auto
-
 # See https://wiki.hyprland.org/Configuring/Keywords/ for more
 
 # Execute your favorite apps at launch
@@ -14,13 +11,15 @@ input {
     kb_layout = gb
     kb_variant =
     kb_model =
-    kb_options =
+    kb_options = caps:swapescape
     kb_rules =
 
     follow_mouse = 2
 
     touchpad {
-        natural_scroll = no
+        natural_scroll = yes
+        middle_button_emulation = yes
+        scroll_factor = 0.5
     }
 
     accel_profile = flat
@@ -97,21 +96,12 @@ device:epic mouse V1 {
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 # See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
 
-
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
-$mainMod = CTRL + SHIFT + ALT
-
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, return, exec, kitty
 bind = $mainMod, Q, killactive, 
-bind = $mainMod + SUPER, Q, exit, 
-bind = $mainMod, E, exec, dolphin
-bind = $mainMod, V, togglefloating, 
 bind = $mainMod, D, exec, wofi --show drun
-bind = $mainMod, P, pseudo, # dwindle
-# bind = $mainMod, J, togglesplit, # dwindle
 
-# Move focus with mainMod + arrow keys
+# Move focus with mainMod + vim keys
 bind = $mainMod, H, movefocus, l
 bind = $mainMod, L, movefocus, r
 bind = $mainMod, K, movefocus, u
@@ -141,10 +131,10 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
 bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
-bind = $mainMod, M, workspace, +1
-bind = $mainMod, comma, workspace, -1
-bind = $mainMod, U, movetoworkspace, +1
-bind = $mainMod, I, movetoworkspace, -1
+bind = $mainMod, M, workspace, -1
+bind = $mainMod, comma, workspace, +1
+bind = $mainMod, U, movetoworkspace, -1
+bind = $mainMod, I, movetoworkspace, +1
 
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
diff --git a/users/daniel/configs/desktop/hyprland/pingbox.conf b/users/daniel/configs/desktop/hyprland/pingbox.conf
new file mode 100644
index 0000000..14d6add
--- /dev/null
+++ b/users/daniel/configs/desktop/hyprland/pingbox.conf
@@ -0,0 +1,5 @@
+monitor=,preferred,auto,1.5
+
+$mainMod = SUPER
+
+bind = $mainMod + SHIFT + CTRL, Q, exit,
diff --git a/users/daniel/configs/desktop/waybar/config.json b/users/daniel/configs/desktop/waybar/config.json
index fec4fd8..050883d 100644
--- a/users/daniel/configs/desktop/waybar/config.json
+++ b/users/daniel/configs/desktop/waybar/config.json
@@ -2,8 +2,11 @@
     "layer": "top",
     "modules-left": ["wlr/workspaces", "hyprland/window"],
     "modules-center": ["clock"],
-    "modules-right": ["clock"],
+    "modules-right": ["battery"],
     "hyprland/window": {
+    },
+    "bat": {
+
     },
     "wlr/workspaces": {
         "format": "{icon}",