From 5f01f22088e9b7433c27f6946f0a8c2f7e25c7ee Mon Sep 17 00:00:00 2001 From: ediblerope Date: Fri, 15 May 2026 12:17:12 +0100 Subject: [PATCH] --- common.nix | 2 +- hosts/FredOS-Macbook.nix | 6 +++--- settings/hyprland.nix | 6 ++++++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common.nix b/common.nix index 6ea4d89..cfa5499 100644 --- a/common.nix +++ b/common.nix @@ -87,7 +87,7 @@ # Shell aliases (work in both bash and fish) environment.shellAliases = { - update = "bash -c 'set -o pipefail && OLD_SYSTEM=$(readlink /run/current-system) && sudo nixos-rebuild switch $@ --impure --flake git+https://forg.gregersen.it/rope/nixos -L --log-format internal-json 2>&1 | nom --json && nvd diff $OLD_SYSTEM /run/current-system && (command -v record-update &>/dev/null && record-update $OLD_SYSTEM /run/current-system || true)' --"; + update = "bash -c 'set -o pipefail && OLD_SYSTEM=$(readlink /run/current-system) && sudo nixos-rebuild switch $@ --impure --refresh --flake git+https://forg.gregersen.it/rope/nixos -L --log-format internal-json 2>&1 | nom --json && nvd diff $OLD_SYSTEM /run/current-system && (command -v record-update &>/dev/null && record-update $OLD_SYSTEM /run/current-system || true)' --"; clean = "sudo nix-collect-garbage -d"; ll = "ls -alh"; clear = "command clear"; diff --git a/hosts/FredOS-Macbook.nix b/hosts/FredOS-Macbook.nix index 809986b..f17f628 100644 --- a/hosts/FredOS-Macbook.nix +++ b/hosts/FredOS-Macbook.nix @@ -21,9 +21,9 @@ boot.loader.systemd-boot.configurationLimit = 5; boot.initrd.systemd.enable = true; - services.logind = { - lidSwitch = "suspend"; - lidSwitchExternalPower = "suspend"; + services.logind.settings.Login = { + HandleLidSwitch = "suspend"; + HandleLidSwitchExternalPower = "suspend"; }; home-manager.users.fred = { ... }: { diff --git a/settings/hyprland.nix b/settings/hyprland.nix index 550b15c..c202b63 100644 --- a/settings/hyprland.nix +++ b/settings/hyprland.nix @@ -179,6 +179,12 @@ in follow_mouse = 1; accel_profile = "flat"; sensitivity = 0; + } // lib.optionalAttrs isMacbook { + touchpad = { + tap-to-click = true; + tap_button_map = "lrm"; # 1-finger=left, 2-finger=right, 3-finger=middle + natural_scroll = true; + }; }; cursor = {