diff --git a/flake.lock b/flake.lock index f71f537..bd5e4d0 100644 --- a/flake.lock +++ b/flake.lock @@ -805,11 +805,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728292968, - "narHash": "sha256-Jp/SQH5q2uTRBW625gFdfXLvYLjQiDNxtvQo0vVbyeA=", + "lastModified": 1728320787, + "narHash": "sha256-k6uOqBw7ROiFrYezdhqlg1aQULLb8Sbgd+GY7CQGqx8=", "owner": "nix-community", "repo": "nixvim", - "rev": "d71cfaaae8353b4102169a9858422ce3738cd43b", + "rev": "a3dd64b30c1016342f8c96ef04806b49dc4339f3", "type": "github" }, "original": { @@ -874,13 +874,13 @@ "lastModified": 1728046164, "narHash": "sha256-n/sMiz6ztfzAwidL7CaRaUW5m07i9i6cemthE1L4Pes=", "owner": "MeanderingProgrammer", - "repo": "markdown.nvim", + "repo": "render-markdown.nvim", "rev": "fe1002fddc61207e4ef4325d4bc0ca33697bbc7a", "type": "github" }, "original": { "owner": "MeanderingProgrammer", - "repo": "markdown.nvim", + "repo": "render-markdown.nvim", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 81d1e64..f2a14f4 100644 --- a/flake.nix +++ b/flake.nix @@ -7,6 +7,7 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -24,12 +25,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; - apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; - nixos-hardware.url = "github:NixOS/nixos-hardware/master"; hyprpanel.url = "github:Jas-SinghFSU/HyprPanel"; plugin-markdown = { - # TODO: Put the new url (render-markdown.nvim) - url = "github:MeanderingProgrammer/markdown.nvim"; + url = "github:MeanderingProgrammer/render-markdown.nvim"; flake = false; }; nixy-wallpapers = { @@ -37,6 +35,7 @@ flake = false; }; stylix.url = "github:danth/stylix"; + apple-fonts.url = "github:Lyndeno/apple-fonts.nix"; }; outputs = inputs@{ nixpkgs, ... }: { diff --git a/home/scripts/hyprfocus/default.nix b/home/scripts/hyprfocus/default.nix index 30e6697..3e7d801 100644 --- a/home/scripts/hyprfocus/default.nix +++ b/home/scripts/hyprfocus/default.nix @@ -13,8 +13,7 @@ let '' hyprctl keyword "general:gaps_in" 0 hyprctl keyword "general:gaps_out" 0 - # TODO: Fix this: - hyprpanel-toggle + hyprpanel-hide hyprctl keyword "general:border_size" 1 hyprctl keyword "decoration:rounding" 0 hyprctl keyword "decoration:drop_shadow" false @@ -27,7 +26,7 @@ let # bash '' hyprctl reload - hyprpanel-reload + hyprpanel-show rm /tmp/hyprfocus ''; diff --git a/home/scripts/hyprpanel/default.nix b/home/scripts/hyprpanel/default.nix index 8f62e20..d02cbc3 100644 --- a/home/scripts/hyprpanel/default.nix +++ b/home/scripts/hyprpanel/default.nix @@ -14,12 +14,33 @@ let hyprpanel -t bar-3 ''; + hyprpanel-hide = pkgs.writeShellScriptBin "hyprpanel-hide" '' + status=$(hyprpanel -r "isWindowVisible('bar-0')") + if [[ $status == "true" ]]; then + hyprpanel -t bar-0 + fi + status=$(hyprpanel -r "isWindowVisible('bar-1')") + if [[ $status == "true" ]]; then + hyprpanel -t bar-1 + fi + ''; + + hyprpanel-show = pkgs.writeShellScriptBin "hyprpanel-show" '' + status=$(hyprpanel -r "isWindowVisible('bar-0')") + if [[ $status == "false" ]]; then + hyprpanel -t bar-0 + fi + status=$(hyprpanel -r "isWindowVisible('bar-1')") + if [[ $status == "false" ]]; then + hyprpanel -t bar-1 + fi + ''; + hyprpanel-reload = pkgs.writeShellScriptBin "hyprpanel-reload" '' [ $(pgrep "ags") ] && pkill ags hyprctl dispatch exec hyprpanel ''; - - hyprpanel-kill = pkgs.writeShellScriptBin "hyprpanel-kill" '' - [ $(pgrep "ags") ] && pkill ags - ''; -in { home.packages = [ hyprpanel-toggle hyprpanel-reload hyprpanel-kill ]; } +in { + home.packages = + [ hyprpanel-toggle hyprpanel-reload hyprpanel-hide hyprpanel-show ]; +}