flake updates

11 files changed, 102 insertions, 84 deletions

diff --git a/flake.lock b/flake.lock
index 559f44a..fff0ef0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -311,11 +311,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1773964968,
-        "narHash": "sha256-/vojK9noVTM+aWl+gX/vFjREtYcp0TGflBmQ1B4oIIk=",
+        "lastModified": 1774357140,
+        "narHash": "sha256-Bg5VVybYUvLK44FjgjcOaYQ578fHPsFwfN5Y4I9M4Lo=",
         "owner": "Mjoyufull",
         "repo": "fsel",
-        "rev": "c8f9b8080b2ea87d2c0fa6ea4d2bd6b96c154f38",
+        "rev": "8daa931b565bdebd07e363b7ded3ed05c8dd632a",
         "type": "github"
       },
       "original": {
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774274572,
-        "narHash": "sha256-YtpNRYSv0CQn+MjhHHqFcIR5L0Urex2tTwS42kP6nuc=",
+        "lastModified": 1774561634,
+        "narHash": "sha256-3q1xsREjqdVIIwQQDZQ9y0YdBzP8gAxdwKoKnZSzJtU=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "90913f831383a599c556cba59eac8cae9b5195a9",
+        "rev": "7c046c63ac3b467c1d589b99d531da5b6520825a",
         "type": "github"
       },
       "original": {
@@ -453,11 +453,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774224385,
-        "narHash": "sha256-VQPMdAUOhDqb6AUAn6oQYPvU2DVGHIc3iRdAHlDhSHQ=",
+        "lastModified": 1774483626,
+        "narHash": "sha256-8VAX9GXNfv4eBj0qBEf/Rc2/E6G0SBEpuo2A5plw34I=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "701c0a6174fde5de4b9424c0d1e5a4306b73baac",
+        "rev": "5deaa19e80e1c0695f7fa8a16e13a704fd08f96e",
         "type": "github"
       },
       "original": {
@@ -469,11 +469,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1774221289,
-        "narHash": "sha256-nxFkSVa268w237r0i0xxCpzyIVtfXocm1xI+vsjJlgo=",
+        "lastModified": 1774472446,
+        "narHash": "sha256-Hp4A0llEmBvvNuw5uKOz+BA86X7TmXZ1vUK0StiMdVs=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "6cd1fe9a66947511f59226d51dd70197d80513e5",
+        "rev": "c9e961994b16ed841be43541ef550bf3d3f043ec",
         "type": "github"
       },
       "original": {
@@ -494,11 +494,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1774253924,
-        "narHash": "sha256-5Zi+RYoRvax1gATaNC80MYR+6uBJ3F+uUZ2KL3HyTWg=",
+        "lastModified": 1774539534,
+        "narHash": "sha256-kRKybUNiXTivTZSUnqwXHCY4GRD3e+Nu+1Mb8jf2HCI=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "36f3b7b93efde38c4c40daeaee80a62afb550812",
+        "rev": "975e9c55001333df0ddab36d938372c14917998a",
         "type": "github"
       },
       "original": {
@@ -550,11 +550,11 @@
         "nixpkgs-nixcord": "nixpkgs-nixcord"
       },
       "locked": {
-        "lastModified": 1774085563,
-        "narHash": "sha256-u12oksXYS8YNphdTsCTgCQcKuVNvCX/CKVjg7ki74YA=",
+        "lastModified": 1774542254,
+        "narHash": "sha256-/y48dfuiZECFqVzoCGwJvbpF+rk/aKiAuZ23gKYf83s=",
         "owner": "KaylorBen",
         "repo": "nixcord",
-        "rev": "5bc81fedc7df61c80f5480610ff7e35192d8e1d4",
+        "rev": "6ba8404eedc4a080a0b4ecb615e094abe70ef530",
         "type": "github"
       },
       "original": {
@@ -565,11 +565,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1774018263,
-        "narHash": "sha256-HHYEwK1A22aSaxv2ibhMMkKvrDGKGlA/qObG4smrSqc=",
+        "lastModified": 1774465523,
+        "narHash": "sha256-4v7HPm63Q90nNn4fgkgKsjW1AH2Klw7XzPtHJr562nM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "2d4b4717b2534fad5c715968c1cece04a172b365",
+        "rev": "de895be946ad1d8aafa0bb6dfc7e7e0e9e466a29",
         "type": "github"
       },
       "original": {
@@ -643,11 +643,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1773964973,
-        "narHash": "sha256-NV/J+tTER0P5iJhUDL/8HO5MDjDceLQPRUYgdmy5wXw=",
+        "lastModified": 1774388614,
+        "narHash": "sha256-tFwzTI0DdDzovdE9+Ras6CUss0yn8P9XV4Ja6RjA+nU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "812b3986fd1568f7a858f97fcf425ad996ba7d25",
+        "rev": "1073dad219cb244572b74da2b20c7fe39cb3fa9e",
         "type": "github"
       },
       "original": {
@@ -659,11 +659,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1774106199,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "lastModified": 1774386573,
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -675,11 +675,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1774106199,
-        "narHash": "sha256-US5Tda2sKmjrg2lNHQL3jRQ6p96cgfWh3J1QBliQ8Ws=",
+        "lastModified": 1774386573,
+        "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "6c9a78c09ff4d6c21d0319114873508a6ec01655",
+        "rev": "46db2e09e1d3f113a13c0d7b81e2f221c63b8ce9",
         "type": "github"
       },
       "original": {
@@ -714,11 +714,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1772402258,
-        "narHash": "sha256-3DmCFOdmbkFML1/G9gj8Wb+rCCZFPOQtNoMCpqOF8SA=",
+        "lastModified": 1774309640,
+        "narHash": "sha256-8oWL7YLwElBY9ebYri1LlSlhf/gd1Qoqj0nbBwG2yso=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "21ae25e13b01d3b4cdc750b5f9e7bad68b150c10",
+        "rev": "28c58bf023bf537354f78d6e496a349d7a0ed554",
         "type": "github"
       },
       "original": {
@@ -733,11 +733,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1774274362,
-        "narHash": "sha256-3D3d8NqjZ9bKccsvQoL9YU7Atnb9oUAEZPmSPHbVI+M=",
+        "lastModified": 1774558268,
+        "narHash": "sha256-mzJSoSK8Eob6V1wbtafSrxkwusOtOV5IPItP8vcGhZ4=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "d2117bdc8b008e5baf07610f8784da9818528140",
+        "rev": "abfc10f1e9f4b301593df325b8cdc1cc2ba1cde2",
         "type": "github"
       },
       "original": {
@@ -758,11 +758,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1774224548,
-        "narHash": "sha256-g45WZAZHNc7wJBkK4IdB5dq0Bh0JE7G0gcY2H5DFi44=",
+        "lastModified": 1774375131,
+        "narHash": "sha256-d22VIgsDXagQQWnAnebYeQWGHlmF81YRwuGCzAgNZAQ=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "edfb73fa4ced576f587d259a70a513b4152f8cea",
+        "rev": "d847d401bea4dcb1478d02a61a3209fa8512f71d",
         "type": "github"
       },
       "original": {
@@ -779,11 +779,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774184185,
-        "narHash": "sha256-uxvwbXjpJUpWgXLi3Oadd+PqR3UV5MC7B/lm45oluLc=",
+        "lastModified": 1774382611,
+        "narHash": "sha256-ZWFwBUYjPaZrBI5VapISxz45ec3Xec6VOokvOmmdGas=",
         "ref": "refs/heads/master",
-        "rev": "bcee71cbbb0282d84841ba9b8908773ab56decf2",
-        "revCount": 66,
+        "rev": "783a58d95487a1a8e97f1cc5f2fc58016e695b7e",
+        "revCount": 73,
         "type": "git",
         "url": "https://git.bwaaa.monster/omnisearch"
       },
@@ -928,11 +928,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1774256511,
-        "narHash": "sha256-AqMFO1jkDlilT0gsxfVwQEqyafUqqear9dni8zNDbmM=",
+        "lastModified": 1774541495,
+        "narHash": "sha256-ELw4NuJ/ND9UGp8yLUewggSdmOxmgkUrAd1FGWe1A8g=",
         "owner": "gabm",
         "repo": "Satty",
-        "rev": "c6470f7a7fd6fbdea6061d9ee7082d2d9dce64aa",
+        "rev": "5c3cb87edbc1c2fd911905660befc4d57b6bdb78",
         "type": "github"
       },
       "original": {
@@ -948,11 +948,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774154798,
-        "narHash": "sha256-zsTuloDSdKf+PrI1MsWx5z/cyGEJ8P3eERtAfdP8Bmg=",
+        "lastModified": 1774303811,
+        "narHash": "sha256-fhG4JAcLgjKwt+XHbjs8brpWnyKUfU4LikLm3s0Q/ic=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "3e0d543e6ba6c0c48117a81614e90c6d8c425170",
+        "rev": "614e256310e0a4f8a9ccae3fa80c11844fba7042",
         "type": "github"
       },
       "original": {
@@ -1080,11 +1080,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1774268739,
-        "narHash": "sha256-/29w8LNrD8MvW598zTkCrLZ5zQxuJMyeO86/rjXb8Zc=",
+        "lastModified": 1774475860,
+        "narHash": "sha256-8V4qLObIgFfkrmpDhoT2+CY2wdv3RBjKM66M74Q8d9A=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "be2ad4a8587b41f111e2214db2a92cb6e744fc48",
+        "rev": "49460defdc9876acae4212769daab9bbe0666d61",
         "type": "github"
       },
       "original": {
@@ -1135,11 +1135,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1774260364,
-        "narHash": "sha256-YRLjv6RDUB+7MZNeEgSdxCR+S7z4O+6dANdOWaa9P8I=",
+        "lastModified": 1774439851,
+        "narHash": "sha256-4eGyZtW+KsAVZqeS5bq/o+16YagjgWP+Uc3pltSaroU=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "5c05350d52cbbb490a353e2df192f36dd9d73218",
+        "rev": "b67798ea199a28fbe6cc210305d5db64918d0970",
         "type": "github"
       },
       "original": {
diff --git a/hm/conf/xdg-dirs.nix b/hm/conf/xdg-dirs.nix
index 3a37e6a..f0e346b 100644
--- a/hm/conf/xdg-dirs.nix
+++ b/hm/conf/xdg-dirs.nix
@@ -16,6 +16,7 @@ in
     xdg.userDirs = {
       enable = true;
       createDirectories = true;
+      setSessionVariables = true;
 
       download = "${config.home.homeDirectory}/dl";
       documents = "${config.home.homeDirectory}/dc";
diff --git a/hm/env/theme.nix b/hm/env/theme.nix
index 285e263..743f362 100644
--- a/hm/env/theme.nix
+++ b/hm/env/theme.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   cfg = config.hm.env.themes;
 in
@@ -17,9 +22,11 @@ in
     (lib.mkIf cfg.gtk.enable {
       gtk = {
         enable = true;
+        gtk4.theme = config.gtk.theme;
+
         gtk3.extraConfig.gtk-application-prefer-dark-theme = 1;
         gtk4.extraConfig.gtk-application-prefer-dark-theme = 1;
-        
+
         theme = {
           name = "Adwaita-dark";
           package = pkgs.gnome-themes-extra;
@@ -30,8 +37,11 @@ in
     (lib.mkIf cfg.qt.enable {
       qt = {
         enable = true;
-        platformTheme.name = "gtk";
-        style.name = "adwaita-dark";
+        platformTheme.name = "qtct";
+        style = {
+          name = "adwaita-dark";
+          package = pkgs.adwaita-qt;
+        };
       };
     })
   ];
diff --git a/hm/soft/chat.nix b/hm/soft/chat.nix
new file mode 100644
index 0000000..61c1f92
--- /dev/null
+++ b/hm/soft/chat.nix
@@ -0,0 +1,18 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.hm.soft.chat;
+in
+{
+  options.hm.soft.chat.enable = lib.mkEnableOption "chatting apps";
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs; [
+      equibop
+      gajim
+    ];
+  };
+}
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index bd43501..ee732e8 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -14,13 +14,11 @@ in
   options.hm.soft.nixcord.enable = lib.mkEnableOption "nixcord configuration";
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
-      stoat-desktop
-      element-desktop
-      gajim
       equibop
+      gajim
     ];
     programs.nixcord = {
-      # enable = true;
+      enable = true;
       discord = {
         enable = true;
         autoscroll.enable = true;
diff --git a/hm/soft/soft.nix b/hm/soft/soft.nix
index f6a9a69..0bbe0cf 100644
--- a/hm/soft/soft.nix
+++ b/hm/soft/soft.nix
@@ -2,6 +2,7 @@
 {
   imports = [
     ./browser.nix
+    ./chat.nix
     ./email.nix
     ./kdenlive.nix
     ./mangohud.nix
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index a96973d..05ef3f7 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,6 +1,5 @@
 {
   config,
-  inputs,
   username,
   pkgs,
   ...
@@ -9,15 +8,10 @@
   system.stateVersion = "25.05";
 
   imports = [
-    inputs.disko.nixosModules.disko
-    # ./disko.nix
     ./hardware-configuration.nix
-
     ../../os/default.nix
   ];
 
-  # hardware.facter.reportPath = ./facter.json;
-
   os = {
     core = {
       allowUnfree.enable = true;
@@ -30,7 +24,6 @@
       bootloader = {
         type = "systemd-boot";
         timeout = 0;
-        # luks.enable = true;
       };
       drivers = {
         enable = true;
@@ -79,7 +72,7 @@
       monero.enable = true;
       sops.enable = true;
       syncthing.enable = true;
-      # omnisearch.enable = true;
+      omnisearch.enable = true;
       vpn.enable = true;
     };
     wm = {
@@ -87,15 +80,8 @@
       niri.enable = true;
     };
   };
-  services.hardware.openrgb = {
-    enable = true;
-    motherboard = "amd";
-    package = pkgs.openrgb-with-all-plugins;
-  };
 
-  environment.systemPackages = with pkgs; [
-    wl-kbptr
-  ];
+  programs.firefox.enable = true;
 
   boot = {
     kernelModules = [
diff --git a/hosts/desktop/home.nix b/hosts/desktop/home.nix
index 29b26c4..c1f1517 100644
--- a/hosts/desktop/home.nix
+++ b/hosts/desktop/home.nix
@@ -54,7 +54,7 @@
       email.thunderbird.enable = true;
       media.enable = true;
       mpv.enable = true;
-      nixcord.enable = true;
+      chat.enable = true;
       obs.enable = true;
       obsidian.enable = true;
       spicetify.enable = true;
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 62adf1b..8fa03c4 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -77,8 +77,5 @@
       niri.enable = true;
     };
   };
-  nixpkgs.config.permittedInsecurePackages = [
-    "electron-38.8.4"
-  ];
   # boot.kernelParams = [ "iomem=relaxed" ];
 }
diff --git a/hosts/thinkpad/home.nix b/hosts/thinkpad/home.nix
index 6dba53c..35f227d 100644
--- a/hosts/thinkpad/home.nix
+++ b/hosts/thinkpad/home.nix
@@ -51,7 +51,7 @@
       email.thunderbird.enable = true;
       media.enable = true;
       mpv.enable = true;
-      nixcord.enable = true;
+      chat.enable = true;
       onlyoffice.enable = true;
       obsidian.enable = true;
       spicetify.enable = true;
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index 2bbf5f1..33f492a 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -48,6 +48,7 @@ in
     (lib.mkIf cfg.launchers.enable {
       environment.systemPackages = with pkgs; [
         heroic
+        (pkgs.bottles.override { removeWarningPopup = true; })
         (prismlauncher.override {
           additionalLibs = with pkgs; [ ocl-icd ];
           jdks = with pkgs; [ javaPackages.compiler.temurin-bin.jdk-25 ];
@@ -101,6 +102,12 @@ in
           }
         );
       };
+      services.wivrn = {
+        enable = true;
+        openFirewall = true;
+        highPriority = true;
+        steam.importOXRRuntimes = true;
+      };
       environment.systemPackages = [ pkgs.android-tools ];
       users.users.${username}.extraGroups = [ "adbusers" ];
     })