Split out laptop and desktop configs

This commit is contained in:
2023-02-10 01:12:38 +00:00
parent c8727a52d4
commit da8fc92ee8
5 changed files with 25 additions and 21 deletions

View File

@@ -2,6 +2,7 @@
config, config,
lib, lib,
pkgs, pkgs,
hostname,
... ...
}: { }: {
wayland.windowManager.hyprland = { wayland.windowManager.hyprland = {
@@ -12,6 +13,6 @@
hidpi = true; hidpi = true;
}; };
nvidiaPatches = true; nvidiaPatches = true;
extraConfig = builtins.readFile ./hyprland.conf; extraConfig = (builtins.readFile ./${hostname}.conf) + (builtins.readFile ./hyprland.conf);
}; };
} }

View File

@@ -0,0 +1,5 @@
monitor=,preferred,auto,1.25
$mainMod = CTRL + SHIFT + ALT
bind = $mainMod + SUPER, Q, exit,

View File

@@ -1,6 +1,3 @@
# See https://wiki.hyprland.org/Configuring/Monitors/
monitor=,preferred,auto,auto
# See https://wiki.hyprland.org/Configuring/Keywords/ for more # See https://wiki.hyprland.org/Configuring/Keywords/ for more
# Execute your favorite apps at launch # Execute your favorite apps at launch
@@ -14,13 +11,15 @@ input {
kb_layout = gb kb_layout = gb
kb_variant = kb_variant =
kb_model = kb_model =
kb_options = kb_options = caps:swapescape
kb_rules = kb_rules =
follow_mouse = 2 follow_mouse = 2
touchpad { touchpad {
natural_scroll = no natural_scroll = yes
middle_button_emulation = yes
scroll_factor = 0.5
} }
accel_profile = flat accel_profile = flat
@@ -97,21 +96,12 @@ device:epic mouse V1 {
# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more # 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 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
bind = $mainMod, return, exec, kitty bind = $mainMod, return, exec, kitty
bind = $mainMod, Q, killactive, 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, 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, H, movefocus, l
bind = $mainMod, L, movefocus, r bind = $mainMod, L, movefocus, r
bind = $mainMod, K, movefocus, u bind = $mainMod, K, movefocus, u
@@ -141,10 +131,10 @@ bind = $mainMod SHIFT, 8, movetoworkspace, 8
bind = $mainMod SHIFT, 9, movetoworkspace, 9 bind = $mainMod SHIFT, 9, movetoworkspace, 9
bind = $mainMod SHIFT, 0, movetoworkspace, 10 bind = $mainMod SHIFT, 0, movetoworkspace, 10
bind = $mainMod, M, workspace, +1 bind = $mainMod, M, workspace, -1
bind = $mainMod, comma, workspace, -1 bind = $mainMod, comma, workspace, +1
bind = $mainMod, U, movetoworkspace, +1 bind = $mainMod, U, movetoworkspace, -1
bind = $mainMod, I, movetoworkspace, -1 bind = $mainMod, I, movetoworkspace, +1
# Move/resize windows with mainMod + LMB/RMB and dragging # Move/resize windows with mainMod + LMB/RMB and dragging
bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:272, movewindow

View File

@@ -0,0 +1,5 @@
monitor=,preferred,auto,1.5
$mainMod = SUPER
bind = $mainMod + SHIFT + CTRL, Q, exit,

View File

@@ -2,8 +2,11 @@
"layer": "top", "layer": "top",
"modules-left": ["wlr/workspaces", "hyprland/window"], "modules-left": ["wlr/workspaces", "hyprland/window"],
"modules-center": ["clock"], "modules-center": ["clock"],
"modules-right": ["clock"], "modules-right": ["battery"],
"hyprland/window": { "hyprland/window": {
},
"bat": {
}, },
"wlr/workspaces": { "wlr/workspaces": {
"format": "{icon}", "format": "{icon}",