feat: add formatter

system/modules/niri.nix

@@ -8,11 +8,8 @@ let
   inherit (lib)
     getExe
     pipe
-    map
-    listToAttrs
-    genList
     ;
-  inherit (builtins) fetchurl;
+  inherit (builtins) fetchurl genList listToAttrs;
   inherit (config.systemConf) username;
 
   # nvidia-offload-enabled = config.hardware.nvidia.prime.offload.enableOffloadCmd;
@@ -20,8 +17,8 @@ let
   terminal = "ghostty";
   browser = "zen-twilight";
 
-  brightnessStep = builtins.toString 10;
-  volumeStep = builtins.toString 4;
+  brightnessStep = toString 10;
+  volumeStep = toString 4;
 
   execOnceScript = pkgs.writeShellScript "startupExec" ''
     # Fix nemo open in terminal
@@ -163,7 +160,10 @@ in
         ];
 
         input = {
-          focus-follows-mouse.enable = true;
+          focus-follows-mouse = {
+            max-scroll-amount = "90%";
+            enable = true;
+          };
           mouse.accel-speed = -0.1;
           keyboard = {
             repeat-delay = 250;
@@ -226,11 +226,11 @@ in
             "Mod+WheelScrollLeft".action = focus-column-left;
 
             # Touchpad
-            "TouchpadScrollDown" = {
+            "Mod+TouchpadScrollDown" = {
               cooldown-ms = 150;
               action = focus-window-or-workspace-down;
             };
-            "TouchpadScrollUp" = {
+            "Mod+TouchpadScrollUp" = {
               cooldown-ms = 150;
               action = focus-window-or-workspace-up;
             };

system/modules/services.nix

@@ -32,13 +32,5 @@ in
         PermitRootLogin = lib.mkDefault "no";
       };
     };
-
-    xserver = {
-      enable = false;
-      xkb = {
-        layout = "us";
-        options = "caps:swapescape";
-      };
-    };
   };
 }

system/modules/tmux.nix

@@ -2,7 +2,8 @@
   pkgs,
   config,
   ...
-}: let
+}:
+let
   getIconScript = pkgs.writeShellScript "get-icon" ''
     get_icons() {
       local session_name="$1"
@@ -30,7 +31,8 @@
 
   prefixKey = "C-Space";
   tmuxConfigPath = "/etc/tmux.conf";
-in {
+in
+{
   environment = {
     variables = {
       TMUXINATOR_CONFIG = "/etc/tmuxinator";

system/modules/vaultwarden.nix

@@ -1,6 +1,12 @@
 { domain }:
 { config, ... }:
+let
+  inherit (config.sops) secrets;
+  cfg = config.services.vaultwarden;
+in
 {
+  sops.secrets."vaultwarden" = { };
+
   services.postgresql = {
     enable = true;
     ensureUsers = [
@@ -17,7 +23,7 @@
   services.vaultwarden = {
     enable = true;
     dbBackend = "postgresql";
-    environmentFile = config.sops.secrets.vaultwarden.path;
+    environmentFile = secrets.vaultwarden.path;
     config = {
       DOMAIN = "https://${domain}";
       SIGNUPS_ALLOWED = true;
@@ -26,6 +32,11 @@
       ROCKET_ADDRESS = "127.0.0.1";
       ROCKET_LOG = "critical";
 
+      SSO_ENABLED = true;
+      SSO_ONLY = true;
+      SSO_SIGNUPS_MATCH_EMAIL = true;
+      SSO_AUTH_ONLY_NOT_SESSION = true;
+
       DATABASE_URL = "postgresql:///vaultwarden";
     };
   };
@@ -34,7 +45,7 @@
     enableACME = true;
     forceSSL = true;
     locations."/" = {
-      proxyPass = "http://127.0.0.1:${toString config.services.vaultwarden.config.ROCKET_PORT}/";
+      proxyPass = "http://127.0.0.1:${toString cfg.config.ROCKET_PORT}/";
       proxyWebsockets = true;
     };
   };