updated hyprland to 0.55 because i need something to do

.gitignore

@@ -1 +1,2 @@
 .session
+modules/chataigne/squashfs-root

configs/common.nix

@@ -11,16 +11,32 @@
     /etc/nixos/hardware-configuration.nix
   ];
 
-  # Allow Nix command and flakes (ofc)
-  nix.settings = {
-    cores = 6;
-    experimental-features = [
-      "nix-command"
-      "flakes"
-    ];
+  # Nix settings
+  ## Limit Cores on rebuild and enable Flakes
+  nix = {
+    registry = {
+      voidarc = {
+        from = {
+          id = "voidarc";
+          type = "indirect";
+        };
+        to = {
+          type = "git";
+          url = "https://git.voidarc.co.uk/voidarc/flakes.git";
+        };
+      };
+    };
+    settings = {
+      cores = 6;
+      download-buffer-size = 524288000;
+      experimental-features = [
+        "nix-command"
+        "flakes"
+      ];
+    };
   };
 
-  # Allow unfree packages
+  ## Allow unfree packages and add pkgs.unstable
   nixpkgs = {
     config = {
       allowUnfree = true;
@@ -34,7 +50,7 @@
     };
   };
 
-  # Nix store shit
+  ## Optimise Nix store on rebuild and collect garbage as a service
   nix.optimise.automatic = true;
   nix.gc = {
     automatic = true;
@@ -42,7 +58,7 @@
     options = "--delete-older-than 5d";
   };
 
-  # Boot
+  # Bootloader theming and plymouth
   boot = {
     loader = {
       timeout = 2;
@@ -67,9 +83,13 @@
     };
   };
 
-  # Use latest kernel.
+  ## Use latest kernel
   boot.kernelPackages = pkgs.linuxPackages_latest;
 
+  # Bluetooth and Networking
+  hardware.bluetooth.enable = true;
+  hardware.xpadneo.enable = true;
+
   networking.networkmanager.enable = true;
   networking.networkmanager.dns = "none";
   networking.nameservers = [
@@ -77,14 +97,8 @@
     "8.8.8.8"
   ];
 
-  # Enable bluetooth
-  hardware.bluetooth.enable = true;
-  hardware.xpadneo.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/London";
-
   # Locale
+  time.timeZone = "Europe/London";
   i18n.defaultLocale = "en_GB.UTF-8";
   i18n.extraLocaleSettings = {
     LC_ADDRESS = "en_GB.UTF-8";
@@ -98,23 +112,23 @@
     LC_TIME = "en_GB.UTF-8";
   };
 
-  # Windowing Systems
-  services.xserver.enable = true;
-
-  programs.hyprland = {
-    enable = true;
-    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default;
-  };
-  security.polkit.enable = true;
-
-  # Keymap
+  # Userspace Stuff
+  ## Keymap
   services.xserver.xkb = {
     layout = "gb";
     variant = "";
   };
   console.keyMap = "uk";
 
-  # Pipewire
+  ## Desktop
+  services.xserver.enable = true;
+  programs.hyprland = {
+    enable = true;
+    package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.default;
+  };
+  security.polkit.enable = true;
+
+  ## Audio Server
   services.pulseaudio.enable = false;
   security.rtkit.enable = true;
   services.pipewire = {
@@ -125,6 +139,7 @@
   };
 
   # Local User
+  ## User config
   users.users.user01 = {
     isNormalUser = true;
     shell = pkgs.zsh;
@@ -141,6 +156,12 @@
     packages =
       with pkgs;
       let
+        input =
+          {
+            package,
+            output ? "default",
+          }:
+          inputs.${package}.packages.${pkgs.stdenv.hostPlatform.system}.${output};
         wrap =
           {
             name,
@@ -159,76 +180,91 @@
       in
       [
         # Ricing
+        ## Desktop
         bibata-cursors
         catppuccin-gtk
         waybar
         hyprlock
-        cava
-        cmatrix
-        swaynotificationcenter
-        inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
+        dunst
         wlogout
         wpaperd
-        kando
-        oh-my-posh
+
+        ## Desktop Utilities
         grimblast
+        gsettings-desktop-schemas
+        wl-clipboard
         (wrap {
           name = "otter-launcher";
-          pkg = inputs.otter-launcher.packages.${stdenv.hostPlatform.system}.default;
+          pkg = (
+            input {
+              package = "otter-launcher";
+            }
+          );
           modules = [
             chafa
-            wl-clipboard
             jq
           ];
         })
-        inputs.fsel.packages.${stdenv.hostPlatform.system}.default
+        (input { package = "fsel"; })
 
         # Terminal
+        ## Styling / Functionality
+        oh-my-posh
         carapace
+        zsh-autocomplete
         bat
-        kitty
-        github-cli
-        p7zip
-        bluetuith
-        wget
-        playerctl
-        git
-        fastfetch
-        zellij
-        lsd
-        inputs.doot.packages.${stdenv.hostPlatform.system}.default
-        stow
+
+        ## Tools
+        lazygit
+        p7zip-rar
+        any-nix-shell
+        dysk
+        bluetui
         fzf
         ripgrep
-        zsh-autocomplete
-        nodejs
-        lazygit
-        tailscale
+        wget
+        htop
+        playerctl
+        git
+        lsd
+        (input {
+          package = "doot";
+        })
 
-        # Thunar stuff
-        xfce.thunar
-        xfce.thunar-volman
-        xfce.thunar-vcs-plugin
-        xfce.thunar-archive-plugin
+        ## Other CLI Apps
+        nodejs
+        fastfetch
+        zellij
+        cava
+        cmatrix
+        opencode
+        tailscale
+        syncthing
+        (input { package = "norgolith"; })
+        jellyfin-tui
 
         # Apps
-        pavucontrol
+        ## Actual Useful Stuff
+        nemo
+        kitty
         firefox
-        htop
-        input-remapper
-        tor-browser
         gotify-desktop
-        techmino
+        pavucontrol
         mpv
+        input-remapper
+
+        ## Other Nonsense
+        tor-browser
+        techmino
         prismlauncher
         delfin
-        onlyoffice-desktopeditors
-        syncthing
-        blueman
+        (input {
+          package = "chataigne";
+        })
       ];
   };
 
-  # Zsh
+  ## Zsh
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -245,106 +281,54 @@
       ];
     };
   };
