updated hyprland to 0.55 because i need something to do

configs/common.nix

@@ -11,16 +11,32 @@
     /etc/nixos/hardware-configuration.nix
   ];
 
-  # Allow Nix command and flakes (ofc)
+  # Nix settings
-  nix.settings = {
+  ## Limit Cores on rebuild and enable Flakes
-    cores = 6;
+  nix = {
-    experimental-features = [
+    registry = {
-      "nix-command"
+      voidarc = {
-      "flakes"
+        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
+  # Userspace Stuff
-  services.xserver.enable = true;
+  ## Keymap
-
-  programs.hyprland = {
-    enable = true;
-    package = pkgs.unstable.hyprland;
-  };
-  security.polkit.enable = true;
-
-  # 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;
@@ -165,23 +180,19 @@
       in
       [
         # Ricing
+        ## Desktop
         bibata-cursors
         catppuccin-gtk
         waybar
-        unstable.ironbar
         hyprlock
-        cava
+        dunst
-        cmatrix
+        wlogout
-        swaynotificationcenter
-        (input {
-          package = "chataigne";
-        })
-        wlogout # To be removed
-        wleave
         wpaperd
-        kando
+
-        oh-my-posh
+        ## Desktop Utilities
         grimblast
+        gsettings-desktop-schemas
+        wl-clipboard
         (wrap {
           name = "otter-launcher";
           pkg = (
@@ -194,60 +205,66 @@
             jq
           ];
         })
-        (input {
+        (input { package = "fsel"; })
-          package = "fsel";
-        })
 
         # Terminal
+        ## Styling / Functionality
+        oh-my-posh
         carapace
+        zsh-autocomplete
         bat
-        kitty
+
-        github-cli
+        ## Tools
-        wl-clipboard
+        lazygit
-        p7zip
+        p7zip-rar
-        bluetuith
+        any-nix-shell
+        dysk
+        bluetui
+        fzf
+        ripgrep
         wget
+        htop
         playerctl
         git
-        fastfetch
-        zellij
         lsd
         (input {
           package = "doot";
         })
-        stow
-        fzf
-        ripgrep
-        zsh-autocomplete
-        nodejs
-        lazygit
-        tailscale
 
-        # Thunar stuff
+        ## Other CLI Apps
-        xfce.thunar
+        nodejs
-        xfce.thunar-volman
+        fastfetch
-        xfce.thunar-vcs-plugin
+        zellij
-        xfce.thunar-archive-plugin
+        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
+        (input {
-        syncthing
+          package = "chataigne";
-        blueman
+        })
-        jellyfin-tui
       ];
   };
 
-  # Zsh
+  ## Zsh
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -264,52 +281,54 @@
       ];
     };
   };
+  users.defaultUserShell = pkgs.zsh;
 
-  # User programs
+  ## User programs
-  programs.dconf.enable = true;
+  programs = {
-  programs.xfconf.enable = true;
+    dconf.enable = true;
+    xfconf.enable = true;
+    gdk-pixbuf.modulePackages = [ pkgs.librsvg ]; # For wlogout svgs
+  };
 
-  # User Services
+  ## User Services
-  services.gvfs.enable = true;
+  services = {
-  services.tailscale.enable = true;
+    gvfs.enable = true;
-  services.printing.enable = true;
+    input-remapper.enable = true;
-  services.upower.enable = true;
+    tailscale.enable = true;
-  services.openssh.enable = true;
+    printing.enable = true;
-  services.avahi.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; [
 
+    # 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

@@ -47,4 +47,6 @@
     ];
   };
 
+  programs.steam.enable = true;
+
 }

configs/configuration-pc.nix

@@ -119,7 +119,6 @@
       bottles
       mumble
       ferdium
-			audacity
       android-tools
       anki
       vesktop
@@ -149,11 +148,14 @@
     };
   };
 
