fixed mpv hwdec again, added niri top workspace

8 files changed, 111 insertions, 122 deletions

diff --git a/flake.lock b/flake.lock
index 5a217ed..3bcef0a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -232,11 +232,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767437240,
-        "narHash": "sha256-OA0dBHhccdupFXp+/eaFfb8K1dQxk61in4aF5ITGVX8=",
+        "lastModified": 1767556355,
+        "narHash": "sha256-RDTUBDQBi9D4eD9iJQWtUDN/13MDLX+KmE+TwwNUp2s=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "1cfa305fba94468f665de1bd1b62dddf2e0cb012",
+        "rev": "f894bc4ffde179d178d8deb374fcf9855d1a82b7",
         "type": "github"
       },
       "original": {
@@ -277,11 +277,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767398712,
-        "narHash": "sha256-kISX2IOmbk+A0xfGsO/ZN8d0QZiL0+PRKdiGM+Uh1Ok=",
+        "lastModified": 1767571560,
+        "narHash": "sha256-YVSqPQ9m7sr/SJRGW/lwJ0HsKIhmDryF/GdKiOF6/FA=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "519c66e44d81e2a752759d60320dbd6f06c14437",
+        "rev": "966191072e64eb98c74befc6a623798d3d20efc3",
         "type": "github"
       },
       "original": {
@@ -293,11 +293,11 @@
     "neovim-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1767367892,
-        "narHash": "sha256-hqHV3mZp3HBpSwIMQLEP24PkRMwd9Ol6ZDtORuryciM=",
+        "lastModified": 1767568020,
+        "narHash": "sha256-vOTmVi6QXdHxvOEnzcSuGZebD1bDpr/K4efIq8yEQd0=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "067b5743f543798f4e58003816fc930f4106c2b0",
+        "rev": "efa6d91132c71d6efca1b813b0129b1085389a48",
         "type": "github"
       },
       "original": {
@@ -318,11 +318,11 @@
         "xwayland-satellite-unstable": "xwayland-satellite-unstable"
       },
       "locked": {
-        "lastModified": 1767377696,
-        "narHash": "sha256-OShXLsMyF9hxmiID1p4QF+ekqreViHM9105ej05S2uI=",
+        "lastModified": 1767544157,
+        "narHash": "sha256-DVTMOUd4uHkDcZXWAqOS+Pa0M9a27G1Ya3B7SFG6BQs=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "ba6ea712dc2da0b01c6a8d02dd9e86973663e4de",
+        "rev": "d0e2c4bebf9d0b879410736f7abce628976bfb92",
         "type": "github"
       },
       "original": {
@@ -351,11 +351,11 @@
     "niri-unstable": {
       "flake": false,
       "locked": {
-        "lastModified": 1767160009,
-        "narHash": "sha256-aTj88rDBdhmzaGXoFPOsHjXYM2OjNttixsGftT/X0dI=",
+        "lastModified": 1767530622,
+        "narHash": "sha256-ywnL1cc0A6fni7m859ImiBYA8DlXXJ+5OXIlcBqJ2B0=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "cf0b4bc0ca93ab5c18b562ada1d8609b67b3c4e3",
+        "rev": "54c2e2ab476629d17fdba861895f58e7cdac32ab",
         "type": "github"
       },
       "original": {
@@ -396,11 +396,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767451989,
-        "narHash": "sha256-sUZmTUFti+uETSvUEQ3bklw8fFoDPKD9E4dbgxvRKPc=",
+        "lastModified": 1767573258,
+        "narHash": "sha256-X59Wae/94E1vFg2/a/dX+vCBCm2brTcMuUPDyVpZ4HE=",
         "owner": "KaylorBen",
         "repo": "nixcord",
-        "rev": "93b998d75b3548314fc196e65186f307c4807e94",
+        "rev": "9c7cf5c05529c566f71315b1c8593ac5a39221e8",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1767325753,
-        "narHash": "sha256-yA/CuWyqm+AQo2ivGy6PlYrjZBQm7jfbe461+4HF2fo=",
+        "lastModified": 1767480499,
+        "narHash": "sha256-8IQQUorUGiSmFaPnLSo2+T+rjHtiNWc+OAzeHck7N48=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "64049ca74d63e971b627b5f3178d95642e61cedd",
+        "rev": "30a3c519afcf3f99e2c6df3b359aec5692054d92",
         "type": "github"
       },
       "original": {
@@ -513,11 +513,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1767361654,
-        "narHash": "sha256-EQeicMekc0p+A8HBIAOdnyeAijqJKQYuj1CfTW4Wd+k=",
+        "lastModified": 1767553127,
+        "narHash": "sha256-H6JzPMmvBYlGjIBgrHIS2dFXh05h4bwMJTZTn3IGVtc=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "d61584cc4cac9af1ba74ad235992df575391276d",
+        "rev": "3d7bcda3d163c1c38e231f81e0e90155b7b9e9bf",
         "type": "github"
       },
       "original": {
@@ -633,11 +633,11 @@
         "rust-overlay": "rust-overlay_3"
       },
       "locked": {
-        "lastModified": 1767474436,
-        "narHash": "sha256-B3B5n4Nb7SIbIOnuaHgkdcHCsEGrHpSbjG19zDMqUCY=",
+        "lastModified": 1767597267,
+        "narHash": "sha256-eW+TMNHGFp1kwR3MSzXP5Sjmcj1iNWVX0avJu2W64TE=",
         "owner": "gabm",
         "repo": "Satty",
-        "rev": "d78fdf0af67832a4043465eae3a28a9c71cb025a",
+        "rev": "e2a4ad3308fd247e836fdf85beb94258b608bc39",
         "type": "github"
       },
       "original": {
@@ -654,11 +654,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1767195736,
-        "narHash": "sha256-0xvPSbhIGeJzsJXNTkgJ3PjwdVItKm85wzYKA9NmSzI=",
+        "lastModified": 1767502559,
+        "narHash": "sha256-om0IPjW850vhhIrNZ5tiXjsYuqyoI44IdE+I9AwZ96I=",
         "owner": "Gerg-L",
         "repo": "spicetify-nix",
-        "rev": "465adc0ab6ff0c4b9b1db1c6e7fd7eeb553b3261",
+        "rev": "806c1fdeb7af3e013215d14f5d9f06685fa6650f",
         "type": "github"
       },
       "original": {
@@ -775,11 +775,11 @@
         "rust-overlay": "rust-overlay_4"
       },
       "locked": {
-        "lastModified": 1767438098,
-        "narHash": "sha256-xDzNAI9mKPsnMYBQ6mpU2184Y23zMpkdc/rxcfyvJXs=",
+        "lastModified": 1767501306,
+        "narHash": "sha256-dNDwlMM+k20c2Lnm+hqUvzu5l3Ip9GeP+nnj4WlDVdw=",
         "owner": "sxyazi",
         "repo": "yazi",
-        "rev": "e611de52840e6cc5585439bd9888600431e75b26",
+        "rev": "3c39a326abaacb37d9ff15af7668756d60624dfa",
         "type": "github"
       },
       "original": {
diff --git a/hm/env/niri/binds.nix b/hm/env/niri/binds.nix
index fc452a5..f2b8540 100644
--- a/hm/env/niri/binds.nix
+++ b/hm/env/niri/binds.nix
@@ -90,11 +90,11 @@ in
   "Super+Return".action = spawn "obs-cmd" "replay" "save";
 
 } // (
-  # --- Generated Workspace Binds (1-9) ---
-  builtins.listToAttrs (builtins.concatMap (i: let
-    strI = toString i;
+  builtins.listToAttrs (builtins.concatMap (keyNum: let
+    key = toString keyNum;
+    targetWS = keyNum + 1;
   in [
-    { name = "Mod+${strI}"; value.action = focus-workspace i; }
-    { name = "Mod+Shift+${strI}"; value.action.move-column-to-workspace = [ i ]; }
+    { name = "Mod+${key}"; value.action = focus-workspace targetWS; }
+    { name = "Mod+Shift+${key}"; value.action.move-column-to-workspace = [ targetWS ]; }
   ]) (lib.range 1 9))
 )
diff --git a/hm/env/niri/niri.nix b/hm/env/niri/niri.nix
index f63c1fa..02e7472 100644
--- a/hm/env/niri/niri.nix
+++ b/hm/env/niri/niri.nix
@@ -46,7 +46,6 @@ in
           mode = {
             width = 2560;
             height = 1440;
-            # refresh = 239.998;
           };
         };
       };
@@ -56,7 +55,7 @@ in
         theme = "Hoshimi_Miyabi";
       };
       layout = {
-        # empty-workspace-above-first = true;
+        empty-workspace-above-first = true;
         border = {
           width = 2;
           # active = <decoration>;
diff --git a/hm/soft/mpv.nix b/hm/soft/mpv.nix
index f282898..08f97e6 100644
--- a/hm/soft/mpv.nix
+++ b/hm/soft/mpv.nix
@@ -37,9 +37,9 @@ in
       config = {
         keep-open = "yes";
         profile = "gpu-hq";
+        gpu-api = "vulkan";
         vo = "gpu-next";
-        hwdec = "auto";
-        gpu-api = "opengl";
+        hwdec = "vaapi-copy";
 
         scale = "ewa_lanczossharp";
         cscale = "ewa_lanczos";
diff --git a/hm/soft/nixcord.nix b/hm/soft/nixcord.nix
index 71a26b9..8c2f002 100644
--- a/hm/soft/nixcord.nix
+++ b/hm/soft/nixcord.nix
@@ -24,68 +24,68 @@ in
       config = {
         frameless = true;
         plugins = {
-      # ClearURLs.enable = true;
-      #     NoRPC.enable = true;
-      #     OnePingPerDM.enable = true;
-      #     PinDMs = { enable = true; canCollapseDmSection = true; };
-      #     SaveFavoriteGIFs.enable = true;
-      #     altKrispSwitch.enable = true;
-      #     alwaysExpandRoles = { enable = true; hideArrow = true; };
-      #     alwaysTrust = { enable = true; domain = false; };
-      #     anammox.enable = true;
-      #     betterGifAltText.enable = true;
-      #     betterGifPicker = { enable = true; keepOpen = true; };
-      #     betterInvites.enable = true;
-      #     betterNotesBox = { enable = true; hide = true; };
-      #     betterRoleContext.enable = true;
-      #     betterUploadButton.enable = true;
-      # betterUserArea = { enable = true; alwaysShowUsername = false; };
-      #     biggerStreamPreview.enable = true;
-      #     bypassPinPrompt.enable = true;
-      #     callTimer.enable = true;
-      #     cleanChannelName.enable = true;
-      #     copyFileContents.enable = true;
-      #     crashHandler.enable = true;
-      #     customTimestamps.enable = true;
-      #     disableCallIdle.enable = true;
-      #     dontRoundMyTimestamps.enable = true;
-      #     equicordHelper = { enable = true; noMirroredCamera = true; removeActivitySection = true; };
-      #     equicordToolbox = { enable = true; showPluginMenu = false; };
-      #     expressionCloner.enable = true;
-      # fakeNitro = { enable = true; enableEmojiBypass = false; enableStickerBypass = false; };
-      #     favoriteEmojiFirst.enable = true;
-      #     favoriteGifSearch.enable = true;
-      #     fixImagesQuality.enable = true;
-      #     fixSpotifyEmbeds.enable = true;
-      #     fixYoutubeEmbeds.enable = true;
-      #     forceOwnerCrown.enable = true;
-      #     forwardAnywhere.enable = true;
-      #     friendsSince.enable = true;
-      #     fullSearchContext.enable = true;
-      #     fullUserInChatbox.enable = true;
-      #     gifCollections = { enable = true; onlyShowCollections = true; preventDuplicates = true; showCopyImageLink = true; };
-      #     gifRoulette = { enable = true; pingOwnerChance = false; };
-      #     guildTagSettings.enable = true;
-      #     homeTyping.enable = true;
-      #     iLoveSpam.enable = true;
-      #     ignoreTerms.enable = true;
-      #     imageFilename = { enable = true; showFullUrl = true; };
-      #     imageLink.enable = true;
-      #     imageZoom = { enable = true; nearestNeighbour = true; square = true; };
-      #     inviteDefaults.enable = true;
-      #     limitMiddleClickPaste = { enable = true; limitTo = "never"; };
-      #     memberCount.enable = true;
-      #     mentionAvatars = { enable = true; showAtSymbol = true; };
-      #     messageLinkEmbeds.enable = true;
-      #     messageLinkTooltip = { enable = true; display = "cozy"; };
-      #     messageLogger = { enable = true; ignoreSelf = true; };
-      #     moyai = { enable = true; quality = "HD"; };
-      #     musicControls.enable = true;
-      #     neverPausePreviews.enable = true;
-      #     newGuildSettings = { enable = true; messages = 1; };
-      #     noF1.enable = true;
-      #     noMaskedUrlPaste.enable = true;
-      #     noModalAnimation.enable = true;
+      ClearURLs.enable = true;
+          NoRPC.enable = true;
+          OnePingPerDM.enable = true;
+          PinDMs = { enable = true; canCollapseDmSection = true; };
+          SaveFavoriteGIFs.enable = true;
+          altKrispSwitch.enable = true;
+          alwaysExpandRoles = { enable = true; hideArrow = true; };
+          alwaysTrust = { enable = true; domain = false; };
+          anammox.enable = true;
+          betterGifAltText.enable = true;
+          betterGifPicker = { enable = true; keepOpen = true; };
+          betterInvites.enable = true;
+          betterNotesBox = { enable = true; hide = true; };
+          betterRoleContext.enable = true;
+          betterUploadButton.enable = true;
+      betterUserArea = { enable = true; alwaysShowUsername = false; };
+          biggerStreamPreview.enable = true;
+          bypassPinPrompt.enable = true;
+          callTimer.enable = true;
+          cleanChannelName.enable = true;
+          copyFileContents.enable = true;
+          crashHandler.enable = true;
+          customTimestamps.enable = true;
+          disableCallIdle.enable = true;
+          dontRoundMyTimestamps.enable = true;
+          equicordHelper = { enable = true; noMirroredCamera = true; removeActivitySection = true; };
+          equicordToolbox = { enable = true; showPluginMenu = false; };
+          expressionCloner.enable = true;
+      fakeNitro = { enable = true; enableEmojiBypass = false; enableStickerBypass = false; };
+          favoriteEmojiFirst.enable = true;
+          favoriteGifSearch.enable = true;
+          fixImagesQuality.enable = true;
+          fixSpotifyEmbeds.enable = true;
+          fixYoutubeEmbeds.enable = true;
+          forceOwnerCrown.enable = true;
+          forwardAnywhere.enable = true;
+          friendsSince.enable = true;
+          fullSearchContext.enable = true;
+          fullUserInChatbox.enable = true;
+          gifCollections = { enable = true; onlyShowCollections = true; preventDuplicates = true; showCopyImageLink = true; };
+          gifRoulette = { enable = true; pingOwnerChance = false; };
+          guildTagSettings.enable = true;
+          homeTyping.enable = true;
+          iLoveSpam.enable = true;
+          ignoreTerms.enable = true;
+          imageFilename = { enable = true; showFullUrl = true; };
+          imageLink.enable = true;
+          imageZoom = { enable = true; nearestNeighbour = true; square = true; };
+          inviteDefaults.enable = true;
+          limitMiddleClickPaste = { enable = true; limitTo = "never"; };
+          memberCount.enable = true;
+          mentionAvatars = { enable = true; showAtSymbol = true; };
+          messageLinkEmbeds.enable = true;
+          messageLinkTooltip = { enable = true; display = "cozy"; };
+          messageLogger = { enable = true; ignoreSelf = true; };
+          moyai = { enable = true; quality = "HD"; };
+          musicControls.enable = true;
+          neverPausePreviews.enable = true;
+          newGuildSettings = { enable = true; messages = 1; };
+          noF1.enable = true;
+          noMaskedUrlPaste.enable = true;
+          noModalAnimation.enable = true;
           noMosaic.enable = true;
           noNitroUpsell.enable = true;
           noOnboardingDelay.enable = true;
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index 4956dbe..a80cb60 100644
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -1,4 +1,4 @@
-{ inputs, username, ... }:
+{ config, inputs, username, ... }:
 {
   system.stateVersion = "25.05";
 
@@ -49,7 +49,6 @@
       users.enable = true;
     };
     srv = {
-      autoclicker.enable = true;
       files = {
         thunar.enable = true;
         utils.enable = true;
@@ -69,7 +68,11 @@
     };
   };
 
-  boot.kernelParams = [
-    "video=DP-1:2560x1440@240"
-  ];
+  boot = {
+    kernelParams = [ "video=DP-1:2560x1440@240" ];
+    kernelModules = [ "nct6687" ];
+    extraModulePackages = [ 
+      config.boot.kernelPackages.nct6687d 
+    ];
+  };
 }
diff --git a/os/srv/autoclicker.nix b/os/srv/autoclicker.nix
deleted file mode 100644
index 6232a45..0000000
--- a/os/srv/autoclicker.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.os.srv.autoclicker;
-in
-{
-  options.os.srv.autoclicker.enable = lib.mkEnableOption "enables wl-autoclicker";
-  config = lib.mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      wl-clicker
-    ];
-  };
-}
diff --git a/os/srv/srv.nix b/os/srv/srv.nix
index c121bce..19e959e 100644
--- a/os/srv/srv.nix
+++ b/os/srv/srv.nix
@@ -1,7 +1,6 @@
 { ... }:
 {
   imports = [
-    ./autoclicker.nix
     ./compat.nix
     ./docker.nix
     ./files.nix