+  users.defaultUserShell = pkgs.zsh;
 
-  # User programs
-  programs.dconf.enable = true;
-  programs.xfconf.enable = true;
+  ## User programs
+  programs = {
+    dconf.enable = true;
+    xfconf.enable = true;
+    gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; # For wlogout svgs
+  };
 
-  # User Services
-  services.gvfs.enable = true;
-  services.tailscale.enable = true;
-  services.printing.enable = true;
-  services.upower.enable = true;
-  services.openssh.enable = true;
-  services.avahi.enable = true;
+  ## User Services
+  services = {
+    gvfs.enable = true;
+    input-remapper.enable = true;
+    tailscale.enable = true;
+    printing.enable = true;
+    upower.enable = true;
+    openssh.enable = true;
+    avahi.enable = true;
+  };
 
-  # Fonts
+  ## Fonts
   fonts.packages = with pkgs; [
     nerd-fonts.fira-mono
   ];
-
   fonts.fontconfig.defaultFonts.serif = [ "Fira Mono Nerd Font" ];
+
+  # System Packages
   environment.systemPackages = with pkgs; [
 
-    (pkgs.symlinkJoin {
-      name = "nvim-with-lsp";
-      paths = [ pkgs.neovim ];
-      buildInputs = [ pkgs.makeWrapper ];
-      postBuild = ''
-        					 export TREE_SITTER_LIB_PATH="/run/current-system/sw/lib"
-                	 wrapProgram $out/bin/nvim \
-                	 --prefix PATH : ${
-                    pkgs.lib.makeBinPath [
-                      # lsps
-                      pkgs.lua-language-server
-                      pkgs.vscode-langservers-extracted
-                      pkgs.emmet-ls
-                      pkgs.prettier
-                      pkgs.black
-                      pkgs.nixfmt
-                      pkgs.nil
-                      pkgs.python313Packages.python-lsp-server
-                      pkgs.typescript-language-server
-                      pkgs.tailwindcss-language-server
-                      pkgs.stylua
-                      pkgs.nixd
-
-                      # other shit
-                      pkgs.lua5_1
-                      pkgs.tree-sitter
-                      pkgs.ripgrep
-                      pkgs.gcc
-                      pkgs.gnumake
-                      pkgs.imagemagick
-                      pkgs.luajitPackages.magick
-                      pkgs.ghostscript
-                      pkgs.luarocks
-                      (pkgs.texlive.combine {
-                        inherit (pkgs.texlive)
-                          scheme-basic
-                          varwidth
-                          preview
-                          mathtools
-                          amsfonts
-                          amscdx
-                          xcolor
-                          dvisvgm
-                          dvipng # for preview and export as html
-                          wrapfig
-                          standalone
-                          graphicxbox
-                          amsmath
-                          ulem
-                          hyperref
-                          capt-of
-                          ;
-                      })
-                    ]
-                  }
-                	 '';
-    })
+    # Utilities
+    inputs.nvim-wrapped.packages.${stdenv.hostPlatform.system}.default
     vim
     unzip
-    python310 # Its python like come on
+    python310
     usbutils
+    curlWithGnuTls
 
-    # Graphics Drivers
+    # System
     mesa
     vulkan-tools
-
-    # FileSystem Dependancies
     gvfs
-
-    # C copmpiler
     clang
-
-    # XDG Desktop Portal Etc
     xdg-desktop-portal
     xdg-desktop-portal-hyprland
-
-    # Other things (from gnome)
     glib
     gnutls
+    liblzf
+    librsvg
     appimage-run
     libnotify
     gsettings-desktop-schemas

configs/configuration-laptop.nix

@@ -40,7 +40,6 @@
     packages = with pkgs; [
       # Ricing
       inputs.way-edges.packages.${stdenv.hostPlatform.system}.way-edges
-      inputs.chataigne.packages.${stdenv.hostPlatform.system}.chataigne
 
       # Terminal
       light
@@ -48,4 +47,6 @@
     ];
   };
 
+  programs.steam.enable = true;
+
 }

configs/configuration-pc.nix

@@ -54,6 +54,61 @@
     };
   };
 
