diff --git a/flake.lock b/flake.lock index 98bfadf..07224c5 100644 --- a/flake.lock +++ b/flake.lock @@ -20,6 +20,21 @@ } }, "crane": { + "locked": { + "lastModified": 1776635034, + "narHash": "sha256-OEOJrT3ZfwbChzODfIH4GzlNTtOFuZFWPtW7jIeR8xU=", + "owner": "ipetkov", + "repo": "crane", + "rev": "dc7496d8ea6e526b1254b55d09b966e94673750f", + "type": "github" + }, + "original": { + "owner": "ipetkov", + "repo": "crane", + "type": "github" + } + }, + "crane_2": { "locked": { "lastModified": 1775236976, "narHash": "sha256-gCgX+AXN7K1gAIEqcLcZHxmC+QoZcwn9m6Z9r2Az+N8=", @@ -142,6 +157,24 @@ "type": "github" } }, + "flake-utils_7": { + "inputs": { + "systems": "systems_7" + }, + "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" + } + }, "gtkapps": { "inputs": { "flake-utils": "flake-utils_2", @@ -221,6 +254,27 @@ "type": "github" } }, + "hyprmwh": { + "inputs": { + "crane": "crane", + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4", + "rust-overlay": "rust-overlay" + }, + "locked": { + "lastModified": 1776890943, + "narHash": "sha256-KVvXWMABYfML0sttIwG41FRNuZUxhl+bqaAiulXzA9A=", + "owner": "JackMechem", + "repo": "hyprmwh", + "rev": "b7bbe057e9f701ae4b07e4f01eac724f398e43be", + "type": "github" + }, + "original": { + "owner": "JackMechem", + "repo": "hyprmwh", + "type": "github" + } + }, "nixpkgs": { "locked": { "lastModified": 1775126147, @@ -270,6 +324,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1776548001, + "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b12141ef619e0a9c1c84dc8c684040326f27cdcc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1775036866, "narHash": "sha256-ZojAnPuCdy657PbTq5V0Y+AHKhZAIwSIT2cb8UgAz/U=", @@ -285,7 +355,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1774709303, "narHash": "sha256-D3Q07BbIA2KnTcSXIqqu9P586uWxN74zNoCH3h2ESHg=", @@ -301,7 +371,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { "lastModified": 1774386573, "narHash": "sha256-4hAV26quOxdC6iyG7kYaZcM3VOskcPUrdCQd/nx8obc=", @@ -323,7 +393,8 @@ "gtkapps": "gtkapps", "gtkbar": "gtkbar", "home-manager": "home-manager", - "nixpkgs": "nixpkgs_4", + "hyprmwh": "hyprmwh", + "nixpkgs": "nixpkgs_5", "rust-app-menu": "rust-app-menu", "server-dash": "server-dash", "server-dash-api": "server-dash-api", @@ -332,12 +403,12 @@ }, "rust-app-menu": { "inputs": { - "crane": "crane", - "flake-utils": "flake-utils_4", + "crane": "crane_2", + "flake-utils": "flake-utils_5", "nixpkgs": [ "nixpkgs" ], - "rust-overlay": "rust-overlay" + "rust-overlay": "rust-overlay_2" }, "locked": { "lastModified": 1775688550, @@ -354,6 +425,27 @@ } }, "rust-overlay": { + "inputs": { + "nixpkgs": [ + "hyprmwh", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1776741231, + "narHash": "sha256-k9G98qzn+7npROUaks8VqCFm7cFtEG8ulQLBBo5lItg=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "02061303f7c4c964f7b4584dabd9e985b4cd442b", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, + "rust-overlay_2": { "inputs": { "nixpkgs": [ "rust-app-menu", @@ -374,7 +466,7 @@ "type": "github" } }, - "rust-overlay_2": { + "rust-overlay_3": { "inputs": { "nixpkgs": [ "server-dash-api", @@ -397,8 +489,8 @@ }, "server-dash": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_6" }, "locked": { "lastModified": 1774932258, @@ -416,9 +508,9 @@ }, "server-dash-api": { "inputs": { - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_6", - "rust-overlay": "rust-overlay_2" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_7", + "rust-overlay": "rust-overlay_3" }, "locked": { "lastModified": 1775019268, @@ -524,6 +616,21 @@ "type": "github" } }, + "systems_7": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "zen-browser": { "inputs": { "home-manager": "home-manager_2", diff --git a/flake.nix b/flake.nix index ce817ce..16b34af 100755 --- a/flake.nix +++ b/flake.nix @@ -5,6 +5,7 @@ nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; gtkapps.url = "github:JackMechem/gtkapps"; gtkbar.url = "github:JackMechem/gtkbar"; + hyprmwh.url = "github:JackMechem/hyprmwh"; # midirun.url = "path:/home/jack/Projects/midirun"; zen-browser = { diff --git a/modules/home-manager/homepackages.nix b/modules/home-manager/homepackages.nix index 14f07c1..e870f80 100644 --- a/modules/home-manager/homepackages.nix +++ b/modules/home-manager/homepackages.nix @@ -37,5 +37,8 @@ jdk gnumake inputs.claude-code.packages.${pkgs.system}.claude-code + + ### My Stuff + inputs.hyprmwh.packages.${pkgs.system}.default ]; } diff --git a/modules/home-manager/hyprland-desktop.nix b/modules/home-manager/hyprland-desktop.nix index 38a278d..6bacd39 100644 --- a/modules/home-manager/hyprland-desktop.nix +++ b/modules/home-manager/hyprland-desktop.nix @@ -38,7 +38,6 @@ exec-once = [ "waypaper --restore" "gtkbar" - "rust-app-menu -d" "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP" "solaar -w hide" ]; @@ -46,7 +45,10 @@ # --- Variables --- "$terminal" = "ghostty"; "$fileManager" = "thunar"; - "$menu" = "rust-app-menu -ds"; + "$appMenu" = "hyprmwh --apps"; + "$windowMoveMenu" = "hyprmwh --windows"; + "$browser" = "zen-twilight"; + #"$menu" = "rust-app-menu -ds"; env = [ "XCURSOR_SIZE,24" @@ -84,7 +86,9 @@ layerrule = [ "blur on, match:namespace Launcher" - "ignore_alpha 0.3, match:namespace Launcher" + "ignore_alpha 0.1, match:namespace Launcher" + "blur on, match:namespace hyprmwh" + "ignore_alpha 0.1, match:namespace hyprmwh" ]; # --- Decoration --- @@ -127,19 +131,19 @@ force_default_wallpaper = 0; }; - # --- Keybinds --- + # --- Keybinds --- bind = [ # System/Rice - "${mainMod}, grave, exec, rice-settings" "${mainMod}, RETURN, exec, $terminal" "${mainMod} SHIFT, RETURN, exec, [float] $terminal" "${mainMod}, Q, killactive" "${mainMod} SHIFT, M, exit" "${mainMod}, E, exec, $fileManager" "${mainMod} SHIFT, E, exec, [float] $fileManager" - "${mainMod}, W, exec, zen-browser" + "${mainMod}, W, exec, $browser" "${mainMod}, TAB, togglefloating" - "${mainMod}, SPACE, exec, $menu" + "${mainMod}, SPACE, exec, $appMenu" + "${mainMod}, grave, exec, $windowMoveMenu" "${mainMod}, P, pseudo" "${mainMod}, V, togglesplit" "${mainMod}, M, fullscreen, 1"