From 65e6b9cab99791e64f9c218509a6f39cfa64dcdf Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 28 Sep 2025 16:32:40 +0200 Subject: [PATCH 1/4] [hypr] Fix modes --- stow/hyprland/.config/hypr/hyprland.conf | 18 +---------- stow/hyprland/.config/hypr/keybinds.conf | 9 +++--- stow/hyprland/.config/hypr/modes.conf | 38 ++++++++++++++++++++++++ stow/waybar/.config/waybar/config.jsonc | 3 ++ 4 files changed, 46 insertions(+), 22 deletions(-) create mode 100644 stow/hyprland/.config/hypr/modes.conf diff --git a/stow/hyprland/.config/hypr/hyprland.conf b/stow/hyprland/.config/hypr/hyprland.conf index 73bfa92..b9629db 100644 --- a/stow/hyprland/.config/hypr/hyprland.conf +++ b/stow/hyprland/.config/hypr/hyprland.conf @@ -270,23 +270,7 @@ $lock = swaylock source = /home/tdpeuter/.config/hypr/input-output.conf source = /home/tdpeuter/.config/hypr/keybinds.conf - -$mode_launcher = Launch (f)irefox, (t)hunderbird. -bind = $flag, O, submap, $mode_launcher -submap = $mode_launcher - -bind = , F, exec, firefox -bind = , F, submap, reset -bind = , T, exec, thunderbird -bind = , T, submap, reset -bind = , Z, exec, zen -bind = , Z, submap, reset - -bind = $flag, O, submap, reset -bind = , Escape, submap, reset -bind = , Return, submap, reset - -submap = reset +source = /home/tdpeuter/.config/hypr/modes.conf # https://wiki.hyprland.org/Nvidia/#environment-variables env = __GLX_VENDOR_LIBRARY_NAME,nvidia diff --git a/stow/hyprland/.config/hypr/keybinds.conf b/stow/hyprland/.config/hypr/keybinds.conf index 880a1f8..26385f3 100644 --- a/stow/hyprland/.config/hypr/keybinds.conf +++ b/stow/hyprland/.config/hypr/keybinds.conf @@ -58,9 +58,8 @@ bind = $flag, s, setfloating bind = $flag+Shift, s, pin bind = $flag+Shift, s, settiled -bind = $flag, F11, fullscreen, 1 -# bind = $flag, Prior, fullscreen, 1 -# bind = $flag, KP_Prior, fullscreen, 1 +bind = $flag, F11, fullscreen, 1 +bind = $flag+Shift, F11, fullscreen, 0 # Workspaces @@ -158,9 +157,9 @@ bind = , XF86Calculator, exec, qalculate-gtk # Shortcuts # Reload -bind = Alt+Shift, r, exec, "hyperctl reload" +bind = Alt+Shift, r, exec, "hyperctl reload" bind = Ctrl+Alt+Shift, r, forcerendererreload -bind = Alt+Shift, e, exit +bind = Alt+Shift, e, exit # Kill a window bind = $flag, q, closewindow, activewindow diff --git a/stow/hyprland/.config/hypr/modes.conf b/stow/hyprland/.config/hypr/modes.conf new file mode 100644 index 0000000..72e9a3d --- /dev/null +++ b/stow/hyprland/.config/hypr/modes.conf @@ -0,0 +1,38 @@ +# System actions +$mode_system = System (l)ock, (s)leep, (h)ibernate, (r)eboot, (Shift+s)hutdown +bind = Ctrl+Alt, Delete, submap, $mode_system +submap = $mode_system + +bind = , l, exec, $lock +bind = , l, submap, reset +bind = , s, exec, $lock, exec, systemctl suspend +bind = , s, submap, reset +bind = , h, exec, $lock, exec, systemctl hibernate +bind = , h, submap, reset +bind = , r, exec, systemctl reboot +bind = Shift, s, exec, systemctl poweroff -i + +bind = Ctrl+Alt, Delete, submap, reset +bind = , Escape, submap, reset +bind = , Return, submap, reset + +submap = reset + +# Launcher +$mode_launcher = Launch (f)irefox, (t)hunderbird. +bind = $flag, O, submap, $mode_launcher +submap = $mode_launcher + +bind = , F, exec, firefox +bind = , F, submap, reset +bind = , T, exec, thunderbird +bind = , T, submap, reset +bind = , Z, exec, zen +bind = , Z, submap, reset + +bind = $flag, O, submap, reset +bind = , Escape, submap, reset +bind = , Return, submap, reset + +submap = reset + diff --git a/stow/waybar/.config/waybar/config.jsonc b/stow/waybar/.config/waybar/config.jsonc index 2a4f8a4..ff861e3 100644 --- a/stow/waybar/.config/waybar/config.jsonc +++ b/stow/waybar/.config/waybar/config.jsonc @@ -40,11 +40,14 @@ "sway/window", "group/workspaces", "custom/scratchpad-indicator", + "group/mode" ], "modules-center": [ "mpris" ], "modules-right": [ + "keyboard-state#numlock", + "keyboard-state#capslock", "privacy", "tray", "group/control-center", From e6b51a7fea50147a6148e31a7b237464ceeca943 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Tue, 30 Sep 2025 09:30:27 +0200 Subject: [PATCH 2/4] [fprintd] Add fingerprint-scanner module --- nixos/flake.nix | 1 + nixos/hosts/Tibo-NixTop/default.nix | 1 + nixos/modules/hardware/default.nix | 1 + .../hardware/fingerprint-scanner/default.nix | 30 +++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 nixos/modules/hardware/fingerprint-scanner/default.nix diff --git a/nixos/flake.nix b/nixos/flake.nix index 60e1025..fa8b125 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -46,6 +46,7 @@ "steam" "steam-unwrapped" "steam-run" "vista-fonts" "intel-ocl" + "libfprint-2-tod1-broadcom" ]; in utils.lib.mkFlake { diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix index 5de8df4..9993e07 100644 --- a/nixos/hosts/Tibo-NixTop/default.nix +++ b/nixos/hosts/Tibo-NixTop/default.nix @@ -15,6 +15,7 @@ hardware = { eid.enable = true; + fingerprint-scanner.enable = true; nvidia = { enable = true; model = "Quadro T2000"; diff --git a/nixos/modules/hardware/default.nix b/nixos/modules/hardware/default.nix index 2d38b1e..238bcea 100644 --- a/nixos/modules/hardware/default.nix +++ b/nixos/modules/hardware/default.nix @@ -1,6 +1,7 @@ { imports = [ ./eid + ./fingerprint-scanner ./nvidia ./yubikey ]; diff --git a/nixos/modules/hardware/fingerprint-scanner/default.nix b/nixos/modules/hardware/fingerprint-scanner/default.nix new file mode 100644 index 0000000..b7580c6 --- /dev/null +++ b/nixos/modules/hardware/fingerprint-scanner/default.nix @@ -0,0 +1,30 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.sisyphus.hardware.fingerprint-scanner; +in { + options.sisyphus.hardware.fingerprint-scanner.enable = lib.mkEnableOption "Fingerprint scanner support"; + + config = lib.mkIf cfg.enable { + # Enable driver + services.fprintd = { + enable = true; + + # Enable Touch OEM Drivers library support + tod = { + enable = true; + # Dell drivers + driver = pkgs.libfprint-2-tod1-broadcom; + }; + }; + + # Start driver at boot + systemd.services.fprintd = { + wantedBy = [ + "multi-user.target" + ]; + serviceConfig.Type = "simple"; + }; + }; +} + From 07ad0279bb5838c9e655a0b567c95cf1527ff71c Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Tue, 30 Sep 2025 09:31:16 +0200 Subject: [PATCH 3/4] [Tibo-NixTop] Tweak boot --- nixos/hosts/Tibo-NixTop/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/nixos/hosts/Tibo-NixTop/default.nix b/nixos/hosts/Tibo-NixTop/default.nix index 9993e07..7431ae5 100644 --- a/nixos/hosts/Tibo-NixTop/default.nix +++ b/nixos/hosts/Tibo-NixTop/default.nix @@ -74,12 +74,19 @@ loader = { # Use the systemd-boot EFI boot loader. - systemd-boot.enable = true; + systemd-boot = { + enable = true; + + editor = false; + memtest86.enable = true; + }; efi.canTouchEfiVariables = true; }; # Use latest kernel. kernelPackages = pkgs.linuxPackages_latest; + + plymouth.enable = true; }; hardware.bluetooth = { @@ -117,6 +124,8 @@ power-profiles-daemon.enable = false; + smartd.enable = true; + thermald.enable = true; xserver = { From d6801e0679e31a2f7eabb867b26effec34ee6843 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Tue, 30 Sep 2025 09:31:53 +0200 Subject: [PATCH 4/4] [firefox] Fix rules --- nixos/users/tdpeuter/firefox.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/nixos/users/tdpeuter/firefox.nix b/nixos/users/tdpeuter/firefox.nix index 09cd1d6..626eecc 100644 --- a/nixos/users/tdpeuter/firefox.nix +++ b/nixos/users/tdpeuter/firefox.nix @@ -32,15 +32,19 @@ in { }; # Anything in about:config - Preferences = { - "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = { + Preferences = let + falseLocked = { Value = false; - Status = "locked"; + Status = "falseLocked"; }; + in { + "browser.newtabpage.activity-stream.showSponsoredCheckboxes" = falseLocked; + "browser.newtabpage.activity-stream.showSponsoredTopSites" = falseLocked; "browser.newtabpage.pinned" = { Value = "[]"; Status = "default"; }; + "services.sync.prefs.sync-seen.browser.newtabpage.activity-stream.showSponsoredTopSites" = falseLocked; }; };