+  # Pipewire stuff
+  services.pipewire.extraConfig.pipewire."97-null-sink" = {
+    "context.objects" = [
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Null-Sink";
+          "node.description" = "Null Sink";
+          "media.class" = "Audio/Sink";
+          "audio.position" = "FL,FR";
+        };
+      }
+      {
+        factory = "adapter";
+        args = {
+          "factory.name" = "support.null-audio-sink";
+          "node.name" = "Null-Source";
+          "node.description" = "Null Source";
+          "media.class" = "Audio/Source";
+          "audio.position" = "FL,FR";
+        };
+      }
+    ];
+  };
+  services.pipewire.extraConfig.pipewire."98-virtual-mic" = {
+    "context.modules" = [
+      {
+        name = "libpipewire-module-loopback";
+        args = {
+          "audio.position" = "FL,FR";
+          "node.description" = "Mumble as Microphone";
+          "capture.props" = {
+            # Mumble's output node name.
+            "node.target" = "Mumble";
+            "node.passive" = true;
+          };
+          "playback.props" = {
+            "node.name" = "Virtual-Mumble-Microphone";
+            "media.class" = "Audio/Source";
+          };
+        };
+      }
+    ];
+  };
+
+  # Mumble server
+  services.murmur = {
+    enable = true;
+    bandwidth = 540000;
+    bonjour = true;
+    password = "mumblepass";
+    autobanTime = 0;
+  };
+
   # Local User
   users.users.user01 = {
     extraGroups = [
@@ -62,6 +117,7 @@
     ];
     packages = with pkgs; [
       bottles
+      mumble
       ferdium
       android-tools
       anki
@@ -69,7 +125,6 @@
       wine64
       delfin
       docker
-      jellyfin-tui
       orca-slicer
       exiftool
       ffmpeg
@@ -93,11 +148,14 @@
     };
   };
 
+  services.unbound = {
+    enable = true;
+  };
+
   services.wivrn = {
     enable = true;
     package = pkgs.unstable.wivrn;
     openFirewall = true;
-    defaultRuntime = true;
   };
 
   virtualisation.docker = {

flake.lock

@@ -20,11 +20,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771610171,
-        "narHash": "sha256-+DeInuhbm6a6PpHDNUS7pozDouq2+8xSDefoNaZLW0E=",
+        "lastModified": 1777499565,
+        "narHash": "sha256-nU55VWk99Pn1QzQDDjFISocC4SgDZ3Xp+zb6ji3JclM=",
         "owner": "hyprwm",
         "repo": "aquamarine",
-        "rev": "7f9eb087703ec4acc6b288d02fa9ea3db803cd3d",
+        "rev": "813c1e8981893c11e118b19c125d6bc282f51765",
         "type": "github"
       },
       "original": {
@@ -33,10 +33,27 @@
         "type": "github"
       }
     },
+    "beaker-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1773884524,
+        "narHash": "sha256-1dnlofWaxI/YRID+WPz2jHZNDyloBubDt/bAQk9ePLU=",
+        "ref": "refs/heads/master",
+        "rev": "abc598baf15d6f8a4de395a27ba34b1e769558e1",
+        "revCount": 21,
+        "shallow": false,
+        "type": "git",
+        "url": "https://git.bwaaa.monster/beaker"
+      },
+      "original": {
+        "shallow": false,
+        "type": "git",
+        "url": "https://git.bwaaa.monster/beaker"
+      }
+    },
     "chataigne": {
       "inputs": {
-        "nixpkgs": "nixpkgs",
-        "pinned-nixpkgs": "pinned-nixpkgs"
+        "nixpkgs": "nixpkgs"
       },
       "locked": {
         "path": "./modules/chataigne",
@@ -159,6 +176,24 @@
         "type": "github"
       }
     },
