From 05af2601a033a6375755ddee5e4d9a7bb92e4d41 Mon Sep 17 00:00:00 2001 From: Andrea Ciceri Date: Mon, 3 Oct 2022 15:41:03 +0200 Subject: [PATCH] [WIP] Many things: - `gammastep` - `sudo` with fingerprints that fallbacks to normal password and works with `swaylock` --- hmModules/shell/default.nix | 2 +- hmModules/sway/default.nix | 4 ++++ hmModules/sway/gammastep.nix | 8 ++++++++ hosts/thinkpad/default.nix | 1 + modules/fprintd/default.nix | 12 ++++++++++++ modules/nix/default.nix | 2 +- 6 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 hmModules/sway/gammastep.nix create mode 100644 modules/fprintd/default.nix diff --git a/hmModules/shell/default.nix b/hmModules/shell/default.nix index 184647b..0098c53 100644 --- a/hmModules/shell/default.nix +++ b/hmModules/shell/default.nix @@ -33,8 +33,8 @@ plugins = [ { name = "nix-zsh-completions"; - src = pkgs.nix-zsh-completions; file = "share/zsh/plugins/nix/nix-zsh-completions.plugin.zsh"; + src = pkgs.nix-zsh-completions; } { name = "spaceship"; diff --git a/hmModules/sway/default.nix b/hmModules/sway/default.nix index 11f16c6..e63734a 100644 --- a/hmModules/sway/default.nix +++ b/hmModules/sway/default.nix @@ -5,6 +5,7 @@ }: { imports = [ ./waybar.nix + ./gammastep.nix ../foot ]; config = { @@ -26,6 +27,9 @@ }; }; + # TODO check if work (just wait?) + services.swayidle.enable = true; + wayland = { windowManager.sway = let modifier = "Mod4"; diff --git a/hmModules/sway/gammastep.nix b/hmModules/sway/gammastep.nix new file mode 100644 index 0000000..3ff4a04 --- /dev/null +++ b/hmModules/sway/gammastep.nix @@ -0,0 +1,8 @@ +{ + services.gammastep = { + enable = true; + latitude = "45.4"; + longitude = "9.1"; + tray = true; + }; +} diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index f2f4122..06bba23 100644 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -23,6 +23,7 @@ "bluetooth" "docker" "transmission" + "fprintd" ]; boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"]; diff --git a/modules/fprintd/default.nix b/modules/fprintd/default.nix new file mode 100644 index 0000000..7f1d495 --- /dev/null +++ b/modules/fprintd/default.nix @@ -0,0 +1,12 @@ +{pkgs, ...}: { + services.fprintd = { + enable = true; + }; + + security.polkit.enable = true; # TODO needed? + + security.pam.services.swaylock.text = '' + auth sufficient pam_unix.so try_first_pass likeauth nullok + auth sufficient pam_fprintd.so + ''; +} diff --git a/modules/nix/default.nix b/modules/nix/default.nix index a094a21..fc74066 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -20,7 +20,7 @@ substituters = [ "https://cache.iog.io" "https://mlabs.cachix.org" - "httos://aciceri-fleet.cachix.org" + "https://aciceri-fleet.cachix.org" ]; };