Add nouveau to built vulkan drivers

configuration.nix

@@ -115,7 +115,7 @@ in
   };
 
   home-manager.extraSpecialArgs = {
-    inherit nixtamal;
+    inherit nixtamal localPackagesOverlay;
   };
   home-manager.users.doggo = import ./home/doggo/doggo.nix;
 

home/doggo/doggo.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, nixtamal, functions, ... }:
+{ config, pkgs, nixtamal, functions, localPackagesOverlay, ... }:
 
 {
   home.username = "doggo";
@@ -21,6 +21,7 @@
   nixpkgs.overlays = [
     (import nixtamal.dolphin-overlay)
     (import nixtamal.nix-citizen).overlays.default
+    localPackagesOverlay
   ];
 
   home.packages = with pkgs; [
@@ -30,6 +31,7 @@
       withOpenASAR = true;
       withEquicord = true;
     })
+    #orbolay # Hud overlay for equicord (https://github.com/Equicord/Equicord/blob/main/src/equicordplugins/orbolayBridge/index.tsx)
     kdePackages.qtsvg # Needed for icons in KDE Dolphin
     kdePackages.dolphin
     kdePackages.ark zip unzip

home/doggo/firefox-config.nix

@@ -24,6 +24,38 @@ in
         extensions.force = true;
         userChrome = (builtins.readFile ./firefox_css/userChrome.css);
         userContent = (builtins.readFile ./firefox_css/userContent.css);
+
+        extensions.settings = {
+          "uBlock0@raymondhill.net".settings = {
+            selectedFilterLists = [ # https://github.com/gorhill/uBlock/blob/master/assets/assets.json
+              "ublock-filters"
+              "ublock-badware"
+              "ublock-privacy"
+              "ublock-unbreak"
+              "ublock-quick-fixes"
+              "ublock-experimental"
+              "easylist" "easyprivacy"
+
+              # Filter lists for cookie notices:
+              "adguard-cookies"
+              "ublock-cookies-adguard"
+              "fanboy-cookiemonster"
+              "ublock-cookies-easylist"
+
+              # Annoyances
+              "ublock-annoyances"
+              "adguard-popup-overlays"
+              "adguard-mobile-app-banners"
+              "adguard-other-annoyances"
+              "adguard-widgets"
+              "easylist-annoyances"
+              "easylist-chat"
+              "fanboy-ai-suggestions"
+              "easylist-newsletters"
+              "easylist-notifications"
+            ];
+          };
+        };
       };
     };
 
@@ -44,9 +76,19 @@ in
         "widget.use-xdg-desktop-portal.file-picker" = 1;
         "devtools.chrome.enabled" = true;
         "browser.newtabpage.activity-stream.widgets.enabled" = lock-false;
+        "browser.aboutConfig.showWarning" = lock-false;
 
+        # Performance etc
         "gfx.webrender.all" = lock-true;
         "layers.gpu-process.force-enabled" = lock-true;
+        "network.trr.mode" = 2; # Uses DNS over HTTPS which can maybe make my page loads faster
+      };
+
+      ExtensionSettings = {
+        "uBlock0@raymondhill.net" = {
+          install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi";
+          installation_mode = "force_installed";
+        };
       };
     };
   };

home/doggo/hyprland-config.nix

@@ -51,6 +51,7 @@ in
               hl.exec_cmd("${uwsm} hyprsunset")
               hl.exec_cmd("bash -c 'sleep 1.5s && { [ \"$(date +%H)\" -ge 22 ] || [ \"$(date +%H)\" -lt 6 ]; } && hyprctl hyprsunset temperature 3333'")
               hl.exec_cmd("systemctl --user start hyprpolkitagent")
+              -- hl.exec_cmd("${uwsm} orbolay")
             end
           '')
         ];
@@ -285,6 +286,27 @@ in
             pin        = false;
           };
         }
+        /*
+        {
+          name = "fix-orbolay";
+          match = {
+            title = "^(orbolay)$";
+          };
+          no_initial_focus = true;
+          suppress_event = "activatefocus";
+          float = true;
+          pin = true;
+          center = true;
+          no_blur = true;
+          no_dim = true;
+          no_follow_mouse = true;
+          no_shadow = true;
+          border_size = 0;
+          no_focus = true;
+          move = [ "monitor_w" "monitor_h" ];
+          size = [ "monitor_w - 5" "monitor_h - 5" ];
+        }
+      */
       ];
     };
   };

local_packages/orbolay/package.nix

@@ -0,0 +1,74 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchurl,
+  pkg-config,
+  makeWrapper,
+  libGL,
+  fontconfig,
+  freetype,
+  libx11, wayland,
+  libxkbcommon,
+  libxtst, libxi, libxcb, libxext, libxcursor,
+  libevdev,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname   = "orbolay";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "SpikeHD";
+    repo  = "Orbolay";
+    tag   = "v${finalAttrs.version}";
+    hash  = "sha256-ZyuFa/GeH5QmONuiqeSrM/st30+gaLV0mzgSCsHrU/k=";
+  };
+
+  cargoHash = "sha256-MiwAPSPnugjZnLQBVh3/iJr6Ze28jcldfMITT43iszY=";
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libGL
+    fontconfig
+    freetype
+    libx11 wayland
+    libxkbcommon
+    libxtst libxi libxcb libxext libxcursor
+    libevdev
+  ];
+
+  # Fixes xkbcommon-dl not finding libxkbcommon, and empties WAYLAND_DISPLAY to use Xwayland
+  postInstall = ''
+    wrapProgram $out/bin/orbolay \
+      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [
+        libxkbcommon
+      ]}" \
+      --set WAYLAND_DISPLAY ""
+  '';
+
+  env = {
+    SKIA_BINARIES_URL = "file://${fetchurl {
+      url  = "https://github.com/marc2332/rust-skia/releases/download/0.98.0/skia-binaries-a9bd25883c31d7ac2b2b-x86_64-unknown-linux-gnu-egl-gl-jpegd-jpege-svg-textlayout-vulkan-wayland-webpd-webpe-x11.tar.gz";
+      hash = "sha256-0ZHblarMr0gUfMa0ScDS32+CwzKk7/o7NniH9tWYvYs=";
+    }}";
+  };
+
+  meta = with lib; {
+    description  = "Quick, small, native, multi-platform Discord overlay alternative";
+    homepage     = "https://github.com/SpikeHD/Orbolay";
+    license      = licenses.gpl3Only;
+    platforms    = lib.platforms.linux;
+    mainProgram  = "orbolay";
+    maintainers  = with lib.maintainers; [ Username404-59 ];
+  };
+})

modules/mesa.nix

@@ -1,7 +1,7 @@
 { lib, pkgs, functions, isLaptop, ... }:
 
 let