+    "flake-utils_2": {
+      "inputs": {
+        "systems": "systems_4"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "fsel": {
       "inputs": {
         "flake-utils": "flake-utils",
@@ -166,11 +201,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1772000104,
-        "narHash": "sha256-PKMU7+iiuNf8dacbkIG+OaABs5WomdnHf0uVmUDm/eQ=",
+        "lastModified": 1776619539,
+        "narHash": "sha256-pBQMSlEUICEfmzA+oSonzH0JlAcBjsVE0gT0QwsTNFE=",
         "owner": "Mjoyufull",
         "repo": "fsel",
-        "rev": "e9da4e371997ee8479553433a5bb0b7da3df789a",
+        "rev": "ad49c5d96bb1b1b738c5ce6f4410ecffea8adb5c",
         "type": "github"
       },
       "original": {
@@ -238,11 +273,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1753964049,
-        "narHash": "sha256-lIqabfBY7z/OANxHoPeIrDJrFyYy9jAM4GQLzZ2feCM=",
+        "lastModified": 1776511930,
+        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "44e91d467bdad8dcf8bbd2ac7cf49972540980a5",
+        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
         "type": "github"
       },
       "original": {
@@ -267,11 +302,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770511807,
-        "narHash": "sha256-suKmSbSk34uPOJDTg/GbPrKEJutzK08vj0VoTvAFBCA=",
+        "lastModified": 1776426399,
+        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
         "owner": "hyprwm",
         "repo": "hyprgraphics",
-        "rev": "7c75487edd43a71b61adb01cae8326d277aab683",
+        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
         "type": "github"
       },
       "original": {
@@ -297,11 +332,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1772215399,
-        "narHash": "sha256-iD/OJ5f7cyYluA0aQgTPTYuY0l12oF/mowyzcR8IQOY=",
+        "lastModified": 1778504983,
+        "narHash": "sha256-F70mt2snAYPobaMEEGRJmCqOmqU/zDM31HldpMUIWi0=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "0002f148c9a4fe421a9d33c0faa5528cdc411e62",
+        "rev": "5e441cae538c9396f2ee30338419bec12969608c",
         "type": "github"
       },
       "original": {
@@ -343,11 +378,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1767023960,
-        "narHash": "sha256-R2HgtVS1G3KSIKAQ77aOZ+Q0HituOmPgXW9nBNkpp3Q=",
+        "lastModified": 1776426575,
+        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
         "owner": "hyprwm",
         "repo": "hyprland-guiutils",
-        "rev": "c2e906261142f5dd1ee0bfc44abba23e2754c660",
+        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
         "type": "github"
       },
       "original": {
@@ -368,11 +403,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1765214753,
-        "narHash": "sha256-P9zdGXOzToJJgu5sVjv7oeOGPIIwrd9hAUAP3PsmBBs=",
+        "lastModified": 1772460177,
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
         "owner": "hyprwm",
         "repo": "hyprland-protocols",
-        "rev": "3f3860b869014c00e8b9e0528c7b4ddc335c21ab",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
         "type": "github"
       },
       "original": {
@@ -397,11 +432,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771866172,
-        "narHash": "sha256-fYFoXhQLrm1rD8vSFKQBOEX4OGCuJdLt1amKfHd5GAw=",
+        "lastModified": 1777320127,
+        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "0b219224910e7642eb0ed49f0db5ec3d008e3e41",
+        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
         "type": "github"
       },
       "original": {
@@ -449,11 +484,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1764592794,
-        "narHash": "sha256-7CcO+wbTJ1L1NBQHierHzheQGPWwkIQug/w+fhTAVuU=",
+        "lastModified": 1772462885,
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
         "owner": "hyprwm",
         "repo": "hyprtoolkit",
-        "rev": "5cfe0743f0e608e1462972303778d8a0859ee63e",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
         "type": "github"
       },
       "original": {
@@ -474,11 +509,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771271487,
-        "narHash": "sha256-41gEiUS0Pyw3L/ge1l8MXn61cK14VAhgWB/JV8s/oNI=",
+        "lastModified": 1778234770,
+        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
         "owner": "hyprwm",
         "repo": "hyprutils",
-        "rev": "340a792e3b3d482c4ae5f66d27a9096bdee6d76d",
+        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
         "type": "github"
       },
       "original": {
@@ -499,11 +534,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1770501770,
-        "narHash": "sha256-NWRM6+YxTRv+bT9yvlhhJ2iLae1B1pNH3mAL5wi2rlQ=",
+        "lastModified": 1777159683,
+        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
         "owner": "hyprwm",
         "repo": "hyprwayland-scanner",
-        "rev": "0bd8b6cde9ec27d48aad9e5b4deefb3746909d40",
+        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
         "type": "github"
       },
       "original": {
@@ -528,11 +563,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771606233,
-        "narHash": "sha256-F3PLUqQ/TwgR70U+UeOqJnihJZ2EuunzojYC4g5xHr0=",
+        "lastModified": 1777388329,
+        "narHash": "sha256-40YxVGF2rA9iH3D7am5fy4EOSBbMgpJtJ9yhl0Cx+qI=",
         "owner": "hyprwm",
         "repo": "hyprwire",
-        "rev": "06c7f1f8c4194786c8400653c4efc49dc14c0f3a",
+        "rev": "04be2897e05f9b271d532b5ae56ca088d2eeac02",
         "type": "github"
       },
       "original": {
@@ -563,11 +598,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1769799857,
-        "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
+        "lastModified": 1776200608,
+        "narHash": "sha256-broZ6RFQr4Fv0wT73gGmzNX14A43TmTFF8g4wDKlNss=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
+        "rev": "8b23250ab45c2a38cd91031aee26478ca4d0a28e",
         "type": "github"
       },
       "original": {
@@ -578,16 +613,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
-        "owner": "NixOS",
+        "lastModified": 1773222311,
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
+        "owner": "nixos",
+        "ref": "nixos-25.11",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -657,11 +692,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1771848320,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "lastModified": 1775710090,
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -673,11 +708,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1771848320,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -689,11 +724,11 @@
     },
     "nixpkgs_6": {
       "locked": {
-        "lastModified": 1771043024,
-        "narHash": "sha256-O1XDr7EWbRp+kHrNNgLWgIrB0/US5wvw9K6RERWAj6I=",
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "3aadb7ca9eac2891d52a9dec199d9580a6e2bf44",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
         "type": "github"
       },
       "original": {
@@ -704,6 +739,22 @@
       }
     },
     "nixpkgs_7": {
+      "locked": {
+        "lastModified": 1777578337,
+        "narHash": "sha256-Ad49moKWeXtKBJNy2ebiTQUEgdLyvGmTeykAQ9xM+Z4=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "15f4ee454b1dce334612fa6843b3e05cf546efab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1769461804,
         "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
@@ -719,13 +770,13 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
-        "lastModified": 1771008912,
-        "narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
+        "lastModified": 1769170682,
+        "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a82ccc39b39b621151d6732718e3e250109076fa",
+        "rev": "c5296fdd05cfa2c187990dd909864da9658df755",
         "type": "github"
       },
       "original": {
@@ -735,35 +786,79 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
+    "norgolith": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1756787288,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "lastModified": 1774362592,
+        "narHash": "sha256-yee24/VJaPHKkWr3FravXP2YSqnYpTCQdmGO1SNI30U=",
+        "owner": "NTBBloodbath",
+        "repo": "norgolith",
+        "rev": "f842f65f5279f0ab91631686100b11703bcaaebc",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
+        "owner": "NTBBloodbath",
+        "repo": "norgolith",
         "type": "github"
       }
     },
+    "nvim-wrapped": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_7"
+      },
+      "locked": {
+        "lastModified": 1777901302,
+        "narHash": "sha256-P+UtdUCbVKdTGX37ataQbFoodKlemllmL9pBNHhhD7k=",
+        "ref": "refs/heads/main",
+        "rev": "2e4e260731c5caaf14951ae0959d1e9b7f6bdf63",
+        "revCount": 75,
+        "type": "git",
+        "url": "file:///home/user01/.dotfiles/.config/nvim"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:///home/user01/.dotfiles/.config/nvim"
+      }
+    },
+    "omnisearch": {
+      "inputs": {
+        "beaker-src": "beaker-src",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1774376566,
+        "narHash": "sha256-9MpNFotAXh8pOcYOLivq5UomOS5LbggdsRsNVpRtXAI=",
+        "ref": "refs/heads/master",
+        "rev": "0b426487cafdc5672ba5077228bcf881c605bfbe",
+        "revCount": 68,
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/omnisearch"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.voidarc.co.uk/voidarc/omnisearch"
+      }
+    },
     "otter-launcher": {
       "inputs": {
         "flake-parts": "flake-parts",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs_7",
-        "systems": "systems_4"
+        "nixpkgs": "nixpkgs_8",
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1771555910,
-        "narHash": "sha256-tTqkVD4c8JK5UILju9IF9cXa7eP1S+mehnjWmVHb3sA=",
+        "lastModified": 1776906414,
+        "narHash": "sha256-ImJeI5xbd/w4nchFwc0tSS8v2vYWx/ttwM5uk2BWsCk=",
         "owner": "kuokuo123",
         "repo": "otter-launcher",
-        "rev": "c07b437da5fd466d5eb511fc7a3a2b373c51747c",
+        "rev": "ae647cef5b3c3dd52bedd7a8c881988e412a2dca",
         "type": "github"
       },
       "original": {
@@ -772,23 +867,6 @@
         "type": "github"
       }
     },
-    "pinned-nixpkgs": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1708756934,
-        "narHash": "sha256-WqpheJblJ901Svd5NmLJYLmZ3f4fYLkSOyx9i06+un0=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5171d7b0a9fbaaf216c873622eb5115b6db97957",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "5171d7b0a9fbaaf216c873622eb5115b6db97957",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -799,11 +877,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1771858127,
-        "narHash": "sha256-Gtre9YoYl3n25tJH2AoSdjuwcqij5CPxL3U3xysYD08=",
+        "lastModified": 1776796298,
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
         "owner": "cachix",
         "repo": "git-hooks.nix",
-        "rev": "49bbbfc218bf3856dfa631cead3b052d78248b83",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
         "type": "github"
       },
       "original": {
@@ -820,9 +898,11 @@
         "hyprland": "hyprland",
         "mesa-davinci": "mesa-davinci",
         "nixpkgs": "nixpkgs_6",
+        "norgolith": "norgolith",
+        "nvim-wrapped": "nvim-wrapped",
+        "omnisearch": "omnisearch",
         "otter-launcher": "otter-launcher",
         "sls-steam": "sls-steam",
-        "tree-sitter": "tree-sitter",
         "way-edges": "way-edges"
       }
     },
