diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 227ed06..95573f1 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -16,6 +16,7 @@ "adbusers" "kvm" "input" + "video" ]; shell = pkgs.zsh; autoSubUidGidRange = true; diff --git a/home/vinzenz/niri.nix b/home/vinzenz/niri.nix index fa3d008..53e6899 100644 --- a/home/vinzenz/niri.nix +++ b/home/vinzenz/niri.nix @@ -1,8 +1,13 @@ -{ pkgs, ... }: +{ + pkgs, + lib, + devices, + config, + ... +}: { config = { home.sessionVariables.NIXOS_OZONE_WL = "1"; - home.packages = with pkgs; [ xwayland-satellite alacritty @@ -24,8 +29,6 @@ }; }; - # services.swayidle.enable = true; - programs.niri.settings = { input.keyboard.xkb.layout = "de"; @@ -56,7 +59,7 @@ # Suggested binds for running programs: terminal, app launcher, screen locker. "Mod+T".action.spawn = "alacritty"; "Mod+D".action.spawn = "fuzzel"; - "Super+Alt+L".action.spawn = "swaylock"; + "Super+Alt+L".action.spawn = "${config.programs.swaylock.package}/bin/swaylock"; # You can also use a shell. Do this if you need pipes, multiple commands, etc. # Note: the entire command goes as a single argument in the end. diff --git a/home/vinzenz/swaylock.nix b/home/vinzenz/swaylock.nix index 9a4bc2b..291a90c 100644 --- a/home/vinzenz/swaylock.nix +++ b/home/vinzenz/swaylock.nix @@ -1,21 +1,40 @@ # based on https://codeberg.org/kiara/cfg/src/commit/b9c472acd78c9c08dfe8b6a643c5c82cc5828433/home-manager/kiara/swaylock.nix# -{ pkgs, ... }: +{ pkgs, config, ... }: { - programs.swaylock = { - enable = true; - package = pkgs.swaylock-effects; - # https://github.com/jirutka/swaylock-effects/blob/master/swaylock.1.scd - settings = { - screenshot = true; - effect-blur = "9x9"; - effect-vignette = "0.5:0.5"; - fade-in = 0.5; - font-size = 75; - indicator-caps-lock = true; - clock = true; - indicator-radius = 400; - show-failed-attempts = true; - ignore-empty-password = true; + config = { + programs.swaylock = { + enable = true; + package = pkgs.swaylock-effects; + # https://github.com/jirutka/swaylock-effects/blob/master/swaylock.1.scd + settings = { + screenshot = true; + effect-blur = "9x9"; + effect-vignette = "0.2:0.2"; + fade-in = 0.5; + font-size = 75; + indicator-caps-lock = true; + clock = true; + indicator-radius = 400; + show-failed-attempts = true; + ignore-empty-password = true; + grace = 2; + color = "000000"; + indicator-thickness = 20; + }; + }; + + services.swayidle = { + enable = true; + timeouts = [ + { + timeout = 60; + command = "${config.programs.swaylock.package}/bin/swaylock"; + } + #{ + # timeout = 90; + # command = "${pkgs.systemd}/bin/systemctl suspend"; + #} + ]; }; }; } diff --git a/home/vinzenz/waybar.nix b/home/vinzenz/waybar.nix index 22e608d..a3797cf 100644 --- a/home/vinzenz/waybar.nix +++ b/home/vinzenz/waybar.nix @@ -1,4 +1,9 @@ -{ pkgs, device, ... }: +{ + pkgs, + device, + config, + ... +}: { home.packages = with pkgs; [ waybar @@ -8,6 +13,7 @@ programs.waybar = { enable = true; + systemd.enable = true; settings = { mainBar = { layer = "top"; @@ -105,6 +111,8 @@ backlight = { device = "intel_backlight"; format = "{percent}% "; + on-scroll-down = "light -U 1"; + on-scroll-up = "light -A 1"; }; cpu = { interval = 1; diff --git a/hosts/vinzenz-lpt2/configuration.nix b/hosts/vinzenz-lpt2/configuration.nix index 5267e89..5ec706e 100644 --- a/hosts/vinzenz-lpt2/configuration.nix +++ b/hosts/vinzenz-lpt2/configuration.nix @@ -27,6 +27,15 @@ # ''ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIALWKm+d6KL6Vl3grPOcGouiNTkvdhXuWJmcrdEBY2nw ronja-ssh-host-key'' #]; - programs.adb.enable = true; + programs = { + adb.enable = true; + light = { + enable = true; + brightnessKeys = { + enable = true; + step = 5; + }; + }; + }; }; }