+  services.unbound = {
+    enable = true;
+  };
+
   services.wivrn = {
     enable = true;
     package = pkgs.unstable.wivrn;
     openFirewall = true;
-    defaultRuntime = true;
   };
 
   virtualisation.docker = {

flake.lock

@@ -1,5 +1,56 @@
 {
   "nodes": {
+    "aquamarine": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777499565,
+        "narHash": "sha256-nU55VWk99Pn1QzQDDjFISocC4SgDZ3Xp+zb6ji3JclM=",
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "rev": "813c1e8981893c11e118b19c125d6bc282f51765",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "aquamarine",
+        "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"
@@ -73,6 +124,22 @@
         "type": "github"
       }
     },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": "nixpkgs-lib"
@@ -109,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",
@@ -116,11 +201,11 @@
         "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1773279064,
+        "lastModified": 1776619539,
-        "narHash": "sha256-BLcSfp2aNm+0oDoHbvTufBRS2XwKqbIeUOXD8t58efE=",
+        "narHash": "sha256-pBQMSlEUICEfmzA+oSonzH0JlAcBjsVE0gT0QwsTNFE=",
         "owner": "Mjoyufull",
         "repo": "fsel",
-        "rev": "7b38c6223eed6e509f98e066ff89f481bd1930d7",
+        "rev": "ad49c5d96bb1b1b738c5ce6f4410ecffea8adb5c",
         "type": "github"
       },
       "original": {
@@ -129,6 +214,28 @@
         "type": "github"
       }
     },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -150,6 +257,325 @@
         "type": "github"
       }
     },
