From c3c2c1ad6da2819751d6066362601ee43bbbef37 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 17 Mar 2025 21:09:27 +0100 Subject: [PATCH 1/3] add swaylock --- home/vinzenz/default.nix | 1 + home/vinzenz/niri.nix | 1 - home/vinzenz/swaylock.nix | 21 +++++++++++++++++++++ home/vinzenz/waybar.nix | 3 +-- modules/globalinstalls.nix | 2 ++ 5 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 home/vinzenz/swaylock.nix diff --git a/home/vinzenz/default.nix b/home/vinzenz/default.nix index 5d68bfc..227ed06 100644 --- a/home/vinzenz/default.nix +++ b/home/vinzenz/default.nix @@ -28,6 +28,7 @@ ./gnome.nix ./niri.nix ./ssh.nix + ./swaylock.nix ./vscode.nix ./waybar.nix ./zsh.nix diff --git a/home/vinzenz/niri.nix b/home/vinzenz/niri.nix index b801c6b..fa3d008 100644 --- a/home/vinzenz/niri.nix +++ b/home/vinzenz/niri.nix @@ -7,7 +7,6 @@ xwayland-satellite alacritty fuzzel - swaylock ]; qt.style = { diff --git a/home/vinzenz/swaylock.nix b/home/vinzenz/swaylock.nix new file mode 100644 index 0000000..9a4bc2b --- /dev/null +++ b/home/vinzenz/swaylock.nix @@ -0,0 +1,21 @@ +# based on https://codeberg.org/kiara/cfg/src/commit/b9c472acd78c9c08dfe8b6a643c5c82cc5828433/home-manager/kiara/swaylock.nix# +{ pkgs, ... }: +{ + 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; + }; + }; +} diff --git a/home/vinzenz/waybar.nix b/home/vinzenz/waybar.nix index 145e15a..22e608d 100644 --- a/home/vinzenz/waybar.nix +++ b/home/vinzenz/waybar.nix @@ -3,10 +3,9 @@ home.packages = with pkgs; [ waybar playerctl + cava ]; - programs.cava.enable = true; - programs.waybar = { enable = true; settings = { diff --git a/modules/globalinstalls.nix b/modules/globalinstalls.nix index 9afad7d..c4c21d2 100644 --- a/modules/globalinstalls.nix +++ b/modules/globalinstalls.nix @@ -15,6 +15,8 @@ tldr neofetch + + nix-output-monitor ]; }; From 06886d02dcdc8093ac9c0e88fe225d830c3fe95e Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Mon, 17 Mar 2025 21:49:44 +0100 Subject: [PATCH 2/3] brightness control, swayidle --- home/vinzenz/default.nix | 1 + home/vinzenz/niri.nix | 13 ++++--- home/vinzenz/swaylock.nix | 51 +++++++++++++++++++--------- home/vinzenz/waybar.nix | 10 +++++- hosts/vinzenz-lpt2/configuration.nix | 11 +++++- 5 files changed, 63 insertions(+), 23 deletions(-) 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; + }; + }; + }; }; } From d1e0c69e4c68b9970916159adbaec11fdfe2f0d6 Mon Sep 17 00:00:00 2001 From: Vinzenz Schroeter Date: Tue, 18 Mar 2025 17:15:11 +0100 Subject: [PATCH 3/3] make fuzzel less bright --- home/vinzenz/niri.nix | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/home/vinzenz/niri.nix b/home/vinzenz/niri.nix index 53e6899..57c30eb 100644 --- a/home/vinzenz/niri.nix +++ b/home/vinzenz/niri.nix @@ -11,7 +11,6 @@ home.packages = with pkgs; [ xwayland-satellite alacritty - fuzzel ]; qt.style = { @@ -29,6 +28,35 @@ }; }; + programs.fuzzel = { + enable = true; + settings = { + main = { + terminal = "${pkgs.alacritty}/bin/alacritty"; + icon-theme = "Adwaita"; + counter = true; + font = "sans:size=10"; + }; + colors = { + border = "0003B3FF"; + background = "0F0F0FFF"; + text = "657b83ff"; + prompt = "586e75ff"; + placeholder = "93a1a1ff"; + input = "657b83ff"; + match = "cb4b16ff"; + selection = "eee8d5ff"; + selection-text = "586e75ff"; + selection-match = "cb4b16ff"; + counter = "93a1a1ff"; + }; + border = { + radius = 30; + width = 3; + }; + }; + }; + programs.niri.settings = { input.keyboard.xkb.layout = "de"; @@ -54,7 +82,7 @@ # Mod-Shift-/, which is usually the same as Mod-?, # shows a list of important hotkeys. - "Mod+Shift+Slash".action.show-hotkey-overlay = { }; + "Mod+Shift+Numbersign".action.show-hotkey-overlay = { }; # Suggested binds for running programs: terminal, app launcher, screen locker. "Mod+T".action.spawn = "alacritty";