mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 16:21:34 +01:00
Modularize the DE config
This commit is contained in:
parent
38a5b3cbb1
commit
4b650721b0
11 changed files with 285 additions and 252 deletions
154
modules/home/de/hyprland/config.nix
Normal file
154
modules/home/de/hyprland/config.nix
Normal file
|
|
@ -0,0 +1,154 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
exec-once = ["hyprpaper"];
|
||||
|
||||
input = {
|
||||
kb_layout = "de";
|
||||
kb_variant = "nodeadkeys";
|
||||
|
||||
accel_profile = "flat";
|
||||
};
|
||||
|
||||
input.touchpad = {
|
||||
disable_while_typing = true;
|
||||
natural_scroll = true;
|
||||
middle_button_emulation = true;
|
||||
};
|
||||
device = {
|
||||
name = "dell0b9f:00-27c6:0d43-touchpad";
|
||||
accel_profile = "adaptive";
|
||||
};
|
||||
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
border_size = 1;
|
||||
|
||||
layout = "master";
|
||||
};
|
||||
|
||||
master = {
|
||||
new_is_master = false;
|
||||
no_gaps_when_only = 1;
|
||||
mfact = "0.5";
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 6;
|
||||
drop_shadow = false;
|
||||
};
|
||||
|
||||
animations.enabled = false;
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
force_default_wallpaper = 0;
|
||||
};
|
||||
|
||||
"$mod" = "SUPER";
|
||||
"$terminal" = "kitty";
|
||||
"$browser" = "brave";
|
||||
"$fileManager" = "nemo";
|
||||
"$editor" = "codium";
|
||||
|
||||
bind =
|
||||
[
|
||||
# Essentials
|
||||
"$mod CONTROL, Q, exit,"
|
||||
"$mod CONTROL, S, exec, systemctl suspend"
|
||||
"$mod CONTROL, L, exec, loginctl lock-session"
|
||||
"$mod SHIFT, C, killactive,"
|
||||
"$mod, TAB, cyclenext,"
|
||||
"$mod SHIFT, V, togglefloating,"
|
||||
"$mod SHIFT, F, fullscreen, 0"
|
||||
|
||||
# Launch programs
|
||||
"$mod, RETURN, exec, $terminal"
|
||||
"$mod, V, exec, ${lib.getExe pkgs.cliphist} list | rofi -dmenu | ${lib.getExe pkgs.cliphist} decode | ${lib.getExe' pkgs.wl-clipboard "wl-copy"}"
|
||||
"$mod, B, exec, $browser"
|
||||
"$mod, F, exec, $fileManager"
|
||||
"$mod, C, exec, $editor"
|
||||
"$mod, S, exec, spotify"
|
||||
|
||||
# Move focus
|
||||
"$mod, left, movefocus, l"
|
||||
"$mod, right, movefocus, r"
|
||||
"$mod, up, movefocus, u"
|
||||
"$mod, down, movefocus, d"
|
||||
|
||||
# Move window
|
||||
"$mod SHIFT, left, movewindow, l"
|
||||
"$mod SHIFT, right, movewindow, r"
|
||||
"$mod SHIFT, up, movewindow, u"
|
||||
"$mod SHIFT, down, movewindow, d"
|
||||
|
||||
# Scroll through workspaces
|
||||
"$mod, mouse_down, workspace, e-1"
|
||||
"$mod, mouse_up, workspace, e+1"
|
||||
]
|
||||
# Switch workspace
|
||||
++ (
|
||||
builtins.concatLists (builtins.genList (
|
||||
x: [
|
||||
"$mod, ${toString (x + 1)}, workspace, ${toString (x + 1)}"
|
||||
"$mod SHIFT, ${toString (x + 1)}, movetoworkspacesilent, ${toString (x + 1)}"
|
||||
]
|
||||
)
|
||||
9)
|
||||
);
|
||||
|
||||
# Release
|
||||
bindr = [
|
||||
# Launcher
|
||||
"$mod, R, exec, pkill rofi || rofi -show drun"
|
||||
];
|
||||
|
||||
# Repeat
|
||||
binde = [
|
||||
# Resize window
|
||||
"$mod CONTROL, left, resizeactive, -100 0"
|
||||
"$mod CONTROL, right, resizeactive, 100 0"
|
||||
"$mod CONTROL, up, resizeactive, 0 -100"
|
||||
"$mod CONTROL, down, resizeactive, 0 100"
|
||||
];
|
||||
|
||||
# Locked
|
||||
bindl = [
|
||||
", switch:on:Lid Switch, exec, systemctl suspend"
|
||||
|
||||
# Media
|
||||
", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} --player=spotify play-pause"
|
||||
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
];
|
||||
|
||||
# Repeat + Locked
|
||||
bindel = [
|
||||
# Adjust volume
|
||||
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
|
||||
# Adjust brightness
|
||||
", XF86MonBrightnessUp, exec, brillo -q -u 20000 -A 4"
|
||||
", XF86MonBrightnessDown, exec, brillo -q -u 20000 -U 4"
|
||||
];
|
||||
|
||||
# Mouse
|
||||
bindm = [
|
||||
# Move/resize windows
|
||||
"$mod, mouse:272, movewindow"
|
||||
"$mod, mouse:273, resizewindow"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -6,10 +6,7 @@
|
|||
}: let
|
||||
cfg = config.myConfig.de;
|
||||
in {
|
||||
imports = [
|
||||
./waybar.nix
|
||||
./hypridlelock.nix
|
||||
];
|
||||
imports = [./config.nix];
|
||||
|
||||
options.myConfig.de.hyprland.enable = lib.mkEnableOption "";
|
||||
|
||||
|
|
@ -21,155 +18,14 @@ in {
|
|||
splash=false
|
||||
'';
|
||||
|
||||
myConfig.rofi.enable = true;
|
||||
services.cliphist.enable = true;
|
||||
|
||||
services.dunst.enable = true;
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
exec-once = ["hyprpaper"];
|
||||
|
||||
input = {
|
||||
kb_layout = "de";
|
||||
kb_variant = "nodeadkeys";
|
||||
|
||||
accel_profile = "flat";
|
||||
};
|
||||
|
||||
input.touchpad = {
|
||||
disable_while_typing = true;
|
||||
natural_scroll = true;
|
||||
middle_button_emulation = true;
|
||||
};
|
||||
device = {
|
||||
name = "dell0b9f:00-27c6:0d43-touchpad";
|
||||
accel_profile = "adaptive";
|
||||
};
|
||||
|
||||
general = {
|
||||
gaps_in = 5;
|
||||
gaps_out = 10;
|
||||
border_size = 1;
|
||||
|
||||
layout = "master";
|
||||
};
|
||||
|
||||
master = {
|
||||
new_is_master = false;
|
||||
no_gaps_when_only = 1;
|
||||
mfact = "0.5";
|
||||
};
|
||||
|
||||
decoration = {
|
||||
rounding = 6;
|
||||
drop_shadow = false;
|
||||
};
|
||||
|
||||
animations.enabled = false;
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
force_default_wallpaper = 0;
|
||||
};
|
||||
|
||||
"$mod" = "SUPER";
|
||||
"$terminal" = "kitty";
|
||||
"$browser" = "brave";
|
||||
"$fileManager" = "nemo";
|
||||
"$editor" = "codium";
|
||||
|
||||
bind =
|
||||
[
|
||||
# Essentials
|
||||
"$mod CONTROL, Q, exit,"
|
||||
"$mod CONTROL, S, exec, systemctl suspend"
|
||||
"$mod CONTROL, L, exec, loginctl lock-session"
|
||||
"$mod SHIFT, C, killactive,"
|
||||
"$mod, TAB, cyclenext,"
|
||||
"$mod SHIFT, V, togglefloating,"
|
||||
"$mod SHIFT, F, fullscreen, 0"
|
||||
|
||||
# Launch programs
|
||||
"$mod, RETURN, exec, $terminal"
|
||||
"$mod, V, exec, ${lib.getExe pkgs.cliphist} list | rofi -dmenu | ${lib.getExe pkgs.cliphist} decode | ${lib.getExe' pkgs.wl-clipboard "wl-copy"}"
|
||||
"$mod, B, exec, $browser"
|
||||
"$mod, F, exec, $fileManager"
|
||||
"$mod, C, exec, $editor"
|
||||
"$mod, S, exec, spotify"
|
||||
|
||||
# Move focus
|
||||
"$mod, left, movefocus, l"
|
||||
"$mod, right, movefocus, r"
|
||||
"$mod, up, movefocus, u"
|
||||
"$mod, down, movefocus, d"
|
||||
|
||||
# Move window
|
||||
"$mod SHIFT, left, movewindow, l"
|
||||
"$mod SHIFT, right, movewindow, r"
|
||||
"$mod SHIFT, up, movewindow, u"
|
||||
"$mod SHIFT, down, movewindow, d"
|
||||
|
||||
# Scroll through workspaces
|
||||
"$mod, mouse_down, workspace, e-1"
|
||||
"$mod, mouse_up, workspace, e+1"
|
||||
]
|
||||
# Switch workspace
|
||||
++ (
|
||||
builtins.concatLists (builtins.genList (
|
||||
x: [
|
||||
"$mod, ${toString (x + 1)}, workspace, ${toString (x + 1)}"
|
||||
"$mod SHIFT, ${toString (x + 1)}, movetoworkspacesilent, ${toString (x + 1)}"
|
||||
]
|
||||
)
|
||||
9)
|
||||
);
|
||||
|
||||
# Release
|
||||
bindr = [
|
||||
# Launcher
|
||||
"$mod, R, exec, pkill rofi || rofi -show drun"
|
||||
];
|
||||
|
||||
# Repeat
|
||||
binde = [
|
||||
# Resize window
|
||||
"$mod CONTROL, left, resizeactive, -100 0"
|
||||
"$mod CONTROL, right, resizeactive, 100 0"
|
||||
"$mod CONTROL, up, resizeactive, 0 -100"
|
||||
"$mod CONTROL, down, resizeactive, 0 100"
|
||||
];
|
||||
|
||||
# Locked
|
||||
bindl = [
|
||||
", switch:on:Lid Switch, exec, systemctl suspend"
|
||||
|
||||
# Media
|
||||
", XF86AudioPlay, exec, ${lib.getExe pkgs.playerctl} --player=spotify play-pause"
|
||||
", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
|
||||
];
|
||||
|
||||
# Repeat + Locked
|
||||
bindel = [
|
||||
# Adjust volume
|
||||
", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
", XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
|
||||
# Adjust brightness
|
||||
", XF86MonBrightnessUp, exec, brillo -q -u 20000 -A 4"
|
||||
", XF86MonBrightnessDown, exec, brillo -q -u 20000 -U 4"
|
||||
];
|
||||
|
||||
# Mouse
|
||||
bindm = [
|
||||
# Move/resize windows
|
||||
"$mod, mouse:272, movewindow"
|
||||
"$mod, mouse:273, resizewindow"
|
||||
];
|
||||
};
|
||||
myConfig.de = {
|
||||
rofi.enable = true;
|
||||
hypridlelock.enable = true;
|
||||
waybar.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +0,0 @@
|
|||
{
|
||||
inputs,
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
imports = [
|
||||
inputs.hyprlock.homeManagerModules.hyprlock
|
||||
inputs.hypridle.homeManagerModules.hypridle
|
||||
];
|
||||
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
programs.hyprlock = {
|
||||
enable = true;
|
||||
backgrounds = [
|
||||
{
|
||||
path = "screenshot";
|
||||
blur_passes = 1;
|
||||
blur_size = 6;
|
||||
}
|
||||
];
|
||||
};
|
||||
|
||||
services.hypridle = let
|
||||
hyprlockExe = "${lib.getExe inputs.hyprlock.packages.${pkgs.system}.default}";
|
||||
in {
|
||||
enable = true;
|
||||
lockCmd = "pidof ${hyprlockExe} || ${hyprlockExe}";
|
||||
# beforeSleepCmd = "loginctl lock-session";
|
||||
afterSleepCmd = "hyprctl dispatch dpms on";
|
||||
listeners = [
|
||||
{
|
||||
timeout = 600;
|
||||
onTimeout = "loginctl lock-session";
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,79 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: {
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
programs.waybar = {
|
||||
enable = true;
|
||||
systemd.enable = true;
|
||||
|
||||
settings = {
|
||||
mainBar = {
|
||||
layer = "top";
|
||||
position = "bottom";
|
||||
spacing = 10;
|
||||
|
||||
modules-left = ["clock"];
|
||||
modules-center = ["hyprland/workspaces"];
|
||||
modules-right = ["tray" "wireplumber" "backlight" "battery"];
|
||||
|
||||
"hyprland/workspaces" = {
|
||||
active-only = false;
|
||||
all-outputs = true;
|
||||
};
|
||||
|
||||
clock = {
|
||||
format = " {:%H.%M}";
|
||||
tooltip-format = "{:%d.%m.%Y}";
|
||||
};
|
||||
|
||||
wireplumber = {
|
||||
format = "{icon} {volume}%";
|
||||
format-muted = "";
|
||||
format-icons = ["" "" ""];
|
||||
scroll-step = "5";
|
||||
};
|
||||
|
||||
tray = {
|
||||
icon-size = 20;
|
||||
spacing = 6;
|
||||
};
|
||||
|
||||
backlight = {
|
||||
device = "amdgpu_bl1";
|
||||
format = "{icon} {percent}%";
|
||||
format-icons = ["" "" ""];
|
||||
};
|
||||
|
||||
battery = {
|
||||
states = {
|
||||
warning = 15;
|
||||
critical = 5;
|
||||
};
|
||||
format = "{icon} {capacity}%";
|
||||
format-icons = ["" "" "" "" "" "" "" "" "" "" ""];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
style = ''
|
||||
* {
|
||||
border: none;
|
||||
border-radius: 0px;
|
||||
font-family: "Open Sans, Symbols Nerd Font Mono";
|
||||
font-size: 15px;
|
||||
}
|
||||
|
||||
window#waybar {
|
||||
background-color: rgba(43, 48, 59, 0.5);
|
||||
color: #ffffff;
|
||||
}
|
||||
'';
|
||||
};
|
||||
|
||||
xdg.configFile."waybar/config".onChange = lib.mkForce "${lib.getExe' pkgs.systemd "systemctl"} restart --user waybar";
|
||||
xdg.configFile."waybar/style.css".onChange = lib.mkForce "${lib.getExe' pkgs.systemd "systemctl"} restart --user waybar";
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue