added fprint support, downgraded vr version

9 files changed, 93 insertions, 73 deletions

diff --git a/flake.lock b/flake.lock
index 5fbc73f..278e318 100644
--- a/flake.lock
+++ b/flake.lock
@@ -159,11 +159,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773360308,
-        "narHash": "sha256-Asr6gDwzxvcglRaXEZSTL4lEA6braemURJc6wKBhKrs=",
+        "lastModified": 1773446705,
+        "narHash": "sha256-IBAHAaYfiR9fhR+y6ZUdM697dht26tvrWeIrTLwBs3E=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "b550599eedc54514f5b71cee8e480e337d104d84",
+        "rev": "49ff0692b00466bee56c3c72e91e4d0b8342a93b",
         "type": "github"
       },
       "original": {
@@ -175,11 +175,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1773359104,
-        "narHash": "sha256-vWu0zLThxpsx6vbPK5eAgvkMKu1LV8tbybS/sjWn8S8=",
+        "lastModified": 1773431856,
+        "narHash": "sha256-Oj4HMwF261bJCS/zqgmqdxoCBSeEjwghxW+1MA9Ktik=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "957eb1fde04496b4a2c07fd8427a8d78844d1bf7",
+        "rev": "fd1e019e90e76bb3f6236210ac6287f3b8d4d47f",
         "type": "github"
       },
       "original": {
@@ -200,11 +200,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1773433102,
-        "narHash": "sha256-0q2Uz4oNTX0+dIpN3zV2HLMHI8NOoRDwScatBS1v8ng=",
+        "lastModified": 1773501701,
+        "narHash": "sha256-+0LBAEm8F5h9Nm+hdS07aoS1W4oTtW6c8lltb66oOYQ=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "20f866c7416799ebf5b88b07c9d32c6a440e825d",
+        "rev": "39ac039250a4a32bf8691405cac04864fc66a70d",
         "type": "github"
       },
       "original": {
@@ -256,11 +256,11 @@
         "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1773426551,
-        "narHash": "sha256-xkdf5jU1HDphAFy89WQsyStYdq0EjRsYCYsz5IrDEjo=",
+        "lastModified": 1773449015,
+        "narHash": "sha256-7Q4MsuktyGzRC5B+RuTITnZaDT5JqUq19P7wNFL+7ac=",
         "owner": "KaylorBen",
         "repo": "nixcord",
-        "rev": "efe6a34e34d5ab0983d26ca290e5e0dba6e1abd1",
+        "rev": "3e0fc6c4baba8d1a63e11a6d8977a0f92c859801",
         "type": "github"
       },
       "original": {
@@ -287,11 +287,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1773282481,
-        "narHash": "sha256-b/GV2ysM8mKHhinse2wz+uP37epUrSE+sAKXy/xvBY4=",
+        "lastModified": 1773389992,
+        "narHash": "sha256-wvfdLLWJ2I9oEpDd9PfMA8osfIZicoQ5MT1jIwNs9Tk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fe416aaedd397cacb33a610b33d60ff2b431b127",
+        "rev": "c06b4ae3d6599a672a6210b7021d699c351eebda",
         "type": "github"
       },
       "original": {
@@ -590,11 +590,11 @@
     "xwayland-satellite-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1772429643,
-        "narHash": "sha256-M+bAeCCcjBnVk6w/4dIVvXvpJwOKnXjwi/lDbaN6Yws=",
+        "lastModified": 1773499041,
+        "narHash": "sha256-XZ4/tVdLeAYDgKe4JD4C7yYUKydMxwt8c2j6APFWcIc=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "10f985b84cdbcc3bbf35b3e7e43d1b2a84fa9ce2",
+        "rev": "309d8e2a29953f7465dc14c939e2afe4682c0aa9",
         "type": "github"
       },
       "original": {
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index ff8353e..27eb583 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -9,7 +9,8 @@ with config.lib.niri.actions;
 let
   playerctl = spawn "${pkgs.playerctl}/bin/playerctl";
   ssPath = "${toString config.hm.conf.xdg-dirs.storagePath}/pics/ss/$(date +%Y-%m-%d_%H-%M-%S)";
-  obsPass = osConfig.sops.secrets."obs/websocket_password".path;
+  obsEnabled = config.hm.soft.obs.enable or false;
+  obsPass = if obsEnabled then osConfig.sops.secrets."obs/websocket_password".path else "";
 in
 {
   # --- System & Media ---
@@ -17,8 +18,11 @@ in
   "Mod+Slash".action = show-hotkey-overlay;
 
   # Audio (System-wide via wireplumber)
-  XF86AudioRaiseVolume.action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "3%+";
-  XF86AudioLowerVolume.action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "3%-";
+  XF86AudioRaiseVolume.action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "2%+";
+  XF86AudioLowerVolume.action = spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "2%-";
+  XF86AudioMicMute.action =
+    spawn "sh" "-c"
+      "wpctlwpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && toggle-mute-notify";
   XF86AudioMute.action =
     spawn "sh" "-c"
       "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle && wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && toggle-mute-notify";
@@ -36,7 +40,6 @@ in
   "Mod+Return".action = spawn "footclient";
   "Mod+D".action = spawn "fuzzel";
   "Mod+Shift+D".action = spawn "sh" "-c" "cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
-  "Super+Return".action = spawn "sh" "-c" "OBS_WEBSOCKET_URL=$(cat ${obsPass}) obs-cmd replay save";
 
   "Super+C".action = spawn "qalculate-gtk";
   "Super+D".action = spawn "equibop";
@@ -52,8 +55,8 @@ in
 
   "Super+H".action = focus-monitor-left;
   "Super+L".action = focus-monitor-right;
-  "Super+Shift+H".action = move-column-left-or-to-monitor-left;
-  "Super+Shift+L".action = move-column-right-or-to-monitor-right;
+  "Super+Shift+H".action = move-column-to-monitor-left;
+  "Super+Shift+L".action = move-column-to-monitor-right;
 
   "Mod+WheelScrollDown".action = focus-column-right;
   "Mod+WheelScrollUp".action = focus-column-left;
@@ -71,6 +74,7 @@ in
     action = spawn "sh" "-c" "wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && toggle-mute-notify";
     repeat = false;
   };
+
   "Mod+XF86Tools" = {
     action =
       spawn "sh" "-c"
@@ -146,7 +150,11 @@ in
 
   "Mod+grave".action.focus-workspace = 0;
   "Mod+Shift+grave".action.move-column-to-workspace = 0;
+
 }
+// (lib.optionalAttrs obsEnabled {
+  "Super+Return".action = spawn "sh" "-c" "OBS_WEBSOCKET_URL=$(cat ${obsPass}) obs-cmd replay save";
+})
 // (builtins.listToAttrs (
   builtins.concatMap (
     keyNum:
diff --git a/hm/soft/browser.nix b/hm/soft/browser.nix
index a9a2f1b..dd8f129 100644
--- a/hm/soft/browser.nix
+++ b/hm/soft/browser.nix
@@ -3,9 +3,11 @@
   lib,
   pkgs,
   ...
-}: let
+}:
+let
   cfg = config.hm.soft.browser;
-in {
+in
+{
   options.hm.soft.browser = {
     librewolf.enable = lib.mkEnableOption "LibreWolf browser";
     brave.enable = lib.mkEnableOption "Brave browser";
@@ -14,23 +16,12 @@ in {
     (lib.mkIf cfg.librewolf.enable {
       programs.librewolf = {
         enable = true;
-        settings = {
-          "ui.key.menuAccessKeyFocuses" = false;
-          "browser.search.update" = false;
-          "browser.formfill.enable" = false;
-          "browser.search.suggest.enabled" = false;
-          "signon.rememberSignons" = false;
-          "browser.urlbar.showSearchTerms.featureGate" = false;
-          "browser.toolbars.bookmarks.visibility" = "always";
-
-          # "privacy.clearOnShutdown.cookies" = true;
-          # "privacy.clearOnShutdown.cache" = true;
-        };
+        settings."ui.key.menuAccessKeyFocuses" = false;
       };
     })
 
     (lib.mkIf cfg.brave.enable {
-      home.packages = [pkgs.brave];
+      home.packages = [ pkgs.brave ];
     })
   ];
 }
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index a929b2e..a6b4217 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -17,6 +17,7 @@ in
       stoat-desktop
       element-desktop
       gajim
+      equibop
     ];
     programs.nixcord = {
       enable = true;
@@ -25,12 +26,12 @@ in
         autoscroll.enable = true;
 
         vencord.enable = false;
-        # equicord.enable = true;
-      };
-      equibop = {
-        enable = true;
-        autoscroll.enable = true;
+        equicord.enable = true;
       };
+      # equibop = {
+      #   enable = true;
+      #   autoscroll.enable = true;
+      # };
       config = {
         themeLinks = [ "https://raw.codeberg.page/AllPurposeMat/Disblock-Origin/DisblockOrigin.theme.css" ];
         frameless = true;
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index c0d7cfa..94672aa 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -39,8 +39,6 @@
           enable = true;
           amdgpu.enable = true;
         };
-        # kernel = "unstable";
-        kernel = "stable";
       };
       fonts.enable = true;
       greet.enable = true;
@@ -73,10 +71,7 @@
         steam.enable = true;
         vr.enable = true;
       };
-      virtualization = {
-        kvm.enable = true;
-        waydroid.enable = true;
-      };
+      virtualization.kvm.enable = true;
       kdeconnect.enable = true;
       nix-helper.enable = true;
       ollama.enable = true;
@@ -90,23 +85,11 @@
       niri.enable = true;
     };
   };
-
   services.hardware.openrgb = {
     enable = true;
     motherboard = "amd";
     package = pkgs.openrgb-with-all-plugins;
   };
-  systemd.user.services.polkit-gnome-authentication-agent-1 = {
-    description = "polkit-gnome-authentication-agent-1";
-    wantedBy = [ "graphical-session.target" ]; # No 'Install' block, lowercase 'w'
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.polkit_gnome}/libexec/polkit-gnome-authentication-agent-1";
-      Restart = "on-failure";
-      RestartSec = 1;
-      TimeoutStopSec = 10;
-    };
-  };
 
   boot = {
     kernelModules = [
diff --git a/hosts/desktop/disko.nix b/hosts/desktop/disko.nix
index d9be765..5b3b626 100644
--- a/hosts/desktop/disko.nix
+++ b/hosts/desktop/disko.nix
@@ -22,6 +22,10 @@
               content = {
                 type = "luks";
                 name = "crypted_main";
+                extraFormatArgs = [
+                  "--type luks2"
+                  "--pbkdf argon2id"
+                ];
                 settings.allowDiscards = true;
                 content = {
                   type = "btrfs";
@@ -123,7 +127,10 @@
               content = {
                 type = "luks";
                 name = "crypted_storage";
-                keyFile = "/tmp/crypt.key";
+                extraFormatArgs = [
+                  "--type luks2"
+                  "--pbkdf argon2id"
+                ];
                 content = {
                   type = "btrfs";
                   extraArgs = [ "-f" ];
diff --git a/os/core/drivers.nix b/os/core/drivers.nix
index 77ea721..4198bf5 100644
--- a/os/core/drivers.nix
+++ b/os/core/drivers.nix
@@ -62,9 +62,6 @@ in
         hardware.graphics = {
           enable = true;
           enable32Bit = true;
-          extraPackages = with pkgs; [
-            libva
-          ];
         };
         hardware.sensor.iio.enable = true;
       })
@@ -77,8 +74,6 @@ in
         };
         hardware.graphics.extraPackages = with pkgs; [
           rocmPackages.clr.icd
-          libva
-          libva-utils
         ];
       })
       {
diff --git a/os/core/security.nix b/os/core/security.nix
index afd2b2a..fa40372 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -9,9 +9,22 @@ let
   cfg = config.os.core.security;
 in
 {
-  options.os.core.security.enable = lib.mkEnableOption "core security services";
+  options.os.core.security = {
+    enable = lib.mkEnableOption "core security services";
+    fprint.enable = lib.mkEnableOption "enables fingerprint authentication";
+  };
   config = lib.mkIf cfg.enable {
-    services.gnome.gnome-keyring.enable = true;
+    services = {
+      gnome.gnome-keyring.enable = true;
+      fprintd = lib.mkIf cfg.fprint.enable {
+        enable = true;
+        package = pkgs.fprintd-tod;
+        tod = {
+          enable = true;
+          driver = pkgs.libfprint-2-tod1-vfs0090;
+        };
+      };
+    };
 
     security = {
       doas = {
@@ -24,10 +37,15 @@ in
           }
         ];
       };
-      # sudo.enable = false;
+      sudo.enable = false;
+
       pam.services = {
         swaylock = { };
-        login.enableGnomeKeyring = true;
+        doas.fprintAuth = cfg.fprint.enable;
+        login = {
+          enableGnomeKeyring = true;
+          fprintAuth = cfg.fprint.enable;
+        };
       };
       polkit.enable = true;
       rtkit.enable = true;
@@ -35,7 +53,6 @@ in
 
     environment.systemPackages = with pkgs; [
       doas-sudo-shim
-
       veracrypt
       bitwarden-desktop
       keepassxc
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 237098c..00e6228 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -85,6 +85,24 @@ in
       programs.alvr = {
         enable = true;
         openFirewall = true;
+        package = pkgs.alvr.overrideAttrs (
+          finalAttrs: prevAttrs: {
+            version = "20.13.0";
+
+            src = pkgs.fetchFromGitHub {
+              owner = "alvr-org";
+              repo = "ALVR";
+              tag = "v${finalAttrs.version}";
+              fetchSubmodules = true;
+              hash = "sha256-h7/fuuolxbNkjUbqXZ7NTb1AEaDMFaGv/S05faO2HIc=";
+            };
+
+            cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+              inherit (finalAttrs) src;
+              hash = "sha256-A0ADPMhsREH1C/xpSxW4W2u4ziDrKRrQyY5kBDn//gQ=";
+            };
+          }
+        );
       };
       environment.systemPackages = [ pkgs.android-tools ];
       users.users.${username}.extraGroups = [ "adbusers" ];