Merge branch 'overhaul' of ssh://solis:34916/Koen/nix-config into overhaul
This commit is contained in:
commit
b3b766159e
7 changed files with 1422 additions and 1047 deletions
|
|
@ -49,7 +49,6 @@ in {
|
||||||
|
|
||||||
general {
|
general {
|
||||||
border_size = ${toString hypr.general.borderSize}
|
border_size = ${toString hypr.general.borderSize}
|
||||||
no_border_on_floating = ${boolToString hypr.general.noBorderOnFloating}
|
|
||||||
gaps_in = ${toString hypr.general.gapsIn}
|
gaps_in = ${toString hypr.general.gapsIn}
|
||||||
gaps_out = ${toString hypr.general.gapsOut}
|
gaps_out = ${toString hypr.general.gapsOut}
|
||||||
gaps_workspaces = ${toString hypr.general.gapsWorkspaces}
|
gaps_workspaces = ${toString hypr.general.gapsWorkspaces}
|
||||||
|
|
@ -195,9 +194,6 @@ in {
|
||||||
}
|
}
|
||||||
|
|
||||||
gestures {
|
gestures {
|
||||||
workspace_swipe = ${boolToString hypr.gestures.workspaceSwipe}
|
|
||||||
workspace_swipe_fingers = ${toString hypr.gestures.workspaceSwipeFingers}
|
|
||||||
workspace_swipe_min_fingers = ${boolToString hypr.gestures.workspaceSwipeMinFingers}
|
|
||||||
workspace_swipe_distance = ${toString hypr.gestures.workspaceSwipeDistance}
|
workspace_swipe_distance = ${toString hypr.gestures.workspaceSwipeDistance}
|
||||||
workspace_swipe_touch = ${boolToString hypr.gestures.workspaceSwipeTouch}
|
workspace_swipe_touch = ${boolToString hypr.gestures.workspaceSwipeTouch}
|
||||||
workspace_swipe_invert = ${boolToString hypr.gestures.workspaceSwipeInvert}
|
workspace_swipe_invert = ${boolToString hypr.gestures.workspaceSwipeInvert}
|
||||||
|
|
@ -279,7 +275,7 @@ in {
|
||||||
allow_session_lock_restore = ${boolToString hypr.misc.allowSessionLockRestore}
|
allow_session_lock_restore = ${boolToString hypr.misc.allowSessionLockRestore}
|
||||||
background_color = ${toString hypr.misc.backgroundColor}
|
background_color = ${toString hypr.misc.backgroundColor}
|
||||||
close_special_on_empty = ${boolToString hypr.misc.closeSpecialOnEmpty}
|
close_special_on_empty = ${boolToString hypr.misc.closeSpecialOnEmpty}
|
||||||
new_window_takes_over_fullscreen = ${toString hypr.misc.newWindowTakesOverFullscreen}
|
#on_focus_under_fullscreen = ${toString hypr.misc.onFocusUnderFullscreen}
|
||||||
exit_window_retains_fullscreen = ${boolToString hypr.misc.exitWindowRetainsFullscreen}
|
exit_window_retains_fullscreen = ${boolToString hypr.misc.exitWindowRetainsFullscreen}
|
||||||
initial_workspace_tracking = ${toString hypr.misc.initialWorkspaceTracking}
|
initial_workspace_tracking = ${toString hypr.misc.initialWorkspaceTracking}
|
||||||
middle_click_paste = ${boolToString hypr.misc.middleClickPaste}
|
middle_click_paste = ${boolToString hypr.misc.middleClickPaste}
|
||||||
|
|
|
||||||
|
|
@ -55,6 +55,7 @@
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
};
|
};
|
||||||
modules = [
|
modules = [
|
||||||
|
./lib
|
||||||
./modules
|
./modules
|
||||||
./dots
|
./dots
|
||||||
./machines/${host}/configuration.nix
|
./machines/${host}/configuration.nix
|
||||||
|
|
|
||||||
5
lib/default.nix
Normal file
5
lib/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{...}: {
|
||||||
|
imports = [
|
||||||
|
./hyprland
|
||||||
|
];
|
||||||
|
}
|
||||||
5
lib/hyprland/default.nix
Normal file
5
lib/hyprland/default.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
||||||
|
{...}: {
|
||||||
|
imports = [
|
||||||
|
./standard-options.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
1407
lib/hyprland/standard-options.nix
Normal file
1407
lib/hyprland/standard-options.nix
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -116,7 +116,7 @@ in {
|
||||||
misc = {
|
misc = {
|
||||||
forceDefaultWallpaper = 0;
|
forceDefaultWallpaper = 0;
|
||||||
keyPressEnablesDPMS = true;
|
keyPressEnablesDPMS = true;
|
||||||
newWindowTakesOverFullscreen = 2;
|
onFocusUnderFullscreen = 2;
|
||||||
|
|
||||||
enableSwallow = true;
|
enableSwallow = true;
|
||||||
swallowRegex = "^kitty$";
|
swallowRegex = "^kitty$";
|
||||||
|
|
@ -131,11 +131,7 @@ in {
|
||||||
touchpad.naturalScroll = true;
|
touchpad.naturalScroll = true;
|
||||||
numlockByDefault = true;
|
numlockByDefault = true;
|
||||||
|
|
||||||
touchpad.dragLock = true;
|
touchpad.dragLock = 1;
|
||||||
};
|
|
||||||
|
|
||||||
gestures = {
|
|
||||||
workspaceSwipe = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
group = {
|
group = {
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue