Squash merge modularization into main

This commit is contained in:
2025-12-28 00:14:33 +00:00
parent 8a3678428b
commit 88be74cf74
17 changed files with 270 additions and 141 deletions

View File

@@ -28,6 +28,7 @@ in
];
options.modules.Hyprland = {
enable = lib.mkEnableOption "Hyprland";
suspend-on-hibernate = lib.mkEnableOption "soh";
};
# TODO, split this into its own module;
config = lib.mkIf cfg.enable {
@@ -44,22 +45,8 @@ in
wlogout = {
enable = true;
};
foot = {
enable = true;
settings = {
main = {
term = "xterm-256color";
font = "Google Sans Code Nerd Font:size=11";
};
mouse = {
hide-when-typing = "yes";
};
};
};
};
systemd.user.services."hyprland_suspend" = {
systemd.user.services."hyprland_suspend" = lib.mkIf cfg.suspend-on-hibernate {
Unit = {
Description = "Suspend hyprland";
Before = [

View File

@@ -1,15 +1,20 @@
{ inputs, pkgs, ... }:
{
home.packages = [
pkgs.walker
pkgs.hyprlauncher
];
systemd.user.services.walker-deamon = {
wayland.windowManager.hyprland.settings = {
bind = [
"$mainMod, R, exec, hyprlauncher"
];
};
systemd.user.services.hyprlauncher-deamon = {
Install = {
WantedBy = [ "hyprland-session.target" ];
};
Service = {
ExecStart = "${pkgs.writeShellScript "watch-store" ''
walker --gapplication-service
hyprlauncher -d
''}";
};
};

View File

@@ -8,5 +8,6 @@ in
wayfreeze
grim
slurp
killall
];
}

View File

@@ -11,13 +11,6 @@
hyprcursor.enable = true;
};
wayland.windowManager.hyprland.settings = {
monitor = [
"HDMI-A-1, 1920x1080@60, 0x0, 1"
"DP-3, 1920x1080@144, 1920x0, 1"
];
exec-once = [
"hyprctl dispatch workspace 2" # shit solution to get quickshell on the right monitor
];
env = [
"XCURSOR_THEME,BreezeX-RosePine-Linux"
"XCURSOR_SIZE,24"
@@ -47,7 +40,10 @@
};
blur = {
enabled = false;
enabled = true;
passes = 1;
new_optimizations = true;
ignore_opacity = false;
};
};
animations = {
@@ -92,11 +88,6 @@
enable_anr_dialog = false;
vfr = true;
};
input = {
kb_layout = "gb";
follow_mouse = 2;
sensitivity = -0.5;
};
"$mainMod" = "SUPER";
bind = [
"$mainMod, Q, exec, foot"
@@ -104,7 +95,6 @@
"$mainMod, M, exit"
"$mainMod, E, exec, $fileManager"
"$mainMod, V, togglefloating,"
"$mainMod, R, exec, walker"
"$mainMod, P, pseudo, # dwindle"
"$mainMod, J, togglesplit, # dwindle"
"$mainMod, left, movefocus, l"
@@ -141,9 +131,6 @@
"$mainMod, mouse:272, movewindow"
"$mainMod, mouse:273, resizewindow"
];
workspace = [
"name:2, monitor:DP-3"
];
windowrule = [
"match:class .*, suppress_event maximize"
"match:class ^(gamescope)$, workspace 5"