@@ -866,14 +946,14 @@
     },
     "sls-steam": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1769361037,
-        "narHash": "sha256-dWnjQpGNKEwIMPNoUp765q2QlVRCX58KbNm0ZBrTL80=",
+        "lastModified": 1777454249,
+        "narHash": "sha256-BylCmB2DFgUL+f0JmY50GMuUIaB+Avj52BNs7sd1rrs=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "6aae05be2fa2f8d5f1c5906658a3d41ad30d6352",
+        "rev": "fd38c03f9e667bf7b74127c4fc5b5c75e1bff521",
         "type": "github"
       },
       "original": {
@@ -928,6 +1008,21 @@
       }
     },
     "systems_4": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_5": {
       "locked": {
         "lastModified": 1689347949,
         "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
@@ -942,25 +1037,6 @@
         "type": "github"
       }
     },
-    "tree-sitter": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_9"
-      },
-      "locked": {
-        "lastModified": 1765318765,
-        "narHash": "sha256-RycoHWegJJ6HI+6WeUUphSyo3n0KnDziMNp88YwgVa4=",
-        "owner": "tree-sitter",
-        "repo": "tree-sitter",
-        "rev": "8b8199775f96ca8642cf7860da46100875b38453",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tree-sitter",
-        "ref": "8b8199775f96ca8642cf7860da46100875b38453",
-        "repo": "tree-sitter",
-        "type": "github"
-      }
-    },
     "utils": {
       "inputs": {
         "systems": "systems"
@@ -985,11 +1061,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1770861617,
-        "narHash": "sha256-og1aBdwHGVqgxzsvL7jrOekIY+9/g+Q33MoF4540Lv0=",
+        "lastModified": 1777079101,
+        "narHash": "sha256-FwJ+4YgLncn0iG7dSB5Ax++24DNbxyIBDE7uqr/n80U=",
         "owner": "way-edges",
         "repo": "way-edges",
-        "rev": "0376c84a2f698aa5e9600ed7566d64311361ff0a",
+        "rev": "b7c582094d8999b1a83d6738ec7d7abf1464cf54",
         "type": "github"
       },
       "original": {
@@ -1026,11 +1102,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1761431178,
-        "narHash": "sha256-xzjC1CV3+wpUQKNF+GnadnkeGUCJX+vgaWIZsnz9tzI=",
+        "lastModified": 1777585783,
+        "narHash": "sha256-JTeWRy42VElroJ0rVdZuVXSoTLsx+NzQfGPKMbtn3SU=",
         "owner": "hyprwm",
         "repo": "xdg-desktop-portal-hyprland",
-        "rev": "4b8801228ff958d028f588f0c2b911dbf32297f9",
+        "rev": "fa50d6fbaff8f42c61071b87b034a90d82a33558",
         "type": "github"
       },
       "original": {

flake.nix

@@ -2,24 +2,34 @@
   description = "Master flake for Voidarc nix config";
 
   inputs = {
+    # System
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
-
-    sls-steam = {
-      url = "github:AceSLS/SLSsteam";
+    nvim-wrapped = {
+      url = "git+file:///home/user01/.dotfiles/.config/nvim";
     };
-
     hyprland.url = "github:hyprwm/Hyprland";
 
+    # Apps
+    sls-steam.url = "github:AceSLS/SLSsteam";
     chataigne.url = "./modules/chataigne";
+    norgolith = {
+      url = "github:NTBBloodbath/norgolith";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
-    tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453";
-
+    # Utils
     doot.url = "github:voidarclabs/nixos.doot";
     way-edges.url = "github:way-edges/way-edges";
     otter-launcher.url = "github:kuokuo123/otter-launcher";
     fsel.url = "github:Mjoyufull/fsel";
 
+    # Davinci-resolve
     mesa-davinci.url = "github:nixos/nixpkgs?ref=599ddd2b79331c1e6153e1659bdaab65d62c4c82";
+
+    omnisearch = {
+      url = "git+https://git.voidarc.co.uk/voidarc/omnisearch";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
@@ -53,6 +63,10 @@
           ./configs/configuration-pc.nix
           ./modules/davinci/davinci.nix
           ./modules/i3/i3.nix
+          inputs.omnisearch.nixosModules.default
+          {
+            services.omnisearch.enable = true;
+          }
         ];
       };
     };

modules/chataigne/chataigne.nix

@@ -1,131 +0,0 @@
-{ pkgs, pinnedPkgs, ... }:
-
-let
-  # 1. Define the AppImage source.
-  appImageSrc = ./Chataigne-linux-x64-bleedingedge.AppImage;
-
-  # 2a. Libraries pulled from the modern, current Nixpkgs (for small size).
-  modernLibs = with pkgs; [
-    alsa-lib
-    freetype
-    avahi
-    libglvnd
-    curl
-    SDL2
-    hidapi
-    libXrandr
-  ];
-
-  # 2b. Libraries pulled from the older, pinned package set (ONLY the ones that failed).
-  pinnedCurlLibs = with pinnedPkgs; [
-    curlWithGnuTls # This is the critical component for the CURL_GNUTLS_3 symbol.
-    gnutls
-  ];
-
-  # 3. Combine the modern runtime dependencies with the pinned compatibility libraries.
-  appImageDeps = [
-    pkgs.steam-run
-    pkgs.stdenv.cc.cc.lib # Ensures the modern C++ runtime is available
-  ]
-  ++ modernLibs
-  ++ pinnedCurlLibs;
-
-  chataigneDesktopItem = {
-    desktopName = "Chataigne";
-    name = "chataigne";
-    exec = "chataigne"; # The name of the wrapper script in $out/bin
-    icon = "chataigne"; # The name of the icon file (without extension)
-    genericName = "Creative Control Software";
-    comment = "Control and experiment with creative applications, hardware, and media.";
-    categories = [
-      "AudioVideo"
-      "Development"
-    ];
-  };
-
-in
-
-# 4. Create the final runnable derivation
-pkgs.stdenv.mkDerivation {
-  pname = "chataigne-runner";
-  version = "1.0";
-
-  # --- Attributes needed for AppImage running (not compiling) ---
-  src = ./.;
-  dontUnpack = true;
-  dontBuild = true;
-  # --------------------------------------------------
-
-  # Inject the combined dependencies into the environment
-  buildInputs = appImageDeps;
-
-  # The install phase creates an executable wrapper script, extracts the AppImage,
-  # and now handles the desktop file and icon.
-  installPhase = ''
-        mkdir -p $out/bin
-        
-        # --- STRATEGY: Extract AppImage contents to bypass FUSE, then fix LD_LIBRARY_PATH ---
-        echo "Extracting AppImage contents to bypass FUSE requirement..."
-        
-        # Use the absolute Nix Store path of the AppImage
-        ${appImageSrc} --appimage-extract
-        echo "appimage extracted"
-        
-        # 2. Check if extraction worked and move the content to $out
-        if [ ! -d "squashfs-root" ]; then
-          echo "Extraction failed. The AppImage may not support --appimage-extract."
-          exit 1
-        fi
-        
-        # 2. CRITICAL FIX: Manually create and install the .desktop file
-        mkdir -p $out/share/applications
-        
-        # pkgs.lib.makeDesktopItem takes the metadata and creates a small derivation
-        # We copy the resulting .desktop file from that derivation's output path ($desktop_file_path)
-        local desktop_file_path="${pkgs.makeDesktopItem chataigneDesktopItem}"
-
-        # The file is typically named $name.desktop inside the share/applications folder of the new derivation
-        cp $desktop_file_path/share/applications/chataigne.desktop $out/share/applications/
-
-        # Copy the extracted contents into the output directory
-        cp -r squashfs-root $out/
-
-        # --- DESKTOP ENTRY & ICON (NEW) ---
-        echo "Processing icon and desktop file..."
-
-        # AppImages usually place the icon in squashfs-root/.DirIcon or similar
-        # We will assume it's in the root of the extracted content.
-        local icon_source="$out/squashfs-root/.DirIcon"
-        local icon_target="$out/share/icons/hicolor/128x128/apps/chataigne.png" # Standard location
-        
-        # Use the icon if it exists (AppImages often use a .png or .svg)
-        if [ -f "$icon_source" ]; then
-            mkdir -p "$(dirname "$icon_target")"
-            cp "$icon_source" "$icon_target"
-        else
-            echo "Warning: Could not find icon at $icon_source. Using default/no icon."
-        fi
-        # ----------------------------------
-
-        # 3. Create the 'chataigne' executable wrapper
-        cat > $out/bin/chataigne << EOF
-    #!${pkgs.stdenv.shell}
-        
-    # The LD_LIBRARY_PATH is created using all dependencies (excluding the wrapper 'steam-run').
-    # This ensures the AppImage finds the pinned CURL library.
-    export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath (pkgs.lib.remove pkgs.steam-run appImageDeps)}:$LD_LIBRARY_PATH"
-
-    # Use steam-run to launch the main execution script inside the extracted folder.
-    exec ${pkgs.steam-run}/bin/steam-run "$out/squashfs-root/AppRun" "\$@"
-    EOF
-        
-        chmod +x $out/bin/chataigne
-  '';
-
-  meta = {
-    description = "Declarative runner for the Chataigne AppImage, providing necessary dependencies.";
-    homepage = "https://chataigne.io/"; # Example: Add the actual homepage
-    license = pkgs.lib.licenses.unfree; # AppImages are often proprietary/unfree
-    platforms = [ "x86_64-linux" ];
-  };
-}

modules/chataigne/flake.lock

@@ -0,0 +1,27 @@
+{
+  "nodes": {
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1773222311,
+        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "0590cd39f728e129122770c029970378a79d076a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

modules/chataigne/flake.nix

@@ -1,51 +1,82 @@
 {
-  description = "A flake for running the Chataigne AppImage with necessary patched dependencies.";
+  description = "Local wrapper for Chataigne AppImage";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; # Modern Nixpkgs
-
-    # Pinned Nixpkgs for compatibility (the commit that fixes the CURL_GNUTLS_3 issue)
-    pinned-nixpkgs = {
-      url = "github:NixOS/nixpkgs/5171d7b0a9fbaaf216c873622eb5115b6db97957";
-      flake = false; # Treat as a tarball input, not a flake
-    };
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
   };
 
   outputs =
-    {
-      self,
-      nixpkgs,
-      pinned-nixpkgs,
-      ...
-    }:
+    { self, nixpkgs }:
     let
-      # Supported systems
-      supportedSystems = [ "x86_64-linux" ];
+      system = "x86_64-linux";
+      pkgs = import nixpkgs { inherit system; };
 
-      # The main package definition logic is imported as a function
-      chataigne-appimage-runner = import ./chataigne.nix;
+      # The libraries you requested
+      deps = with pkgs; [
+        curlFull
+        gnutls
+        libxrandr
+        alsa-lib
+        freetype
+        avahi
+        libglvnd
+        curl
+        SDL2
+        hidapi
+        libpulseaudio
+        lz4
+        openssl
+        libcap
+        libxcrypt
+        libgcrypt
+        libbsd
+        zlib
+        glib
+      ];
 
-      # Function to generate the package set for each system
-      forAllSystems = f: nixpkgs.lib.genAttrs supportedSystems (system: f system);
+      # Wrap the local AppImage file
+      chataigne-bin = pkgs.appimageTools.wrapType2 {
+        pname = "chataigne";
+        version = "1.10.3";
+        # This points to the file in the same directory as flake.nix
+        src = ./Chataigne-linux-x64-1.10.3.AppImage;
+        extraPkgs = pkgs: deps;
+      };
+
+      # Create the Desktop Entry
+      chataigne-desktop = pkgs.makeDesktopItem {
+        name = "chataigne";
+        exec = "chataigne";
+        icon = "chataigne";
+        comment = "Modular machine for art and technology";
+        desktopName = "Chataigne";
+        categories = [
+          "AudioVideo"
+          "Development"
+        ];
+      };
     in
     {
-      packages = forAllSystems (
-        system:
-        let
-          pkgs = import nixpkgs {
-            inherit system;
-            config.allowUnfree = true;
-          };
-          pinnedPkgs = import pinned-nixpkgs { inherit system; };
-        in
-        {
-          chataigne = chataigne-appimage-runner {
-            inherit pkgs pinnedPkgs;
-          };
+      # packages.${system}.default = chataigne-bin;
 
-          # Also expose the default package for convenience
-          default = self.packages.${system}.chataigne;
-        }
-      );
+      devShells.${system}.default = pkgs.mkShell {
+        # Packages you want available in your shell
+        buildInputs = [
+          chataigne-bin
+        ];
+
+        # Environmental variables or shell hooks
+        shellHook = ''
+          echo "something"
+        '';
+      };
+      # This allows you to run 'nix run' or install it via system config
+      packages.${system}.default = pkgs.symlinkJoin {
+        name = "chataigne";
+        paths = [
+          chataigne-bin
+          chataigne-desktop
+        ];
+      };
     };
 }

modules/davinci/davinci.nix

@@ -18,6 +18,7 @@ let
           allowUnfree = true;
         };
       };
+
   ffmpeg-encoder-plugin = pkgs.stdenv.mkDerivation (finalAttrs: {
     pname = "ffmpeg-encoder-plugin";
     version = "1.2.1";
@@ -25,24 +26,16 @@ let
     src = pkgs.fetchFromGitHub {
       owner = "EdvinNilsson";
       repo = "ffmpeg_encoder_plugin";
-      tag = "v${finalAttrs.version}";
+      rev = "v${finalAttrs.version}";
       hash = "sha256-F4Q8YCXD5UldTwLbWK4nHacNPQ/B+4yLL96sq7xZurM=";
     };
 
-    nativeBuildInputs = with pkgs; [
-      cmake
-      ffmpeg-full
-    ];
-
-    buildInputs = with pkgs; [ ffmpeg ];
+    nativeBuildInputs = [ pkgs.cmake ];
+    buildInputs = [ pkgs.ffmpeg-full ];
 
     installPhase = ''
-      runHook preInstall
-
       mkdir -p $out
       cp ffmpeg_encoder_plugin.dvcp $out/
-
-      runHook postInstall
     '';
   });
 
@@ -56,17 +49,17 @@ let
         #
         # Note: $out IS /opt/resolve
         postInstall = ''
-          ${old.postInstall or ""}
-          ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\xe8\x21\x23\x00\x00/\xeb\x11\xe8\x21\x23\x00\x00/g' $out/bin/resolve
-          ${lib.getExe pkgs.perl} -pi -e 's/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\x74\x11\x48\x8B\x45\xC8\x8B/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\xEB\x11\x48\x8B\x45\xC8\x8B/' $out/bin/resolve
-          ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/\xEB\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/' $out/bin/resolve
-          ${lib.getExe pkgs.perl} -pi -e 's/\x41\xb6\x01\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/\x41\xb6\x00\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/' $out/bin/resolve
-          touch $out/.license/blackmagic.lic
-          echo -e "LICENSE blackmagic davinciresolvestudio 999999 permanent uncounted\n  hostid=ANY issuer=CGP customer=CGP issued=28-dec-2023\n  akey=0000-0000-0000-0000 _ck=00 sig=\"00\"" > $out/.license/blackmagic.lic
+                    ${old.postInstall or ""}
+                    ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\xe8\x21\x23\x00\x00/\xeb\x11\xe8\x21\x23\x00\x00/g' $out/bin/resolve
+                    ${lib.getExe pkgs.perl} -pi -e 's/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\x74\x11\x48\x8B\x45\xC8\x8B/\x03\x00\x89\x45\xFC\x83\x7D\xFC\x00\xEB\x11\x48\x8B\x45\xC8\x8B/' $out/bin/resolve
+                    ${lib.getExe pkgs.perl} -pi -e 's/\x74\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/\xEB\x11\x48\x8B\x45\xC8\x8B\x55\xFC\x89\x50\x58\xB8\x00\x00\x00/' $out/bin/resolve
+                    ${lib.getExe pkgs.perl} -pi -e 's/\x41\xb6\x01\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/\x41\xb6\x00\x84\xc0\x0f\x84\xb0\x00\x00\x00\x48\x85\xdb\x74\x08\x45\x31\xf6\xe9\xa3\x00\x00\x00/' $out/bin/resolve
+                    touch $out/.license/blackmagic.lic
+                    echo -e "LICENSE blackmagic davinciresolvestudio 999999 permanent uncounted\n  hostid=ANY issuer=CGP customer=CGP issued=28-dec-2023\n  akey=0000-0000-0000-0000 _ck=00 sig=\"00\"" > $out/.license/blackmagic.lic
 
-          mkdir -p $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
-          cp ${ffmpeg-encoder-plugin}/ffmpeg_encoder_plugin.dvcp $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
-        '';
+          					mkdir -p $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64
+          					cp ${ffmpeg-encoder-plugin}/ffmpeg_encoder_plugin.dvcp $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
+          					'';
       });
     in