mirror of
https://github.com/SebastianStork/nixos-config.git
synced 2026-01-21 17:31:34 +01:00
Let hyprland do the services starting
This commit is contained in:
parent
a9e83e15ad
commit
905d55db30
13 changed files with 92 additions and 138 deletions
|
|
@ -2,7 +2,5 @@
|
|||
imports = [
|
||||
./hyprland
|
||||
./theme.nix
|
||||
./waybar.nix
|
||||
./hypridlelock.nix
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,17 +0,0 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
wrappers,
|
||||
...
|
||||
}:
|
||||
{
|
||||
options.myConfig.de.hypridlelock.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.de.hypridlelock.enable {
|
||||
services.hypridle = {
|
||||
enable = true;
|
||||
package = wrappers.hypridle { };
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,61 +0,0 @@
|
|||
{
|
||||
config,
|
||||
lib,
|
||||
wrappers,
|
||||
...
|
||||
}:
|
||||
{
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
exec-once = [ "${lib.getExe wrappers.hyprpaper}" ];
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,16 +1,82 @@
|
|||
{ config, lib, ... }:
|
||||
{
|
||||
imports = [
|
||||
./config.nix
|
||||
./keybinds.nix
|
||||
];
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
wrappers,
|
||||
...
|
||||
}:
|
||||
{
|
||||
imports = [ ./keybinds.nix ];
|
||||
|
||||
options.myConfig.de.hyprland.enable = lib.mkEnableOption "";
|
||||
|
||||
config = lib.mkIf config.myConfig.de.hyprland.enable {
|
||||
myConfig.de = {
|
||||
hypridlelock.enable = true;
|
||||
waybar.enable = true;
|
||||
home.packages = [
|
||||
wrappers.hyprpaper
|
||||
wrappers.waybar
|
||||
wrappers.hyprlock
|
||||
|
||||
(wrappers.rofi { inherit (config.myConfig.de) theme; })
|
||||
pkgs.cliphist
|
||||
pkgs.wl-clipboard
|
||||
(pkgs.writeScriptBin "clipboard" "cliphist list | rofi -dmenu -display-columns 2 | cliphist decode | wl-copy")
|
||||
];
|
||||
|
||||
wayland.windowManager.hyprland = {
|
||||
enable = true;
|
||||
|
||||
settings = {
|
||||
exec-once = [
|
||||
"hyprpaper"
|
||||
"sleep 3 && waybar"
|
||||
"hypridle"
|
||||
"cliphist wipe && wl-paste --watch cliphist store"
|
||||
];
|
||||
|
||||
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;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,7 +16,6 @@
|
|||
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
|
||||
|
|
@ -31,6 +30,7 @@
|
|||
bind = SUPER, right, movefocus, r
|
||||
bind = SUPER, up, movefocus, u
|
||||
bind = SUPER, down, movefocus, d
|
||||
bind = SUPER, TAB, cyclenext,
|
||||
|
||||
# Move window
|
||||
bind = SUPER SHIFT, left, movewindow, l
|
||||
|
|
@ -72,6 +72,7 @@
|
|||
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
|
||||
bind = SUPER CONTROL, R, exec, pkill waybar && hyprctl dispatch exec waybar
|
||||
bindl = , switch:on:Lid Switch, exec, systemctl suspend
|
||||
|
||||
# Control media
|
||||
|
|
|
|||
|
|
@ -1,19 +0,0 @@
|
|||
{
|
||||
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" ];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue