Switch to nixfmt

This commit is contained in:
SebastianStork 2024-05-19 20:00:58 +02:00
parent 1d70117186
commit b38d2df431
55 changed files with 1559 additions and 1540 deletions

View file

@ -1,8 +1,8 @@
{
imports = [
./hyprland
./theme.nix
./waybar.nix
./hypridlelock.nix
];
imports = [
./hyprland
./theme.nix
./waybar.nix
./hypridlelock.nix
];
}

View file

@ -1,31 +1,34 @@
{
config,
lib,
wrappers,
...
}: {
options.myConfig.de.hypridlelock.enable = lib.mkEnableOption "";
config,
lib,
wrappers,
...
}:
{
options.myConfig.de.hypridlelock.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.hypridlelock.enable {
services.hypridle = {
enable = true;
config = lib.mkIf config.myConfig.de.hypridlelock.enable {
services.hypridle = {
enable = true;
settings = {
general = {
lock_cmd = let
hyprlockExe = "${lib.getExe wrappers.hyprlock}";
in "pidof ${hyprlockExe} || ${hyprlockExe}";
before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on";
};
listener = [
{
timeout = 600;
on-timeout = "loginctl lock-session";
}
];
};
settings = {
general = {
lock_cmd =
let
hyprlockExe = "${lib.getExe wrappers.hyprlock}";
in
"pidof ${hyprlockExe} || ${hyprlockExe}";
before_sleep_cmd = "loginctl lock-session";
after_sleep_cmd = "hyprctl dispatch dpms on";
};
listener = [
{
timeout = 600;
on-timeout = "loginctl lock-session";
}
];
};
};
};
}

View file

@ -1,60 +1,61 @@
{
config,
lib,
wrappers,
...
}: {
config = lib.mkIf config.myConfig.de.hyprland.enable {
wayland.windowManager.hyprland = {
enable = true;
config,
lib,
wrappers,
...
}:
{
config = lib.mkIf config.myConfig.de.hyprland.enable {
wayland.windowManager.hyprland = {
enable = true;
settings = {
exec-once = ["${lib.getExe wrappers.hyprpaper}"];
settings = {
exec-once = [ "${lib.getExe wrappers.hyprpaper}" ];
input = {
kb_layout = "de";
kb_variant = "nodeadkeys";
input = {
kb_layout = "de";
kb_variant = "nodeadkeys";
accel_profile = "flat";
};
device = {
name = "dell0b9f:00-27c6:0d43-touchpad";
accel_profile = "adaptive";
disable_while_typing = true;
natural_scroll = true;
middle_button_emulation = true;
};
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;
key_press_enables_dpms = true;
};
};
accel_profile = "flat";
};
device = {
name = "dell0b9f:00-27c6:0d43-touchpad";
accel_profile = "adaptive";
disable_while_typing = true;
natural_scroll = true;
middle_button_emulation = true;
};
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;
key_press_enables_dpms = true;
};
};
};
};
}

View file

@ -1,21 +1,16 @@
{ config, lib, ... }:
{
config,
lib,
...
}: let
cfg = config.myConfig.de;
in {
imports = [
./config.nix
./keybinds.nix
];
imports = [
./config.nix
./keybinds.nix
];
options.myConfig.de.hyprland.enable = lib.mkEnableOption "";
options.myConfig.de.hyprland.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.hyprland.enable {
myConfig.de = {
hypridlelock.enable = true;
waybar.enable = true;
};
config = lib.mkIf config.myConfig.de.hyprland.enable {
myConfig.de = {
hypridlelock.enable = true;
waybar.enable = true;
};
};
}

View file

@ -1,125 +1,133 @@
{
config,
pkgs,
lib,
...
}: {
config = lib.mkIf config.myConfig.de.hyprland.enable {
wayland.windowManager.hyprland.extraConfig = ''
# Bindflags:
# r = release
# e = repeat
# l = locked
config,
pkgs,
lib,
...
}:
{
config = lib.mkIf config.myConfig.de.hyprland.enable {
wayland.windowManager.hyprland.extraConfig = ''
# Bindflags:
# r = release
# e = repeat
# l = locked
# Essentials
bind = SUPER SHIFT, C, killactive,
bind = SUPER SHIFT, V, togglefloating,
bind = SUPER SHIFT, F, fullscreen, 0
bind = SUPER, TAB, cyclenext,
# Essentials
bind = SUPER SHIFT, C, killactive,
bind = SUPER SHIFT, V, togglefloating,
bind = SUPER SHIFT, F, fullscreen, 0
bind = SUPER, TAB, cyclenext,
# Launch programs
bind = SUPER, R, exec, rofi -show drun
bind = SUPER, RETURN, exec, kitty
bind = SUPER, V, exec, clipboard
bind = SUPER, B, exec, brave
bind = SUPER, F, exec, nemo
bind = SUPER, C, exec, codium
# Launch programs
bind = SUPER, R, exec, rofi -show drun
bind = SUPER, RETURN, exec, kitty
bind = SUPER, V, exec, clipboard
bind = SUPER, B, exec, brave
bind = SUPER, F, exec, nemo
bind = SUPER, C, exec, codium
# Move focus
bind = SUPER, left, movefocus, l
bind = SUPER, right, movefocus, r
bind = SUPER, up, movefocus, u
bind = SUPER, down, movefocus, d
# Move window
bind = SUPER SHIFT, left, movewindow, l
bind = SUPER SHIFT, right, movewindow, r
bind = SUPER SHIFT, up, movewindow, u
bind = SUPER SHIFT, down, movewindow, d
bindm = SUPER, mouse:272, movewindow
# Move focus
bind = SUPER, left, movefocus, l
bind = SUPER, right, movefocus, r
bind = SUPER, up, movefocus, u
bind = SUPER, down, movefocus, d
# Resize window
binde = SUPER CONTROL, left, resizeactive, -100 0
binde = SUPER CONTROL, right, resizeactive, 100 0
binde = SUPER CONTROL, up, resizeactive, 0 -100
binde = SUPER CONTROL, down, resizeactive, 0 100
bindm = SUPER, mouse:273, resizewindow
# Move window
bind = SUPER SHIFT, left, movewindow, l
bind = SUPER SHIFT, right, movewindow, r
bind = SUPER SHIFT, up, movewindow, u
bind = SUPER SHIFT, down, movewindow, d
bindm = SUPER, mouse:272, movewindow
# Minimize window
bind = SUPER SHIFT, M, togglespecialworkspace, minimize
bind = SUPER SHIFT, M, movetoworkspace, +0
bind = SUPER SHIFT, M, togglespecialworkspace, minimize
bind = SUPER SHIFT, M, movetoworkspace, special:minimize
bind = SUPER SHIFT, M, togglespecialworkspace, minimize
# Resize window
binde = SUPER CONTROL, left, resizeactive, -100 0
binde = SUPER CONTROL, right, resizeactive, 100 0
binde = SUPER CONTROL, up, resizeactive, 0 -100
binde = SUPER CONTROL, down, resizeactive, 0 100
bindm = SUPER, mouse:273, resizewindow
# Switch workspace
${lib.concatMapStringsSep "\n" (n: "bind=SUPER, ${toString n}, workspace, ${toString n}") (lib.range 1 9)}
${lib.concatMapStringsSep "\n" (n: "bind=SUPER:SHIFT, ${toString n}, movetoworkspacesilent, ${toString n}") (lib.range 1 9)}
# Minimize window
bind = SUPER SHIFT, M, togglespecialworkspace, minimize
bind = SUPER SHIFT, M, movetoworkspace, +0
bind = SUPER SHIFT, M, togglespecialworkspace, minimize
bind = SUPER SHIFT, M, movetoworkspace, special:minimize
bind = SUPER SHIFT, M, togglespecialworkspace, minimize
# Scroll through workspaces
bind = SUPER, mouse_down, workspace, e-1
bind = SUPER, mouse_up, workspace, e+1
# Switch workspace
${lib.concatMapStringsSep "\n" (n: "bind=SUPER, ${toString n}, workspace, ${toString n}") (
lib.range 1 9
)}
${lib.concatMapStringsSep "\n" (
n: "bind=SUPER:SHIFT, ${toString n}, movetoworkspacesilent, ${toString n}"
) (lib.range 1 9)}
# Manage session
bindrl = SUPER CONTROL, Q, exit,
bindrl = SUPER CONTROL, P, exec, poweroff
bindrl = SUPER CONTROL, R, exec, reboot
bindrl = SUPER CONTROL, S, exec, systemctl suspend
bindrl = SUPER CONTROL, L, exec, loginctl lock-session
bindrl = SUPER CONTROL, B, exec, sleep 1 && hyprctl dispatch dpms off
bindl = , switch:on:Lid Switch, exec, systemctl suspend
# Scroll through workspaces
bind = SUPER, mouse_down, workspace, e-1
bind = SUPER, mouse_up, workspace, e+1
# Control media
${let
play-pause = "${lib.getExe pkgs.playerctl} --ignore-player=brave play-pause";
play-next = "${lib.getExe pkgs.playerctl} --ignore-player=brave next";
play-previous = "${lib.getExe pkgs.playerctl} --ignore-player=brave previous";
mute = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
volume-up = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
volume-down = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
in ''
bindl = , XF86AudioPlay, exec, ${play-pause}
bindel = SHIFT, XF86AudioRaiseVolume, exec, ${play-next}
bindel = SHIFT, XF86AudioLowerVolume, exec, ${play-previous}
bindl = , XF86AudioMute, exec, ${mute}
bindel = , XF86AudioRaiseVolume, exec, ${volume-up}
bindel = , XF86AudioLowerVolume, exec, ${volume-down}
# Manage session
bindrl = SUPER CONTROL, Q, exit,
bindrl = SUPER CONTROL, P, exec, poweroff
bindrl = SUPER CONTROL, R, exec, reboot
bindrl = SUPER CONTROL, S, exec, systemctl suspend
bindrl = SUPER CONTROL, L, exec, loginctl lock-session
bindrl = SUPER CONTROL, B, exec, sleep 1 && hyprctl dispatch dpms off
bindl = , switch:on:Lid Switch, exec, systemctl suspend
bindl = SUPER ALT, RETURN, exec, ${play-pause}
bindel = SUPER ALT, right, exec, ${play-next}
bindel = SUPER ALT, left, exec, ${play-previous}
bindl = SUPER ALT, BACKSPACE, exec, ${mute}
bindel = SUPER ALT, up, exec, ${volume-up}
bindel = SUPER ALT, down, exec, ${volume-down}
''}
# Control media
${
let
play-pause = "${lib.getExe pkgs.playerctl} --ignore-player=brave play-pause";
play-next = "${lib.getExe pkgs.playerctl} --ignore-player=brave next";
play-previous = "${lib.getExe pkgs.playerctl} --ignore-player=brave previous";
mute = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
volume-up = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+";
volume-down = "wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-";
in
''
bindl = , XF86AudioPlay, exec, ${play-pause}
bindel = SHIFT, XF86AudioRaiseVolume, exec, ${play-next}
bindel = SHIFT, XF86AudioLowerVolume, exec, ${play-previous}
bindl = , XF86AudioMute, exec, ${mute}
bindel = , XF86AudioRaiseVolume, exec, ${volume-up}
bindel = , XF86AudioLowerVolume, exec, ${volume-down}
# Adjust brightness
bindel = , XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -e set +2%
bindel = , XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -e set 2%-
bindl = SUPER ALT, RETURN, exec, ${play-pause}
bindel = SUPER ALT, right, exec, ${play-next}
bindel = SUPER ALT, left, exec, ${play-previous}
bindl = SUPER ALT, BACKSPACE, exec, ${mute}
bindel = SUPER ALT, up, exec, ${volume-up}
bindel = SUPER ALT, down, exec, ${volume-down}
''
}
# Screenshot
bind = , Print, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave output
bind = SHIFT, Print, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area
# Adjust brightness
bindel = , XF86MonBrightnessUp, exec, ${lib.getExe pkgs.brightnessctl} -e set +2%
bindel = , XF86MonBrightnessDown, exec, ${lib.getExe pkgs.brightnessctl} -e set 2%-
# Escape special workspace
bind = SUPER, ESCAPE, togglespecialworkspace, blank
bind = SUPER, ESCAPE, togglespecialworkspace, blank
# Screenshot
bind = , Print, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave output
bind = SHIFT, Print, exec, ${lib.getExe pkgs.grimblast} --notify --freeze copysave area
# Music workspace
exec-once = [workspace special:music silent] spotify
workspace = special:music, border:false, gapsout:20, on-created-empty:spotify
bind = SUPER, S, togglespecialworkspace, music
# Escape special workspace
bind = SUPER, ESCAPE, togglespecialworkspace, blank
bind = SUPER, ESCAPE, togglespecialworkspace, blank
# Chat workspace
exec-once = [workspace special:chat silent] webcord
workspace = special:chat, border:false, gapsout:20, on-created-empty:webcord
bind = SUPER, D, togglespecialworkspace, chat
# Music workspace
exec-once = [workspace special:music silent] spotify
workspace = special:music, border:false, gapsout:20, on-created-empty:spotify
bind = SUPER, S, togglespecialworkspace, music
# Flake workspace
workspace = special:flake, border:false, gapsout:40, on-created-empty:kitty --directory $FLAKE --override background_opacity=0.6
windowrulev2 = noblur, class:(kitty), onworkspace:special:flake
bind = SUPER, Q, togglespecialworkspace, flake
'';
};
# Chat workspace
exec-once = [workspace special:chat silent] webcord
workspace = special:chat, border:false, gapsout:20, on-created-empty:webcord
bind = SUPER, D, togglespecialworkspace, chat
# Flake workspace
workspace = special:flake, border:false, gapsout:40, on-created-empty:kitty --directory $FLAKE --override background_opacity=0.6
windowrulev2 = noblur, class:(kitty), onworkspace:special:flake
bind = SUPER, Q, togglespecialworkspace, flake
'';
};
}

View file

@ -1,78 +1,80 @@
{
config,
pkgs,
lib,
...
}: let
cfg = config.myConfig.de;
in {
options.myConfig.de.theme = lib.mkOption {type = lib.types.str;};
config,
pkgs,
lib,
...
}:
let
cfg = config.myConfig.de;
in
{
options.myConfig.de.theme = lib.mkOption { type = lib.types.str; };
config = lib.mkMerge [
(lib.mkIf (cfg.theme == "dark") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
config = lib.mkMerge [
(lib.mkIf (cfg.theme == "dark") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk = {
enable = true;
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
theme.name = "Adwaita-dark";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Papirus-Dark";
iconTheme.package = pkgs.papirus-icon-theme;
iconTheme.name = "Papirus-Dark";
iconTheme.package = pkgs.papirus-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
home.pointerCursor = {
name = "Bibata-Original-Classic";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
(lib.mkIf (cfg.theme == "light") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
(lib.mkIf (cfg.theme == "light") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
gtk = {
enable = true;
gtk = {
enable = true;
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.name = "Adwaita";
theme.package = pkgs.gnome.gnome-themes-extra;
theme.name = "Adwaita";
theme.package = pkgs.gnome.gnome-themes-extra;
iconTheme.name = "Papirus";
iconTheme.package = pkgs.papirus-icon-theme;
iconTheme.name = "Papirus";
iconTheme.package = pkgs.papirus-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
font.name = "Open Sans";
font.package = pkgs.open-sans;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita";
style.package = pkgs.adwaita-qt;
};
qt = {
enable = true;
platformTheme.name = "adwaita";
style.name = "adwaita";
style.package = pkgs.adwaita-qt;
};
home.pointerCursor = {
name = "Bibata-Original-Ice";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
];
home.pointerCursor = {
name = "Bibata-Original-Ice";
package = pkgs.bibata-cursors;
size = 24;
gtk.enable = true;
};
})
];
}

View file

@ -1,18 +1,19 @@
{
config,
lib,
wrappers,
...
}: {
options.myConfig.de.waybar.enable = lib.mkEnableOption "";
config,
lib,
wrappers,
...
}:
{
options.myConfig.de.waybar.enable = lib.mkEnableOption "";
config = lib.mkIf config.myConfig.de.waybar.enable {
programs.waybar = {
enable = true;
package = wrappers.waybar;
systemd.enable = true;
};
systemd.user.services.waybar.Unit.After = ["sound.target"];
config = lib.mkIf config.myConfig.de.waybar.enable {
programs.waybar = {
enable = true;
package = wrappers.waybar;
systemd.enable = true;
};
systemd.user.services.waybar.Unit.After = [ "sound.target" ];
};
}