From b52403008908434dfd42f91810348f1ff5cce0fa Mon Sep 17 00:00:00 2001 From: Jurn Wubben Date: Sun, 22 Jun 2025 23:05:42 +0200 Subject: [PATCH] Fixed plasma6; added kodi; added wluma; commented out printing; moved fingerprint shit --- home/programs/default.nix | 1 + home/programs/kodi.nix | 5 +++ hosts/laptop/default.nix | 66 +++++++++++++++++++++++++-------- system/desktop/greetd.nix | 10 ++--- system/desktop/plasma6.nix | 32 +++++++--------- system/hardware/fingerprint.nix | 10 ++++- 6 files changed, 83 insertions(+), 41 deletions(-) create mode 100644 home/programs/kodi.nix diff --git a/home/programs/default.nix b/home/programs/default.nix index 0ca7760..b0b0cec 100644 --- a/home/programs/default.nix +++ b/home/programs/default.nix @@ -5,6 +5,7 @@ ./mpv.nix ./neovim.nix ./nixcord.nix + ./kodi.nix ./other.nix ]; } diff --git a/home/programs/kodi.nix b/home/programs/kodi.nix new file mode 100644 index 0000000..b956d0c --- /dev/null +++ b/home/programs/kodi.nix @@ -0,0 +1,5 @@ +{pkgs, ...}: { + home.packages = [ + (pkgs.kodi-wayland.withPackages (exts: [exts.inputstream-adaptive exts.inputstreamhelper])) + ]; +} diff --git a/hosts/laptop/default.nix b/hosts/laptop/default.nix index 9028eee..ce6e8ab 100644 --- a/hosts/laptop/default.nix +++ b/hosts/laptop/default.nix @@ -1,17 +1,26 @@ { - pkgs, - lib, - inputs, - ... -}: let - uwsm = lib.getExe pkgs.uwsm; - foot = lib.getExe pkgs.foot; -in { imports = [ ./hardware-configuration.nix ./virt.nix ]; + # services.printing = { + # enable = true; + # startWhenNeeded = true; + # }; + # hardware.printers = { + # ensureDefaultPrinter = "Broeder"; + # ensurePrinters = [ + # { + # deviceUri = "ipp://192.168.1.33/ipp"; + # location = "home"; + # name = "Broeder"; + # model = "everywhere"; + # } + # ]; + # }; + + programs.evolution.enable = true; # FIXME: move to appropiate place. niksos = { fingerprint = true; bluetooth = true; @@ -22,24 +31,51 @@ in { desktop = { enable = true; hyprland = true; - kde = false; + kde = true; }; }; - home-manager.users.jsw.wayland.windowManager.hyprland.settings.monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"]; + home-manager.users.jsw = { + wayland.windowManager.hyprland.settings.monitor = ["eDP-1,2880x1920@120,0x0,1.5,vrr,1"]; + services.wluma = { + enable = true; + settings = { + als.iio = { + path = "/sys/bus/iio/devices"; + thresholds = { + "0" = "night"; + "10" = "dark"; + "100" = "normal"; + "20" = "dim"; + "200" = "bright"; + "500" = "outdoors"; + }; + }; + output.backlight = [ + { + capturer = "none"; + name = "eDP-1"; + path = "/sys/class/backlight/amdgpu_bl1"; + } + { + capturer = "none"; + name = "keyboard"; + path = "/sys/bus/platform/devices/cros-keyboard-leds.5.auto/leds/chromeos::kbd_backlight"; + } + ]; + }; + }; + }; + hardware.sensor.iio.enable = true; # brightness sensor services = { usbmuxd.enable = true; joycond.enable = true; + udev.extraRules = '' # Ethernet expansion card support ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0bda", ATTR{idProduct}=="8156", ATTR{power/autosuspend}="20" ''; - logind.extraConfig = '' - # don’t shutdown when power button is short-pressed - HandlePowerKey=ignore - ''; }; - hardware.sensor.iio.enable = true; # brightness sensor boot.kernelParams = [ # There seems to be an issue with panel self-refresh (PSR) that diff --git a/system/desktop/greetd.nix b/system/desktop/greetd.nix index 1350659..e04d0cb 100644 --- a/system/desktop/greetd.nix +++ b/system/desktop/greetd.nix @@ -2,14 +2,12 @@ config, lib, ... -}: let - cfg = config.niksos.desktop.enable && config.niksos.desktop.hyprland; -in { - config = lib.mkIf cfg { +}: { + config = lib.mkIf config.niksos.desktop.enable { # greetd display manager services.greetd = let session = { - command = "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; + command = lib.mkDefault "${lib.getExe config.programs.uwsm.package} start hyprland-uwsm.desktop"; user = "jsw"; }; in { @@ -22,6 +20,6 @@ in { }; }; - programs.uwsm.enable = true; + programs.uwsm.enable = lib.mkDefault true; }; } diff --git a/system/desktop/plasma6.nix b/system/desktop/plasma6.nix index 8f36529..6801ee3 100644 --- a/system/desktop/plasma6.nix +++ b/system/desktop/plasma6.nix @@ -6,28 +6,24 @@ }: let cfg = config.niksos.desktop.enable && config.niksos.desktop.kde; in { - config = lib.mkIf cfg { + specialisation.de.configuration = lib.mkIf cfg { niksos.desktop.hyprland = lib.mkForce false; - specialisation.de.configuration = { - services = { - greetd = let - session = { - command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland"; - user = "jsw"; - }; - in { - enable = true; - settings = { - terminal.vt = 1; - default_session = session; - initial_session = session; - }; + services = { + greetd = let + session.command = "${pkgs.kdePackages.plasma-workspace}/bin/startplasma-wayland"; + in { + enable = true; + settings = { + terminal.vt = 1; + default_session = session; + initial_session = session; }; - - desktopManager.plasma6.enable = true; }; - home-manager.users.jsw.stylix.autoEnable = false; + desktopManager.plasma6.enable = true; }; + programs.uwsm.enable = false; + + home-manager.users.jsw.stylix.autoEnable = false; }; } diff --git a/system/hardware/fingerprint.nix b/system/hardware/fingerprint.nix index 69b18ed..f3a16fc 100644 --- a/system/hardware/fingerprint.nix +++ b/system/hardware/fingerprint.nix @@ -11,10 +11,16 @@ in { options.niksos.fingerprint = mkEnableOption "fingerprint support."; config = mkIf fingerprint { - services.fprintd.enable = true; + services = { + fprintd.enable = true; + logind.extraConfig = mkIf desktop.hyprland '' + # don’t shutdown when power button is short-pressed + HandlePowerKey=ignore + ''; + }; home-manager.users.jsw.wayland.windowManager.hyprland.settings = mkIf desktop.hyprland { - bind = mkIf fingerprint [ + bind = [ ", XF86PowerOff, exec, ${uwsm} app -- pgrep fprintd-verify && exit 0 || ${foot} -a 'foot-fprintd' sh -c 'fprintd-verify && systemctl sleep'" ]; windowrule = [