+    "hyprcursor": {
+      "inputs": {
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776511930,
+        "narHash": "sha256-fCpwFiTW0rT7oKJqr3cqHMnkwypSwQKpbtUEtxdkgrM=",
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "rev": "39435900785d0c560c6ae8777d29f28617d031ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprcursor",
+        "type": "github"
+      }
+    },
+    "hyprgraphics": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776426399,
+        "narHash": "sha256-RUESLKNikIeEq9ymGJ6nmcDXiSFQpUW1IhJ245nL3xM=",
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "rev": "68d064434787cf1ed4a2fe257c03c5f52f33cf84",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprgraphics",
+        "type": "github"
+      }
+    },
+    "hyprland": {
+      "inputs": {
+        "aquamarine": "aquamarine",
+        "hyprcursor": "hyprcursor",
+        "hyprgraphics": "hyprgraphics",
+        "hyprland-guiutils": "hyprland-guiutils",
+        "hyprland-protocols": "hyprland-protocols",
+        "hyprlang": "hyprlang",
+        "hyprutils": "hyprutils",
+        "hyprwayland-scanner": "hyprwayland-scanner",
+        "hyprwire": "hyprwire",
+        "nixpkgs": "nixpkgs_5",
+        "pre-commit-hooks": "pre-commit-hooks",
+        "systems": "systems_3",
+        "xdph": "xdph"
+      },
+      "locked": {
+        "lastModified": 1778504983,
+        "narHash": "sha256-F70mt2snAYPobaMEEGRJmCqOmqU/zDM31HldpMUIWi0=",
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "rev": "5e441cae538c9396f2ee30338419bec12969608c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "Hyprland",
+        "type": "github"
+      }
+    },
+    "hyprland-guiutils": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprtoolkit": "hyprtoolkit",
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776426575,
+        "narHash": "sha256-KI6nIfVihn/DPaeB5Et46Xg3dkNHrrEtUd5LBBVomB0=",
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "rev": "a968d211048e3ed538e47b84cb3649299578f19d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-guiutils",
+        "type": "github"
+      }
+    },
+    "hyprland-protocols": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772460177,
+        "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprland-protocols",
+        "type": "github"
+      }
+    },
+    "hyprlang": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777320127,
+        "narHash": "sha256-Qu+Wf2Bp5qUjyn2YpZNq8a7JyzTGowhT1knrwE38a9U=",
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "rev": "090117506ddc3d7f26e650ff344d378c2ec329cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprlang",
+        "type": "github"
+      }
+    },
+    "hyprtoolkit": {
+      "inputs": {
+        "aquamarine": [
+          "hyprland",
+          "hyprland-guiutils",
+          "aquamarine"
+        ],
+        "hyprgraphics": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprgraphics"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprland-guiutils",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "hyprland-guiutils",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "hyprland-guiutils",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772462885,
+        "narHash": "sha256-5pHXrQK9zasMnIo6yME6EOXmWGFMSnCITcfKshhKJ9I=",
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "rev": "9af245a69fa6b286b88ddfc340afd288e00a6998",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprtoolkit",
+        "type": "github"
+      }
+    },
+    "hyprutils": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1778234770,
+        "narHash": "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE=",
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "rev": "a2dbd8a4cc51f7cbe4224732668392bb1aa79df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprutils",
+        "type": "github"
+      }
+    },
+    "hyprwayland-scanner": {
+      "inputs": {
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777159683,
+        "narHash": "sha256-Jxixw6wZphUp+nHYxOKUYSckL17QMBx2d5Zp0rJHr1g=",
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "rev": "b8632713a6beaf28b56f2a7b0ab2fb7088dbb404",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwayland-scanner",
+        "type": "github"
+      }
+    },
+    "hyprwire": {
+      "inputs": {
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777388329,
+        "narHash": "sha256-40YxVGF2rA9iH3D7am5fy4EOSBbMgpJtJ9yhl0Cx+qI=",
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "rev": "04be2897e05f9b271d532b5ae56ca088d2eeac02",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "hyprwire",
+        "type": "github"
+      }
+    },
     "mesa-davinci": {
       "locked": {
         "lastModified": 1754501210,
@@ -172,11 +598,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1769799857,
+        "lastModified": 1776200608,
-        "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
+        "narHash": "sha256-broZ6RFQr4Fv0wT73gGmzNX14A43TmTFF8g4wDKlNss=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
+        "rev": "8b23250ab45c2a38cd91031aee26478ca4d0a28e",
         "type": "github"
       },
       "original": {
@@ -266,11 +692,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1771848320,
+        "lastModified": 1775710090,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
+        "narHash": "sha256-ar3rofg+awPB8QXDaFJhJ2jJhu+KqN/PRCXeyuXR76E=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "4c1018dae018162ec878d42fec712642d214fdfa",
         "type": "github"
       },
       "original": {
@@ -282,27 +708,11 @@
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1773222311,
+        "lastModified": 1777954456,
-        "narHash": "sha256-BHoB/XpbqoZkVYZCfXJXfkR+GXFqwb/4zbWnOr2cRcU=",
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
-        "owner": "nixos",
-        "repo": "nixpkgs",
-        "rev": "0590cd39f728e129122770c029970378a79d076a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixos",
-        "ref": "nixos-25.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_6": {
-      "locked": {
-        "lastModified": 1771848320,
-        "narHash": "sha256-0MAd+0mun3K/Ns8JATeHT1sX28faLII5hVLq0L3BdZU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2fc6539b481e1d2569f25f8799236694180c0993",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -312,7 +722,39 @@
         "type": "github"
       }
     },
+    "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1777428379,
+        "narHash": "sha256-ypxFOeDz+CqADEQNL72haqGjvZQdBR5Vc7pyx2JDttI=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "755f5aa91337890c432639c60b6064bb7fe67769",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-25.11",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "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=",
@@ -328,7 +770,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1769170682,
         "narHash": "sha256-oMmN1lVQU0F0W2k6OI3bgdzp2YOHWYUAw79qzDSjenU=",
@@ -344,31 +786,37 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
+    "norgolith": {
+      "inputs": {
+        "flake-utils": "flake-utils_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
       "locked": {
-        "lastModified": 1756787288,
+        "lastModified": 1774362592,
-        "narHash": "sha256-rw/PHa1cqiePdBxhF66V7R+WAP8WekQ0mCDG4CFqT8Y=",
+        "narHash": "sha256-yee24/VJaPHKkWr3FravXP2YSqnYpTCQdmGO1SNI30U=",
-        "owner": "NixOS",
+        "owner": "NTBBloodbath",
-        "repo": "nixpkgs",
+        "repo": "norgolith",
-        "rev": "d0fc30899600b9b3466ddb260fd83deb486c32f1",
+        "rev": "f842f65f5279f0ab91631686100b11703bcaaebc",
         "type": "github"
       },
       "original": {
-        "owner": "NixOS",
+        "owner": "NTBBloodbath",
-        "ref": "nixos-unstable",
+        "repo": "norgolith",
-        "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nvim-wrapped": {
       "inputs": {
-        "nixpkgs": "nixpkgs_6"
+        "nixpkgs": "nixpkgs_7"
       },
       "locked": {
-        "lastModified": 1772709070,
+        "lastModified": 1777901302,
-        "narHash": "sha256-HXlGlbDVKMdw1ENgYu6gM3jyw+nPoam25SsgzRhtEG8=",
+        "narHash": "sha256-P+UtdUCbVKdTGX37ataQbFoodKlemllmL9pBNHhhD7k=",
-        "rev": "68a7427e800f07d09a85a6014006d67c9350eaeb",
+        "ref": "refs/heads/main",
-        "revCount": 50,
+        "rev": "2e4e260731c5caaf14951ae0959d1e9b7f6bdf63",
+        "revCount": 75,
         "type": "git",
         "url": "file:///home/user01/.dotfiles/.config/nvim"
       },
@@ -377,19 +825,40 @@
         "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",
+        "nixpkgs": "nixpkgs_8",
-        "systems": "systems_3"
+        "systems": "systems_5"
       },
       "locked": {
-        "lastModified": 1771555910,
+        "lastModified": 1776906414,
-        "narHash": "sha256-tTqkVD4c8JK5UILju9IF9cXa7eP1S+mehnjWmVHb3sA=",
+        "narHash": "sha256-ImJeI5xbd/w4nchFwc0tSS8v2vYWx/ttwM5uk2BWsCk=",
         "owner": "kuokuo123",
         "repo": "otter-launcher",
-        "rev": "c07b437da5fd466d5eb511fc7a3a2b373c51747c",
+        "rev": "ae647cef5b3c3dd52bedd7a8c881988e412a2dca",
         "type": "github"
       },
       "original": {
@@ -398,17 +867,42 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1776796298,
+        "narHash": "sha256-PcRvlWayisPSjd0UcRQbhG8Oqw78AcPE6x872cPRHN8=",
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "rev": "3cfd774b0a530725a077e17354fbdb87ea1c4aad",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "git-hooks.nix",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "chataigne": "chataigne",
         "doot": "doot",
         "fsel": "fsel",
+        "hyprland": "hyprland",
         "mesa-davinci": "mesa-davinci",
-        "nixpkgs": "nixpkgs_5",
+        "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"
       }
     },
@@ -452,14 +946,14 @@
     },
     "sls-steam": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8"
+        "nixpkgs": "nixpkgs_9"
       },
       "locked": {
-        "lastModified": 1773139650,
+        "lastModified": 1777454249,
-        "narHash": "sha256-lTzwHjwgzXpV0loeMShR6a/bhx6uJq+cM61av6rLF/A=",
+        "narHash": "sha256-BylCmB2DFgUL+f0JmY50GMuUIaB+Avj52BNs7sd1rrs=",
         "owner": "AceSLS",
         "repo": "SLSsteam",
-        "rev": "d85028aef70128a17d26afb1f2af27d1375355c9",
+        "rev": "fd38c03f9e667bf7b74127c4fc5b5c75e1bff521",
         "type": "github"
       },
       "original": {
@@ -513,22 +1007,33 @@
         "type": "github"
       }
     },
-    "tree-sitter": {
+    "systems_4": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_9"
-      },
       "locked": {
-        "lastModified": 1765318765,
+        "lastModified": 1681028828,
-        "narHash": "sha256-RycoHWegJJ6HI+6WeUUphSyo3n0KnDziMNp88YwgVa4=",
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "tree-sitter",
+        "owner": "nix-systems",
-        "repo": "tree-sitter",
+        "repo": "default",
-        "rev": "8b8199775f96ca8642cf7860da46100875b38453",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
         "type": "github"
       },
       "original": {
-        "owner": "tree-sitter",
+        "owner": "nix-systems",
-        "ref": "8b8199775f96ca8642cf7860da46100875b38453",
+        "repo": "default",
-        "repo": "tree-sitter",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
         "type": "github"
       }
     },