-  selected_vkDrivers = [ "amd" /* Needed by steam => */ "microsoft-experimental" ] ++ lib.optional (!isLaptop) "intel";
+  selected_vkDrivers = [ "amd" "nouveau" /* Needed by steam => */ "microsoft-experimental" ] ++ lib.optional (!isLaptop) "intel";
   selected_glDrivers = [ "radeonsi" "zink" ] ++ lib.optional (!isLaptop) "i915";
 in
 {

tamal/lock.json

@@ -5,16 +5,16 @@
 ,"catppuccin":{"sn":"catppuccin-src","kd":[1,{"ft":0,"ur":"https://github.com/catppuccin/nix/archive/f2c7dd14ecce785c206a39466cbe227ff62e3803.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-2/Fs6S8wK0GSJvEx1rPMW6KWORM8TZCleAmBxQDs5oA="},"fv":"f2c7dd14ecce785c206a39466cbe227ff62e3803","ps":[]}
 ,"catppuccin-godot":{"sn":"catppuccin-godot-src","kd":[0,{"ft":0,"ur":"https://raw.githubusercontent.com/catppuccin/godot/d8b72b679078f0103a5e5c1ef793c1d698a563b1/themes/Catppuccin%20Mocha.tet","ms":[]}],"ha":{"al":2,"vl":"blake3-WVY58qsBKJlGvir08RYlS+RcjdhFvXz+7YHVfEr6tes="},"fv":"d8b72b679078f0103a5e5c1ef793c1d698a563b1","ps":[]}
 ,"dolphin-overlay":{"sn":"dolphin-overlay-src","kd":[1,{"ft":0,"ur":"https://github.com/rumboon/dolphin-overlay/archive/65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-PCS3mMGsTYXadc/DDU/EQv2T/0YORMigwUP6NEeOJW4="},"fv":"65dd612c8d72d4cf5cb0eb4d9188ed7a16a042dd","ps":["kservice_fix"]}
-,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/8d8a6cc50ddc60748791a14ee1163c865ec57635.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-eWx6FeCkzaLaXpr/Fms0sGFDsF8gwf7xDwORLtDJxoY="},"fv":"8d8a6cc50ddc60748791a14ee1163c865ec57635","ps":[]}
-,"lact-patch":{"sn":"lact-patch-src","kd":[0,{"ft":0,"ur":"https://patch-diff.githubusercontent.com/raw/ilya-zlobintsev/LACT/pull/1080.patch","ms":[]}],"ha":{"al":2,"vl":"blake3-x+HU/32454H6ZHu2i3AkdPECt9Jj4vW0Ac2jTzjpUvk="},"fv":null,"ps":[]}
+,"home-manager":{"sn":"home-manager-src","kd":[1,{"ft":0,"ur":"https://github.com/nix-community/home-manager/archive/4ad9aaae70c9aaab504127f926c0fa9cfbc2b365.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-20slOYEZOXjsi48ytBvFJMxsthykNS1mSzHRjiIBnWE="},"fv":"4ad9aaae70c9aaab504127f926c0fa9cfbc2b365","ps":[]}
+,"lact-patch":{"sn":"lact-patch-src","kd":[0,{"ft":0,"ur":"https://patch-diff.githubusercontent.com/raw/ilya-zlobintsev/LACT/pull/1080.patch","ms":[]}],"ha":{"al":2,"vl":"blake3-x+HU/32454H6ZHu2i3AkdPECt9Jj4vW0Ac2jTzjpUvk="},"fv":"W/735aa2b881ef2024d0d6fcb4d2d48dd4","ps":[]}
 ,"low_latency_layer-git":{"sn":"low_latency_layer-git-src","kd":[1,{"ft":0,"ur":"https://github.com/Korthos-Software/low_latency_layer/archive/3138b14ebd059cd540444771dd184fbf7ead2a12.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-eaek3w60syOHOmRNdCDBTQ+MZw4O9fDGbpirlyuUnoQ="},"fv":"3138b14ebd059cd540444771dd184fbf7ead2a12","ps":[]}
 ,"lsfg-vk-git":{"sn":"lsfg-vk-git-src","kd":[1,{"ft":0,"ur":"https://github.com/PancakeTAS/lsfg-vk/archive/8b0da2661c6f3473a7fccc8ba643880050e71642.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-dABuL3duPZ9m0X6DizXeGCngZdlfcDpDiiuxfeTnlOM="},"fv":"8b0da2661c6f3473a7fccc8ba643880050e71642","ps":[]}
 ,"mesa-git":{"sn":"mesa-git-src","kd":[1,{"ft":0,"ur":"https://gitlab.freedesktop.org/mesa/mesa/-/archive/364ae9647756d9045a632c32370181fd1606fd82/mesa-364ae9647756d9045a632c32370181fd1606fd82.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-VgJgh2pD8fsGL3zil0r71AbvfRm1QbRekrddsNOvMdo="},"fv":"364ae9647756d9045a632c32370181fd1606fd82","ps":[]}
-,"mpv":{"sn":"mpv-src","kd":[1,{"ft":0,"ur":"https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-4u9KCKKEvSoOSO/7oZGIpnuSGcFc2rVmcJfdpFzwc5w="},"fv":null,"ps":["mpv_buffers_fix"]}
+,"mpv":{"sn":"mpv-src","kd":[1,{"ft":0,"ur":"https://github.com/mpv-player/mpv/archive/refs/tags/v0.41.0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-4u9KCKKEvSoOSO/7oZGIpnuSGcFc2rVmcJfdpFzwc5w="},"fv":"e04638a4b4eac258e679673d2a4171bde3f6c41eacb7e3d860c9a435f07eb9da","ps":["mpv_buffers_fix"]}
 ,"nix-cachyos-kernel":{"sn":"nix-cachyos-kernel-src","kd":[1,{"ft":0,"ur":"https://github.com/xddxdd/nix-cachyos-kernel/archive/1740ec90e7b07730c212a3a1ff5e71af08a5270b.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-BvJTecgyIvVSPEdpDqSEItda8zAXxe9GGj2+U6djXu0="},"fv":"1740ec90e7b07730c212a3a1ff5e71af08a5270b","ps":[]}
 ,"nix-cachyos-settings":{"sn":"nix-cachyos-settings-src","kd":[1,{"ft":0,"ur":"https://github.com/Daaboulex/cachyos-settings-nix/archive/07e3eb25c1b9691c044531ffe64ee751680c07a9.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-2odRr94V2UYmWIxIPb07HzETBbotAJu/+jL2+PJdwRM="},"fv":"07e3eb25c1b9691c044531ffe64ee751680c07a9","ps":["adios"]}
 ,"nix-citizen":{"sn":"nix-citizen-src","kd":[1,{"ft":0,"ur":"https://github.com/LovingMelody/nix-citizen/archive/9d93df2ace0c1c2f83b7d03bfee81441d63ec5e0.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-DzYwUEREkRuu14DGa5YO57HXDg7wHjP7rglmG4sAYkU="},"fv":"9d93df2ace0c1c2f83b7d03bfee81441d63ec5e0","ps":[]}
-,"nix-gaming":{"sn":"nix-gaming-src","kd":[1,{"ft":0,"ur":"https://github.com/fufexan/nix-gaming/archive/61f71d2ead011c74acb540e9cac04207fd868ec9.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-ttSCMqAmKi4f8nCKbwenmdLbyfA9kfEaK55gYVSWeao="},"fv":"61f71d2ead011c74acb540e9cac04207fd868ec9","ps":[]}
+,"nix-gaming":{"sn":"nix-gaming-src","kd":[1,{"ft":0,"ur":"https://github.com/fufexan/nix-gaming/archive/f95c6acda72f71f1bc0dbf4391f731e0f03ab4af.tar.gz","ms":[]}],"ha":{"al":2,"vl":"blake3-AhaJ7UIsLU+raCGCP9L4Rns5TSgewpHJ9c7zAwj1QLs="},"fv":"f95c6acda72f71f1bc0dbf4391f731e0f03ab4af","ps":[]}
 }
 ,"p":{
 "mpv_buffers_fix":{"ur":"https://patch-diff.githubusercontent.com/raw/mpv-player/mpv/pull/17303.patch","ha":{"al":2,"vl":"blake3-/y4M5tEZmuhh6q5zvg1lbf/jjdnRulPEoycCBcZm/cQ="}}