diff --git a/flake.lock b/flake.lock index 7f7271a0..3450ad3a 100644 Binary files a/flake.lock and b/flake.lock differ diff --git a/flake.nix b/flake.nix index f7fd0577..31fe2bec 100644 Binary files a/flake.nix and b/flake.nix differ diff --git a/inputs.nix b/inputs.nix index 83472653..4e8f0886 100644 --- a/inputs.nix +++ b/inputs.nix @@ -133,9 +133,12 @@ let submodules = true; }; - hypr-official-plugins = mkHyprDep { + hyprland-plugins = mkHyprDep { owner = "hyprwm"; repo = "hyprland-plugins"; + + # type = "path"; + # path = "/home/matt/git/hyprland-plugins"; }; Hyprspace = mkHyprDep { @@ -264,7 +267,7 @@ let { owner = "Godiesc"; repo = "firefox-gx"; - rev = "dde9941d4bf78b94d76bf06cccb2d1dce5372c56"; + ref = "v.9.2"; } { name = "git-theme-src"; diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix index f8e27403..48093950 100644 --- a/modules/hyprland/default.nix +++ b/modules/hyprland/default.nix @@ -65,9 +65,13 @@ in { # HOME-MANAGER CONFIG home-manager.users.${mainUser} = { imports = [ + ./dev.nix + + # Plugins ./hyprgrass.nix ./hyprexpo.nix # ./Hyprspace.nix + ./inputs.nix ./style.nix ]; diff --git a/modules/hyprland/dev.nix b/modules/hyprland/dev.nix new file mode 100644 index 00000000..452d91e9 --- /dev/null +++ b/modules/hyprland/dev.nix @@ -0,0 +1,18 @@ +{pkgs, ...}: { + programs.bash.shellAliases = { + # https://wiki.hyprland.org/Contributing-and-Debugging/#lsp-and-formatting + "mkCMakeFiles" = "cmake -S . -B build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON"; + }; + + home.packages = [ + (pkgs.writeShellScriptBin "testChanges" '' + rm -r /home/matt/git/$1/$2/{.cache,build} + nix flake update "$1" + nh os switch + ( + cd "/home/matt/git/$1/$2" + nix develop /home/matt/git/$1 -c cmake -S . -B build/ -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON + ) + '') + ]; +} diff --git a/modules/hyprland/hyprexpo.nix b/modules/hyprland/hyprexpo.nix index bf79a303..26227cdc 100644 --- a/modules/hyprland/hyprexpo.nix +++ b/modules/hyprland/hyprexpo.nix @@ -1,10 +1,10 @@ { - hypr-official-plugins, + hyprland-plugins, pkgs, ... }: { wayland.windowManager.hyprland = { - plugins = [hypr-official-plugins.packages.${pkgs.system}.hyprexpo]; + plugins = [hyprland-plugins.packages.${pkgs.system}.hyprexpo]; settings = { plugin = {