@@ -556,11 +1061,11 @@
         "rust-overlay": "rust-overlay"
       },
       "locked": {
-        "lastModified": 1773029731,
+        "lastModified": 1777079101,
-        "narHash": "sha256-hyJUYQb51mQ9tozxMkMUNiJaeErjo+2codRSquvKuNY=",
+        "narHash": "sha256-FwJ+4YgLncn0iG7dSB5Ax++24DNbxyIBDE7uqr/n80U=",
         "owner": "way-edges",
         "repo": "way-edges",
-        "rev": "dfcbee00286c57735db3b5786cfbc4f1d587503a",
+        "rev": "b7c582094d8999b1a83d6738ec7d7abf1464cf54",
         "type": "github"
       },
       "original": {
@@ -568,6 +1073,47 @@
         "repo": "way-edges",
         "type": "github"
       }
+    },
+    "xdph": {
+      "inputs": {
+        "hyprland-protocols": [
+          "hyprland",
+          "hyprland-protocols"
+        ],
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
+        "hyprutils": [
+          "hyprland",
+          "hyprutils"
+        ],
+        "hyprwayland-scanner": [
+          "hyprland",
+          "hyprwayland-scanner"
+        ],
+        "nixpkgs": [
+          "hyprland",
+          "nixpkgs"
+        ],
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
+      },
+      "locked": {
+        "lastModified": 1777585783,
+        "narHash": "sha256-JTeWRy42VElroJ0rVdZuVXSoTLsx+NzQfGPKMbtn3SU=",
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "rev": "fa50d6fbaff8f42c61071b87b034a90d82a33558",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hyprwm",
+        "repo": "xdg-desktop-portal-hyprland",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -2,23 +2,34 @@
   description = "Master flake for Voidarc nix config";
 
   inputs = {
+    # System
     nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
+    nvim-wrapped = {
+      url = "git+file:///home/user01/.dotfiles/.config/nvim";
+    };
+    hyprland.url = "github:hyprwm/Hyprland";
 
-    sls-steam = {
+    # Apps
-      url = "github:AceSLS/SLSsteam";
+    sls-steam.url = "github:AceSLS/SLSsteam";
+    chataigne.url = "./modules/chataigne";
+    norgolith = {
+      url = "github:NTBBloodbath/norgolith";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    chataigne.url = "./modules/chataigne";
+    # Utils
-    nvim-wrapped.url = "git+file:///home/user01/.dotfiles/.config/nvim";
-
-    tree-sitter.url = "github:tree-sitter/tree-sitter?ref=8b8199775f96ca8642cf7860da46100875b38453";
-
     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 =
@@ -52,6 +63,10 @@
           ./configs/configuration-pc.nix
           ./modules/davinci/davinci.nix
           ./modules/i3/i3.nix
+          inputs.omnisearch.nixosModules.default
+          {
+            services.omnisearch.enable = true;
+          }
         ];
       };
     };

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; [
+    nativeBuildInputs = [ pkgs.cmake ];
-      cmake
+    buildInputs = [ pkgs.ffmpeg-full ];
-      ffmpeg-full
-    ];
-
-    buildInputs = with pkgs; [ ffmpeg ];
 
     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 ""}
+                    ${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/\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/\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/\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
+                    ${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
+                    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
+                    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/
+          					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/
+          					cp ${ffmpeg-encoder-plugin}/ffmpeg_encoder_plugin.dvcp $out/IOPlugins/ffmpeg_encoder_plugin.dvcp.bundle/Contents/Linux-x86-64/
-        '';
+          					'';
       });
     in