Merge branch 'main' of github.com:bloxx12/nichts

This commit is contained in:
Charlie Root 2024-04-12 19:45:48 +02:00
commit fee2940225
4 changed files with 29 additions and 6 deletions

View file

@ -7,5 +7,9 @@
username = "lars"; username = "lars";
}; };
}; };
hyprland = {
enable = true;
monitor = ",preferred,auto,1";
};
}; };
} }

View file

@ -4,7 +4,14 @@ with lib; let
cfg = config.myOptions.hyprland; cfg = config.myOptions.hyprland;
in { in {
options.myOptions.hyprland.nvidia.enable = mkEnableOption "nvidia"; options.myOptions.hyprland.nvidia.enable = mkEnableOption "nvidia";
options.myOptions.hyprland.enable = mkEnableOption "hyprland"; options.myOptions.hyprland = {
enable = mkEnableOption "hyprland";
monitor = mkOption {
description = "hyprland monitor config";
default = ",preferred,auto,1";
type = types.listof(types.str);
};
};
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.sessionVariables = mkIf cfg.nvidia.enable { environment.sessionVariables = mkIf cfg.nvidia.enable {
@ -36,11 +43,6 @@ in {
settings = { settings = {
"$mod" = "SUPER"; "$mod" = "SUPER";
monitor = [
"DP-2,2560x1440@144,0x0,1"
"DP-1,1920x1080@60,2560x0,1"
];
input = { input = {
kb_layout = "ch"; kb_layout = "ch";
}; };
@ -53,6 +55,16 @@ in {
# Monitor management # Monitor management
"$mod SHIFT, k, movecurrentworkspacetomonitor, DP-2" "$mod SHIFT, k, movecurrentworkspacetomonitor, DP-2"
"$mod SHIFT, j, movecurrentworkspacetomonitor, DP-1" "$mod SHIFT, j, movecurrentworkspacetomonitor, DP-1"
# Window Management
"$mod, left, movefocus, l"
"$mod, right, movefocus, r"
"$mod, up, movefocus, u"
"$mod, down, movefocus, d"
"$mod, F, fullscreen"
# Screenshot
"$mod SHIFT, s, exec, grim -g 'slurp -d' - | wl-copy"
] ]
++ ( ++ (
builtins.concatLists (builtins.genList ( builtins.concatLists (builtins.genList (

View file

@ -10,6 +10,10 @@
hyprland = { hyprland = {
enable = true; enable = true;
nvidia.enable = true; nvidia.enable = true;
monitor = [
"DP-2,2560x1440@144,0x0,1"
"DP-1,1920x1080@60,2560x0,1"
];
}; };
}; };

View file

@ -48,6 +48,9 @@ in {
tmux tmux
firefox firefox
kitty kitty
grim
slurp
wl-clipboard
]; ];
}; };
} }