sync

11 files changed, 100 insertions, 106 deletions

diff --git a/flake.lock b/flake.lock
index 4799847..b4b8ad2 100644
--- a/flake.lock
+++ b/flake.lock
@@ -383,11 +383,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776562531,
-        "narHash": "sha256-Lh5Ns9DI67E+lSMOCGK0S+mFPy0mz0yOGiJTUXiR9JI=",
+        "lastModified": 1777218285,
+        "narHash": "sha256-d2FY71SBVKVbT1PsfXA71jz0vD520NijS4lrcvUMeGk=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "5b56ad02dc643808b8af6d5f3ff179e2ce9593f4",
+        "rev": "c55c498c9aa205b16cca78b57a7275625726d532",
         "type": "github"
       },
       "original": {
@@ -668,11 +668,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1768214250,
-        "narHash": "sha256-hnBZDQWUxJV3KbtvyGW5BKLO/fAwydrxm5WHCWMQTbw=",
+        "lastModified": 1776882296,
+        "narHash": "sha256-DWZozXwMsgvUqfVlL1mQ8dOxW7GJ/8CdyaDN+1niZRg=",
         "owner": "feel-co",
         "repo": "ndg",
-        "rev": "a6bd3c1ce2668d096e4fdaaa03ad7f03ba1fbca8",
+        "rev": "ab7d78d4884b3a34968cf9fa3d16c0c1246d5c6e",
         "type": "github"
       },
       "original": {
@@ -691,11 +691,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776557088,
-        "narHash": "sha256-DV2C1S+JYf2UB6S6CzmLl5dt6HwVh9FcC7q/+BLZZZg=",
+        "lastModified": 1777162024,
+        "narHash": "sha256-D0c1qWtSL49RY5K6cEXf6Bjksbiv5oLRefSwMr9Wh4s=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "17e9c821a0213ff7ed87968082213c9e017ee6a7",
+        "rev": "2256cb2eecdce4ad75ac9a0320f874b900c00529",
         "type": "github"
       },
       "original": {
@@ -707,11 +707,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1776541400,
-        "narHash": "sha256-BjYfNZF6g5PJc1KnskaaxxYOony4peFET7HRz04ABHk=",
+        "lastModified": 1777159037,
+        "narHash": "sha256-k6uBXGmfdvpnpAUUY+jlCnz+MK0HURldSAkNGEMWABk=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "b351afb1b1c564c5a4e6856764d4db21a873242c",
+        "rev": "924dbf10b8e3bbc35eff629d12583bc9c944660b",
         "type": "github"
       },
       "original": {
@@ -732,11 +732,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1776602954,
-        "narHash": "sha256-C41nazGNIM/58ISKaIirq8/z1sDgS6CVJnWBwAzhaGQ=",
+        "lastModified": 1777224522,
+        "narHash": "sha256-KMnWd02aEd8oyxI7dxhSoGHZBST6lKy5wNTclxBjFkY=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "c175f415488243723dc1a5514b286abbea6f93c1",
+        "rev": "1a42351b608237ccadb1bc0547b78d3acf6642ff",
         "type": "github"
       },
       "original": {
@@ -765,11 +765,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1776598536,
-        "narHash": "sha256-7Bbp0fDBJMDRpKfdHelMXbhY51bdCa5+Qn/+XONaOwk=",
+        "lastModified": 1777212078,
+        "narHash": "sha256-z17/nd3urtL3Qshf1sZu6B8HHgI9Fo87/minxT1tv6g=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "68bb942d2146cd2c8af69c0f16db18396b4388fe",
+        "rev": "a48f2645d90589ab419e6282a87665d9686bd14d",
         "type": "github"
       },
       "original": {
@@ -786,11 +786,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776492892,
-        "narHash": "sha256-NG9w4LJ/oQC9bLZrKgKNpAoQ8Kj2jEPTyKFvJj6VO8s=",
+        "lastModified": 1777126319,
+        "narHash": "sha256-SFW0rs0iJ50dzpKURM+2R+ZKgZCJmVBq5c5yUBxn2Y4=",
         "owner": "powerofthe69",
         "repo": "nix-gaming-edge",
-        "rev": "17939baf4da51f8b6802f7431470a5a559ef18c4",
+        "rev": "d797435300819f82931c50cd7e4ab5cbd6ada930",
         "type": "github"
       },
       "original": {
@@ -801,11 +801,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1775490113,
-        "narHash": "sha256-2ZBhDNZZwYkRmefK5XLOusCJHnoeKkoN95hoSGgMxWM=",
+        "lastModified": 1776983936,
+        "narHash": "sha256-ZOQyNqSvJ8UdrrqU1p7vaFcdL53idK+LOM8oRWEWh6o=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "c775c2772ba56e906cbeb4e0b2db19079ef11ff7",
+        "rev": "2096f3f411ce46e88a79ae4eafcfc9df8ed41c61",
         "type": "github"
       },
       "original": {
@@ -848,11 +848,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1776434932,
-        "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -864,11 +864,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1776434932,
-        "narHash": "sha256-gyqXNMgk3sh+ogY5svd2eNLJ6oEwzbAeaoBrrxD0lKk=",
+        "lastModified": 1777077449,
+        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c7f47036d3df2add644c46d712d14262b7d86c0c",
+        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
         "type": "github"
       },
       "original": {
@@ -880,11 +880,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1776169885,
-        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "lastModified": 1776877367,
+        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
+        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
         "type": "github"
       },
       "original": {
@@ -919,11 +919,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1776452249,
-        "narHash": "sha256-tpCsY9kIEfcitiV3JwUqYTmxwewwZKQlZSNUBqb9kF0=",
+        "lastModified": 1777218776,
+        "narHash": "sha256-8juiX5HT2Bp4+qXLCFNRdIL10X8ySiAbgl/QhJDt+24=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "698d17490e19e2e360a6ce49b1af9134d1c6eacd",
+        "rev": "d404af65e951f648272d178a34cbb2292fb93689",
         "type": "github"
       },
       "original": {
@@ -944,11 +944,11 @@
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1776630589,
-        "narHash": "sha256-Ty/cyZ8tnxYliznpVG1ntziWaTfUAROHkHFR8k+p5j4=",
+        "lastModified": 1777150561,
+        "narHash": "sha256-YLVqyn6LpFa+h697TmZIk0qVIbe7MxMpL8UTF4K+efA=",
         "owner": "NotAShelf",
         "repo": "nvf",
-        "rev": "cd9c79b8cd012beaba818df713a0e0ea632b74a3",
+        "rev": "5b4f9c63205e5b0ef180a2b0e4cc844111f96fa6",
         "type": "github"
       },
       "original": {
@@ -965,15 +965,17 @@
         ]
       },
       "locked": {
-        "lastModified": 1776134667,
-        "narHash": "sha256-UKJfv7uG2BsQqRdTNVl4BkKjQs2tA17lmi4/uW/Yzk0=",
+        "lastModified": 1776229871,
+        "narHash": "sha256-IqZAw2Z3uwkuq5gv+XoRA4I+P9yxWPb5fPAL14SlEME=",
         "ref": "refs/heads/master",
-        "rev": "3a99a37b0c1232cf7310f5a5314466839001fec9",
-        "revCount": 118,
+        "rev": "92dd87eb57e12f9c6936e7ee2a00bf8d92b472c8",
+        "revCount": 121,
+        "shallow": false,
         "type": "git",
         "url": "https://git.bwaaa.monster/omnisearch"
       },
       "original": {
+        "shallow": false,
         "type": "git",
         "url": "https://git.bwaaa.monster/omnisearch"
       }
@@ -1011,11 +1013,11 @@
         "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1776532353,
-        "narHash": "sha256-sAkUjqPgg+zIX0eOmuMGMgtmq2w+uE2PLIacSzSCrjo=",
+        "lastModified": 1776906414,
+        "narHash": "sha256-ImJeI5xbd/w4nchFwc0tSS8v2vYWx/ttwM5uk2BWsCk=",
         "owner": "kuokuo123",
         "repo": "otter-launcher",
-        "rev": "1ff9f075eb885fc834a6e2c0644b0a7061baaebb",
+        "rev": "ae647cef5b3c3dd52bedd7a8c881988e412a2dca",
         "type": "github"
       },
       "original": {
@@ -1125,11 +1127,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1772420823,
-        "narHash": "sha256-q3oVwz1Rx41D1D+F6vg41kpOkk3Zi3KwnkHEZp7DCGs=",
+        "lastModified": 1776741231,
+        "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "458eea8d905c609e9d889423e6b8a1c7bc2f792c",
+        "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b",
         "type": "github"
       },
       "original": {
@@ -1189,11 +1191,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776119890,
-        "narHash": "sha256-Zm6bxLNnEOYuS/SzrAGsYuXSwk3cbkRQZY0fJnk8a5M=",
+        "lastModified": 1776771786,
+        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "d4971dd58c6627bfee52a1ad4237637c0a2fb0cd",
+        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
         "type": "github"
       },
       "original": {
@@ -1210,11 +1212,11 @@
         "systems": "systems_6"
       },
       "locked": {
-        "lastModified": 1776578704,
-        "narHash": "sha256-4+JHYCweZ/SSrMcu2nJ5gc7gop2scBk0JIIfaUKuTaQ=",
+        "lastModified": 1777183994,
+        "narHash": "sha256-zahis/vVFOsWv/HeyHbU13jxnrCC+ppIg49xG+viWxg=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "73f6d24b4f5bdacc3b41ddcf9965bef2781f97dd",
+        "rev": "501256c3e670ca1679501ce3839ea805df00d8ba",
         "type": "github"
       },
       "original": {
@@ -1230,11 +1232,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776509741,
-        "narHash": "sha256-EckkZBhvVSd/nA+l6fIhtE7BEY0DTIeVLFaH+xmjGf8=",
+        "lastModified": 1777120747,
+        "narHash": "sha256-r6uHOz3ffeVtizN+NeFqKTjcvCguuR0LwoUrCEwFziQ=",
         "owner": "MattiaPun",
         "repo": "SubTUI",
-        "rev": "7c40607663d6eb08b0d6d31f287d75eca3439c0c",
+        "rev": "cc4149f59c8d0e727207230e36410fcab9e257a8",
         "type": "github"
       },
       "original": {
@@ -1356,11 +1358,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776070970,
-        "narHash": "sha256-ArclxR9y505NG3VmjXyrw/i2o37BJcVBtNoWL5VO8nU=",
+        "lastModified": 1776883848,
+        "narHash": "sha256-85yQuBRwF4lOHwDJzFFj8gSqwiOcbWZXLUex0ONZpTw=",
         "owner": "Alexays",
         "repo": "Waybar",
-        "rev": "3a321d934dda790f8ce8dc76d8e545abe1ec3251",
+        "rev": "cca8dc38b6ed25ef78920669c5653748f31e4ba6",
         "type": "github"
       },
       "original": {
@@ -1428,11 +1430,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1776589137,
-        "narHash": "sha256-BFsxdfQLP8MQAWebFIQ/KkFhCLFTXEDmKRTkScMH+po=",
+        "lastModified": 1777190831,
+        "narHash": "sha256-/aRe0XpElRx8zLYAjhd3SroJn90hRqfCqhHJEZKUQB0=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "369c47539c3261972349ae57d1098c741bfbc5c4",
+        "rev": "c4c533e3efca8da498b137dfc907bc5e20090f93",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index a59d6fe..7260f92 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,7 +83,8 @@
 
     # Other
     omnisearch = {
-      url = "git+https://git.bwaaa.monster/omnisearch";
+      # url = "git+https://git.bwaaa.monster/omnisearch";
+      url = "git+https://git.bwaaa.monster/omnisearch?shallow=0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/hm/editors/nixvim/nixvim.nix b/hm/editors/nixvim/nixvim.nix
index 6d4583b..ea6398b 100644
--- a/hm/editors/nixvim/nixvim.nix
+++ b/hm/editors/nixvim/nixvim.nix
@@ -17,7 +17,7 @@ in
     programs.nixvim = {
       diagnostics.virtual_text = false;
       enable = true;
-      # package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
+      package = inputs.neovim-nightly-overlay.packages.${pkgs.system}.default;
 
       viAlias = true;
       vimAlias = true;
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index 5d657b7..e92f364 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -51,9 +51,7 @@ in
   "Mod+Shift+D".action = spawn "sh" "-c" "cliphist list | fuzzel --dmenu | cliphist decode | wl-copy";
 
   "Super+C".action = spawn "qalculate-gtk";
-  "Super+D".action = spawn "equibop";
   "Super+B".action = spawn "librewolf";
-  "Super+S".action = spawn "spotify";
   "Super+E".action = spawn "pcmanfm";
   "Super+Shift+P".action = spawn "swaylock" "-f";
   "Super+Space".action = spawn "${otter-menu}/bin/otter-menu";
diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix
index e6a972c..410ec96 100644
--- a/hm/env/niri/niri.nix
+++ b/hm/env/niri/niri.nix
@@ -157,8 +157,9 @@ in
       spawn-at-startup = [
         {
           command = [
-            "obs"
-            "--startreplaybuffer"
+            "sh"
+            "-c"
+            "sleep 10 && obs --startreplaybuffer"
           ];
         }
       ];
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index b87ceef..848c344 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -24,6 +24,21 @@ in
     programs.mpv = {
       enable = true;
 
+      scripts = with pkgs.mpvScripts; [
+        modernz
+        quality-menu
+        mpv-playlistmanager
+        thumbfast
+        mpris
+
+        mpv-image-viewer.image-positioning
+        (pkgs.mpvScripts.builtins.autoload)
+        mpv-cheatsheet-ng
+        webtorrent-mpv-hook
+        autosubsync-mpv
+        sponsorblock
+      ];
+
       bindings = {
         "CTRL+1" = "apply-profile movie-ultra; show-text \"Movie Ultra Active\"";
         "CTRL+2" = "apply-profile anime-mode-a; show-text \"Anime4K: Mode A (UL)\"";
@@ -45,9 +60,13 @@ in
         profile = "gpu-hq";
         gpu-api = "vulkan";
         vo = "gpu-next";
-        # hwdec = "vaapi-copy";
+        # hwdec = "vaapi";
         hwdec = "no";
 
+        # osc = "no";
+        # osd-bar = "no";
+        # border = "no";
+
         scale = "ewa_lanczossharp";
         cscale = "ewa_lanczos";
         dscale = "mitchell";
@@ -163,19 +182,6 @@ in
           scale = "ewa_lanczossharp";
         };
       };
-
-      scripts = with pkgs.mpvScripts; [
-        modernx
-        mpv-playlistmanager
-        thumbfast
-        mpris
-
-        webtorrent-mpv-hook
-        # reload
-        # memo
-        autosubsync-mpv
-        sponsorblock
-      ];
     };
 
     hm.soft.yt-dlp.enable = true;
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index f55e857..41cd69f 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -3,6 +3,7 @@
   username,
   inputs,
   pkgs,
+  lib,
   ...
 }:
 {
diff --git a/hosts/thinkpad/configuration.nix b/hosts/thinkpad/configuration.nix
index 728f5a9..6295dcd 100644
--- a/hosts/thinkpad/configuration.nix
+++ b/hosts/thinkpad/configuration.nix
@@ -92,6 +92,7 @@
     };
   };
   environment.systemPackages = [
+    pkgs.vis
     pkgs.appimage-run
     inputs.subtui.packages.x86_64-linux.subtui
   ];
diff --git a/os/core/security.nix b/os/core/security.nix
index fd518c0..c401a14 100644
--- a/os/core/security.nix
+++ b/os/core/security.nix
@@ -48,29 +48,13 @@ in
             roddhjav-apparmor-rules
           ];
         };
-        programs.firejail.enable = true;
-        environment.etc = {
-          "firejail/games.profile".text = ''
-            include wine.profile
-
-            # --- Security stuff ---
-            apparmor
-            nonewprivs
-            net none
-            noinput
-            nogroups
-            novideo
-            dbus-user none
-            dbus-system none
+        services.dbus.apparmor = "enabled";
+        specialisation.no-apparmor.configuration.security.apparmor.enable = lib.mkForce false;
 
-            # --- Filesystem Isolation ---
-            whitelist ~/games/repacks/firejail
-            private-tmp
-          '';
-        };
+        programs.firejail.enable = true;
         environment.systemPackages = with pkgs; [
-          landrun
           apparmor-utils
+          apparmor-parser
           apparmor-bin-utils
         ];
       })
diff --git a/os/srv/gaming.nix b/os/srv/gaming.nix
index ca59782..164670f 100644
--- a/os/srv/gaming.nix
+++ b/os/srv/gaming.nix
@@ -58,7 +58,7 @@ in
     (lib.mkIf cfg.launchers.enable {
       environment.systemPackages = with pkgs; [
         heroic
-        (pkgs.bottles.override { removeWarningPopup = true; })
+        # (pkgs.bottles.override { removeWarningPopup = true; })
         (prismlauncher.override {
           additionalLibs = with pkgs; [ ocl-icd ];
           jdks = with pkgs; [ javaPackages.compiler.temurin-bin.jdk-25 ];
diff --git a/os/wm/niri.nix b/os/wm/niri.nix
index 587f543..58d27af 100644
--- a/os/wm/niri.nix
+++ b/os/wm/niri.nix
@@ -19,7 +19,7 @@ in
 
     programs.niri = {
       enable = true;
-      # package = pkgs.niri-unstable;
+      package = pkgs.niri-unstable;
     };
 
     os.srv.compat.enable = true;