From bbaee7acd8a7c2934f27fa4c4e0a16b055319a0d Mon Sep 17 00:00:00 2001
From: Swarsel <leon.schwarzaeugl@gmail.com>
Date: Sat, 10 Aug 2024 16:45:55 +0200
Subject: [PATCH] feat: increase system security

---
 SwarselSystems.org                 | 22 +++++++++++++++++-----
 profiles/common/nixos/default.nix  | 27 +++++++++++++++++++++++++--
 profiles/common/nixos/packages.nix |  3 +++
 profiles/common/nixos/polkit.nix   |  8 ++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/SwarselSystems.org b/SwarselSystems.org
index 5d72a9a..aae7b71 100644
--- a/SwarselSystems.org
+++ b/SwarselSystems.org
@@ -4932,7 +4932,7 @@ First, we enable the use of =home-manager= as a NixoS module
 
 #+begin_src nix :tangle profiles/common/nixos/default.nix
 
-  { lib, ... }:
+  { lib, inputs, ... }:
   {
     imports = [
       ./xserver.nix
@@ -5065,7 +5065,7 @@ Next, we will setup some environment variables that need to be set on the system
   }
 #+end_src
 
-**** Enable PolicyKit
+**** Security
 :PROPERTIES:
 :CUSTOM_ID: h:e2d40df9-0026-4caa-8476-9dc2353055a1
 :END:
@@ -5075,7 +5075,15 @@ Needed for control over system-wide privileges etc.
 #+begin_src nix :tangle profiles/common/nixos/polkit.nix
   _ :
   {
+
+    security.pam.services = {
+      login.u2fAuth = true;
+      sudo.u2fAuth = true;
+      swaylock.u2fAuth = true;
+      swaylock.fprintAuth = false;
+    };
     security.polkit.enable = true;
+
   }
 #+end_src
 
@@ -5557,6 +5565,7 @@ Mostly used to install some compilers and lsp's that I want to have available wh
       yubioath-flutter
       yubikey-manager
       yubikey-manager-qt
+      yubikey-touch-detector
       yubico-piv-tool
       cfssl
       pcsctools
@@ -8226,23 +8235,26 @@ Currently, I am too lazy to explain every option here, but most of it is very se
         in
         "
           exec_always autotiling
-          set $exit \"exit: [s]leep, [p]oweroff, [r]eboot, [l]ogout\"
+          set $exit \"exit: [s]leep, [l]ock, [p]oweroff, [r]eboot, [u]ser logout\"
           mode $exit {
 
               bindsym --to-code {
                   s exec \"systemctl suspend\", mode \"default\"
+                  l exec \"swaylock --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2 --daemonize && systemctl suspend \", mode \"default \"
                   p exec \"systemctl poweroff\"
                   r exec \"systemctl reboot\"
-                  l exec \"swaymsg exit\"
+                  u exec \"swaymsg exit\"
 
                   Return mode \"default\"
                   Escape mode \"default\"
-                  ${modifier}+x mode \"default\"
+                  ${modifier}+Escape mode \"default\"
               }
           }
 
           exec systemctl --user import-environment
 
+
+
           ${swayfxSettings}
 
           ";
diff --git a/profiles/common/nixos/default.nix b/profiles/common/nixos/default.nix
index 7a3b913..62b7128 100644
--- a/profiles/common/nixos/default.nix
+++ b/profiles/common/nixos/default.nix
@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, inputs, ... }:
 {
   imports = [
     ./xserver.nix
@@ -12,12 +12,14 @@
     ./network.nix
     ./time.nix
     ./hardware.nix
+    ./pipewire.nix
     ./sops.nix
     ./packages.nix
     ./programs.nix
     ./zsh.nix
     ./syncthing.nix
     ./blueman.nix
+    ./safeeyes.nix
     ./networkdevices.nix
     ./gvfs.nix
     ./interceptiontools.nix
@@ -26,11 +28,32 @@
     ./stylix.nix
     ./power-profiles-daemon.nix
     # ./impermanence.nix
+    ./nvd-rebuild.nix
     ./nix-ld.nix
     ./gnome-keyring.nix
+    ./sway.nix
+    ./xdg-portal.nix
   ];
 
-  nix.settings.trusted-users = [ "swarsel" ];
+  nix =
+    let
+      flakeInputs = lib.filterAttrs (_: lib.isType "flake") inputs;
+    in
+    {
+      settings = {
+        experimental-features = [
+          "nix-command"
+          "flakes"
+          "ca-derivations"
+        ];
+        trusted-users = [ "swarsel" ];
+        flake-registry = "";
+        warn-dirty = false;
+      };
+      channel.enable = false;
+      registry = lib.mapAttrs (_: flake: { inherit flake; }) flakeInputs;
+      nixPath = lib.mapAttrsToList (n: _: "${n}=flake:${n}") flakeInputs;
+    };
 
   home-manager = {
     useGlobalPkgs = true;
diff --git a/profiles/common/nixos/packages.nix b/profiles/common/nixos/packages.nix
index 7e5e214..e9298e9 100644
--- a/profiles/common/nixos/packages.nix
+++ b/profiles/common/nixos/packages.nix
@@ -9,6 +9,7 @@
     yubioath-flutter
     yubikey-manager
     yubikey-manager-qt
+    yubikey-touch-detector
     yubico-piv-tool
     cfssl
     pcsctools
@@ -18,6 +19,8 @@
     ledger-live-desktop
 
     # pinentry
+    dbus
+    swaylock-effects
 
     # secure boot
     sbctl
diff --git a/profiles/common/nixos/polkit.nix b/profiles/common/nixos/polkit.nix
index 8da1bae..e2448bc 100644
--- a/profiles/common/nixos/polkit.nix
+++ b/profiles/common/nixos/polkit.nix
@@ -1,4 +1,12 @@
 _:
 {
+
+  security.pam.services = {
+    login.u2fAuth = true;
+    sudo.u2fAuth = true;
+    swaylock.u2fAuth = true;
+    swaylock.fprintAuth = false;
+  };
   security.polkit.enable = true;
+
 }