refactor(hyprland): wrap hm module in a nixos module to add system settings
This commit is contained in:
parent
89e9df4ad1
commit
796e7e8f1d
|
|
@ -5,6 +5,7 @@
|
|||
../../modules/ags
|
||||
../../modules/audio.nix
|
||||
../../modules/greetd
|
||||
../../modules/hyprland
|
||||
../../modules/kmscon.nix
|
||||
../../modules/printer.nix
|
||||
../../modules/proton-bridge.nix
|
||||
|
|
@ -39,7 +40,6 @@
|
|||
imports = [
|
||||
../../home/dconf.nix
|
||||
../../home/firefox
|
||||
../../home/hyprland
|
||||
|
||||
./home/packages.nix
|
||||
];
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@
|
|||
../../modules/ags
|
||||
../../modules/audio.nix
|
||||
../../modules/greetd
|
||||
../../modules/hyprland
|
||||
../../modules/kmscon.nix
|
||||
../../modules/plymouth.nix
|
||||
../../modules/printer.nix
|
||||
|
|
@ -36,7 +37,6 @@
|
|||
imports = [
|
||||
../../home/dconf.nix
|
||||
../../home/firefox
|
||||
../../home/hyprland
|
||||
|
||||
./home/dotfiles.nix
|
||||
./home/packages.nix
|
||||
|
|
|
|||
|
|
@ -1,217 +0,0 @@
|
|||
{
|
||||
config,
|
||||
osConfig,
|
||||
hyprland,
|
||||
hyprgrass,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
# Nix utils
|
||||
optionals = lib.lists.optionals;
|
||||
|
||||
# Config stuff
|
||||
isNvidia = osConfig.hardware.nvidia.modesetting.enable;
|
||||
isTouchscreen = osConfig.hardware.sensor.iio.enable;
|
||||
confPath = "${config.vars.configDir}/hypr/main.conf";
|
||||
kdeconnect = osConfig.programs.kdeconnect;
|
||||
|
||||
gset = pkgs.gsettings-desktop-schemas;
|
||||
polkit = pkgs.plasma5Packages.polkit-kde-agent;
|
||||
in {
|
||||
imports = [
|
||||
./theme.nix
|
||||
../alacritty.nix
|
||||
../wofi
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = hyprland.packages.x86_64-linux.default;
|
||||
|
||||
plugins =
|
||||
[]
|
||||
++ (optionals isTouchscreen [
|
||||
hyprgrass.packages.${pkgs.system}.default
|
||||
]);
|
||||
|
||||
settings = {
|
||||
env =
|
||||
[
|
||||
"XCURSOR_SIZE, 24"
|
||||
"XDG_DATA_DIRS, ${builtins.concatStringsSep ":" [
|
||||
"${gset}/share/gsettings-schemas/${gset.name}"
|
||||
"${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
|
||||
"$XDG_DATA_DIRS"
|
||||
]}"
|
||||
]
|
||||
++ (optionals isNvidia [
|
||||
"LIBVA_DRIVER_NAME, nvidia"
|
||||
"XDG_SESSION_TYPE, wayland"
|
||||
"GBM_BACKEND, nvidia-drm"
|
||||
"__GLX_VENDOR_LIBRARY_NAME, nvidia"
|
||||
"WLR_NO_HARDWARE_CURSORS, 1"
|
||||
]);
|
||||
|
||||
xwayland.force_zero_scaling = true;
|
||||
monitor = [
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:Acer Technologies Acer K212HQL T3EAA0014201"
|
||||
"1920x1080@60"
|
||||
"840x1000, 1, transform, 3"
|
||||
])
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:BOE 0x0964"
|
||||
"1920x1200@60"
|
||||
"0x2920, 1"
|
||||
])
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:Samsung Electric Company C27JG5x HTOM100586"
|
||||
"2560x1440@60"
|
||||
"1920x120, 1"
|
||||
])
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. G27QC 0x00000B1D"
|
||||
"2560x1440@165"
|
||||
"1920x1560, 1"
|
||||
])
|
||||
];
|
||||
|
||||
input = {
|
||||
kb_layout = osConfig.services.xserver.layout;
|
||||
kb_variant = osConfig.services.xserver.xkbVariant;
|
||||
follow_mouse = true;
|
||||
|
||||
touchpad.natural_scroll = true;
|
||||
};
|
||||
|
||||
exec-once =
|
||||
[
|
||||
"hyprctl setcursor Dracula-cursors 24"
|
||||
"${polkit}/libexec/polkit-kde-authentication-agent-1"
|
||||
"swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png"
|
||||
"wl-paste --watch cliphist store"
|
||||
]
|
||||
++ (optionals (kdeconnect.enable) [
|
||||
"${kdeconnect.package}/libexec/kdeconnectd"
|
||||
"kdeconnect-indicator"
|
||||
])
|
||||
++ (optionals (osConfig.services.gnome.gnome-keyring.enable) [
|
||||
"gnome-keyring-daemon --start --components=secrets"
|
||||
]);
|
||||
|
||||
windowrule = [
|
||||
"noborder,^(wofi)$"
|
||||
|
||||
# Polkit
|
||||
"float,^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||
"size 741 288,^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||
"center,^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||
];
|
||||
|
||||
"$mainMod" = "SUPER";
|
||||
|
||||
bind = [
|
||||
# Defaults
|
||||
"$mainMod, Q, exec, alacritty"
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod, C, killactive, "
|
||||
"$mainMod SHIFT, SPACE, togglefloating, "
|
||||
"$mainMod, J, layoutmsg, togglesplit"
|
||||
|
||||
## Move focus with arrow keys
|
||||
"$mainMod, left, movefocus, l"
|
||||
"$mainMod, right, movefocus, r"
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
|
||||
## Move to specific workspaces
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
"$mainMod, 3, workspace, 3"
|
||||
"$mainMod, 4, workspace, 4"
|
||||
"$mainMod, 5, workspace, 5"
|
||||
"$mainMod, 6, workspace, 6"
|
||||
"$mainMod, 7, workspace, 7"
|
||||
"$mainMod, 8, workspace, 8"
|
||||
"$mainMod, 9, workspace, 9"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
|
||||
# Move active window to a workspace
|
||||
"$mainMod SHIFT, 1, movetoworkspace, 1"
|
||||
"$mainMod SHIFT, 2, movetoworkspace, 2"
|
||||
"$mainMod SHIFT, 3, movetoworkspace, 3"
|
||||
"$mainMod SHIFT, 4, movetoworkspace, 4"
|
||||
"$mainMod SHIFT, 5, movetoworkspace, 5"
|
||||
"$mainMod SHIFT, 6, movetoworkspace, 6"
|
||||
"$mainMod SHIFT, 7, movetoworkspace, 7"
|
||||
"$mainMod SHIFT, 8, movetoworkspace, 8"
|
||||
"$mainMod SHIFT, 9, movetoworkspace, 9"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
|
||||
# Clipboard History
|
||||
"$mainMod, V, exec, killall -r wofi || cliphist list | wofi --dmenu | cliphist decode | wl-copy"
|
||||
|
||||
",Print, exec, grim -g \"$(slurp)\" - | swappy -f -"
|
||||
"$mainMod SHIFT, C, exec, wl-color-picker"
|
||||
|
||||
",XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle"
|
||||
",XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle"
|
||||
];
|
||||
|
||||
binde = [
|
||||
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
];
|
||||
|
||||
# Mouse Binds
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
];
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
vfr = true;
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
smart_split = true;
|
||||
special_scale_factor = 0.8;
|
||||
};
|
||||
|
||||
source = [confPath];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# tools
|
||||
wl-color-picker
|
||||
grim
|
||||
slurp
|
||||
swappy
|
||||
swayidle
|
||||
bluez-tools
|
||||
brightnessctl
|
||||
pulseaudio
|
||||
gnome.seahorse
|
||||
|
||||
gtklock
|
||||
swww
|
||||
|
||||
## libs
|
||||
qt5.qtwayland
|
||||
qt6.qtwayland
|
||||
libayatana-appindicator
|
||||
xdg-utils
|
||||
evtest
|
||||
glib
|
||||
xorg.xrandr
|
||||
libinput
|
||||
xclip
|
||||
wl-clipboard
|
||||
cliphist
|
||||
libnotify
|
||||
];
|
||||
}
|
||||
220
modules/hyprland/default.nix
Normal file
220
modules/hyprland/default.nix
Normal file
|
|
@ -0,0 +1,220 @@
|
|||
{
|
||||
config,
|
||||
hyprland,
|
||||
hyprgrass,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
# Nix utils
|
||||
optionals = lib.lists.optionals;
|
||||
|
||||
# Config stuff
|
||||
isNvidia = config.hardware.nvidia.modesetting.enable;
|
||||
isTouchscreen = config.hardware.sensor.iio.enable;
|
||||
confPath = "${config.vars.configDir}/hypr/main.conf";
|
||||
kdeconnect = config.programs.kdeconnect;
|
||||
gnomekey = config.services.gnome.gnome-keyring;
|
||||
xserver = config.services.xserver;
|
||||
|
||||
gset = pkgs.gsettings-desktop-schemas;
|
||||
polkit = pkgs.plasma5Packages.polkit-kde-agent;
|
||||
in {
|
||||
home-manager.users.${config.vars.user} = {
|
||||
imports = [
|
||||
../../home/theme.nix
|
||||
../../home/alacritty.nix
|
||||
../../home/wofi
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
package = hyprland.packages.x86_64-linux.default;
|
||||
|
||||
plugins =
|
||||
[]
|
||||
++ (optionals isTouchscreen [
|
||||
hyprgrass.packages.${pkgs.system}.default
|
||||
]);
|
||||
|
||||
settings = {
|
||||
env =
|
||||
[
|
||||
"XCURSOR_SIZE, 24"
|
||||
"XDG_DATA_DIRS, ${builtins.concatStringsSep ":" [
|
||||
"${gset}/share/gsettings-schemas/${gset.name}"
|
||||
"${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}"
|
||||
"$XDG_DATA_DIRS"
|
||||
]}"
|
||||
]
|
||||
++ (optionals isNvidia [
|
||||
"LIBVA_DRIVER_NAME, nvidia"
|
||||
"XDG_SESSION_TYPE, wayland"
|
||||
"GBM_BACKEND, nvidia-drm"
|
||||
"__GLX_VENDOR_LIBRARY_NAME, nvidia"
|
||||
"WLR_NO_HARDWARE_CURSORS, 1"
|
||||
]);
|
||||
|
||||
xwayland.force_zero_scaling = true;
|
||||
monitor = [
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:Acer Technologies Acer K212HQL T3EAA0014201"
|
||||
"1920x1080@60"
|
||||
"840x1000, 1, transform, 3"
|
||||
])
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:BOE 0x0964"
|
||||
"1920x1200@60"
|
||||
"0x2920, 1"
|
||||
])
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:Samsung Electric Company C27JG5x HTOM100586"
|
||||
"2560x1440@60"
|
||||
"1920x120, 1"
|
||||
])
|
||||
(builtins.concatStringsSep "," [
|
||||
"desc:GIGA-BYTE TECHNOLOGY CO. LTD. G27QC 0x00000B1D"
|
||||
"2560x1440@165"
|
||||
"1920x1560, 1"
|
||||
])
|
||||
];
|
||||
|
||||
input = {
|
||||
kb_layout = xserver.layout;
|
||||
kb_variant = xserver.xkbVariant;
|
||||
follow_mouse = true;
|
||||
|
||||
touchpad.natural_scroll = true;
|
||||
};
|
||||
|
||||
exec-once =
|
||||
[
|
||||
"hyprctl setcursor Dracula-cursors 24"
|
||||
"${polkit}/libexec/polkit-kde-authentication-agent-1"
|
||||
"swww init --no-cache && swww img -t none ${pkgs.dracula-theme}/wallpapers/waves.png"
|
||||
"wl-paste --watch cliphist store"
|
||||
]
|
||||
++ (optionals (kdeconnect.enable) [
|
||||
"${kdeconnect.package}/libexec/kdeconnectd"
|
||||
"kdeconnect-indicator"
|
||||
])
|
||||
++ (optionals (gnomekey.enable) [
|
||||
"gnome-keyring-daemon --start --components=secrets"
|
||||
]);
|
||||
|
||||
windowrule = [
|
||||
"noborder,^(wofi)$"
|
||||
|
||||
# Polkit
|
||||
"float,^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||
"size 741 288,^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||
"center,^(org.kde.polkit-kde-authentication-agent-1)$"
|
||||
];
|
||||
|
||||
"$mainMod" = "SUPER";
|
||||
|
||||
bind = [
|
||||
# Defaults
|
||||
"$mainMod, Q, exec, alacritty"
|
||||
"$mainMod, F, fullscreen"
|
||||
"$mainMod, C, killactive, "
|
||||
"$mainMod SHIFT, SPACE, togglefloating, "
|
||||
"$mainMod, J, layoutmsg, togglesplit"
|
||||
|
||||
## Move focus with arrow keys
|
||||
"$mainMod, left, movefocus, l"
|
||||
"$mainMod, right, movefocus, r"
|
||||
"$mainMod, up, movefocus, u"
|
||||
"$mainMod, down, movefocus, d"
|
||||
|
||||
## Move to specific workspaces
|
||||
"$mainMod, 1, workspace, 1"
|
||||
"$mainMod, 2, workspace, 2"
|
||||
"$mainMod, 3, workspace, 3"
|
||||
"$mainMod, 4, workspace, 4"
|
||||
"$mainMod, 5, workspace, 5"
|
||||
"$mainMod, 6, workspace, 6"
|
||||
"$mainMod, 7, workspace, 7"
|
||||
"$mainMod, 8, workspace, 8"
|
||||
"$mainMod, 9, workspace, 9"
|
||||
"$mainMod, 0, workspace, 10"
|
||||
|
||||
# Move active window to a workspace
|
||||
"$mainMod SHIFT, 1, movetoworkspace, 1"
|
||||
"$mainMod SHIFT, 2, movetoworkspace, 2"
|
||||
"$mainMod SHIFT, 3, movetoworkspace, 3"
|
||||
"$mainMod SHIFT, 4, movetoworkspace, 4"
|
||||
"$mainMod SHIFT, 5, movetoworkspace, 5"
|
||||
"$mainMod SHIFT, 6, movetoworkspace, 6"
|
||||
"$mainMod SHIFT, 7, movetoworkspace, 7"
|
||||
"$mainMod SHIFT, 8, movetoworkspace, 8"
|
||||
"$mainMod SHIFT, 9, movetoworkspace, 9"
|
||||
"$mainMod SHIFT, 0, movetoworkspace, 10"
|
||||
|
||||
# Clipboard History
|
||||
"$mainMod, V, exec, killall -r wofi || cliphist list | wofi --dmenu | cliphist decode | wl-copy"
|
||||
|
||||
",Print, exec, grim -g \"$(slurp)\" - | swappy -f -"
|
||||
"$mainMod SHIFT, C, exec, wl-color-picker"
|
||||
|
||||
",XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle"
|
||||
",XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle"
|
||||
];
|
||||
|
||||
binde = [
|
||||
",XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+"
|
||||
",XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"
|
||||
];
|
||||
|
||||
# Mouse Binds
|
||||
bindm = [
|
||||
"$mainMod, mouse:272, movewindow"
|
||||
"$mainMod, mouse:273, resizewindow"
|
||||
];
|
||||
|
||||
misc = {
|
||||
disable_hyprland_logo = true;
|
||||
disable_splash_rendering = true;
|
||||
vfr = true;
|
||||
};
|
||||
|
||||
dwindle = {
|
||||
smart_split = true;
|
||||
special_scale_factor = 0.8;
|
||||
};
|
||||
|
||||
source = [confPath];
|
||||
};
|
||||
};
|
||||
|
||||
home.packages = with pkgs; [
|
||||
# tools
|
||||
wl-color-picker
|
||||
grim
|
||||
slurp
|
||||
swappy
|
||||
swayidle
|
||||
bluez-tools
|
||||
brightnessctl
|
||||
pulseaudio
|
||||
gnome.seahorse
|
||||
|
||||
gtklock
|
||||
swww
|
||||
|
||||
## libs
|
||||
qt5.qtwayland
|
||||
qt6.qtwayland
|
||||
libayatana-appindicator
|
||||
xdg-utils
|
||||
evtest
|
||||
glib
|
||||
xorg.xrandr
|
||||
libinput
|
||||
xclip
|
||||
wl-clipboard
|
||||
cliphist
|
||||
libnotify
|
||||
];
|
||||
};
|
||||
}
|
||||
Loading…
Reference in a new issue