diff --git a/flake.nix b/flake.nix index 0d58ba2..f009ee2 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { description = "Flake of LibrePhoenix"; - outputs = { self, nixpkgs, home-manager, nix-doom-emacs, stylix, eaf, eaf-browser, org-nursery, phscroll, blocklist-hosts, rust-overlay, ... }@inputs: + outputs = { self, nixpkgs, home-manager, nix-doom-emacs, stylix, eaf, eaf-browser, org-nursery, phscroll, blocklist-hosts, rust-overlay, hyprland-plugins, ... }@inputs: let # ---- SYSTEM SETTINGS ---- # system = "x86_64-linux"; # system arch @@ -15,7 +15,7 @@ name = "Emmet"; # name/identifier email = "librephoenix3@pm.me"; # email (used for certain configurations) dotfilesDir = "~/.dotfiles"; # absolute path of the local repo - theme = "ayu-dark"; # selcted theme from my themes directory (./themes/) + theme = "spaceduck"; # selcted theme from my themes directory (./themes/) wm = "hyprland"; # Selected window manager or desktop environment; must select one in both ./user/wm/ and ./system/wm/ wmType = "wayland"; # x11 or wayland browser = "librewolf"; # Default browser; must select one from ./user/app/browser/ @@ -69,6 +69,7 @@ inherit (inputs) eaf-browser; inherit (inputs) org-nursery; inherit (inputs) phscroll; + inherit (inputs) hyprland-plugins; }; }; }; @@ -121,5 +122,9 @@ url = "github:StevenBlack/hosts"; flake = false; }; + hyprland-plugins = { + url = "github:hyprwm/hyprland-plugins"; + flake = false; + }; }; } diff --git a/user/wm/hyprland/hyprbars.nix b/user/wm/hyprland/hyprbars.nix new file mode 100644 index 0000000..b6ebe61 --- /dev/null +++ b/user/wm/hyprland/hyprbars.nix @@ -0,0 +1,15 @@ +{ config, lib, stdenv, pkgs, hyprland-plugins, ... }: + +stdenv.mkDerivation rec { + pname = "hyprbars"; + version = "unstable"; + src = "${hyprland-plugins}/hyprbars"; + nativeBuildInputs = [ pkgs.hyprland.nativeBuildInputs ]; + buildInputs = [ pkgs.hyprland pkgs.hyprland.buildInputs ]; + meta = { + homepage = "https://gitlab.com/phoneybadger/pokemon-colorscripts"; + description = "CLI utility to print out images of pokemon to terminal"; + license = lib.licenses.mit; + maintainers = []; + }; +} diff --git a/user/wm/hyprland/hyprland.nix b/user/wm/hyprland/hyprland.nix index ff0b2f6..6b80ab3 100644 --- a/user/wm/hyprland/hyprland.nix +++ b/user/wm/hyprland/hyprland.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, browser, term, spawnEditor, font, ... }: +{ config, lib, pkgs, stdenv, browser, term, spawnEditor, font, hyprland-plugins, ... }: { imports = [ @@ -12,7 +12,9 @@ wayland.windowManager.hyprland = { enable = true; - plugins = [ ]; + plugins = [ + (pkgs.callPackage ./hyprbars.nix { inherit hyprland-plugins; } ) + ]; settings = { }; extraConfig = '' exec-once = dbus-update-activation-environment DISPLAY XAUTHORITY WAYLAND_DISPLAY @@ -44,6 +46,7 @@ bind=ALT,TAB,bringactivetotop bind=ALTSHIFT,TAB,cyclenext,prev bind=ALTSHIFT,TAB,bringactivetotop + bind=SUPER,Y,workspaceopt,allfloat bind=SUPER,RETURN,exec,'' + term + '' @@ -112,11 +115,11 @@ bind=SUPERSHIFT,8,movetoworkspace,8 bind=SUPERSHIFT,9,movetoworkspace,9 - bind=SUPER,Z,exec,pypr toggle term - bind=SUPER,F,exec,pypr toggle ranger - bind=SUPER,N,exec,pypr toggle musikcube - bind=SUPER,B,exec,pypr toggle btm - bind=SUPER,E,exec,pypr toggle geary + bind=SUPER,Z,exec,pypr toggle term && hyprctl dispatch bringactivetotop + bind=SUPER,F,exec,pypr toggle ranger && hyprctl dispatch bringactivetotop + bind=SUPER,N,exec,pypr toggle musikcube && hyprctl dispatch bringactivetotop + bind=SUPER,B,exec,pypr toggle btm && hyprctl dispatch bringactivetotop + bind=SUPER,E,exec,pypr toggle geary && hyprctl dispatch bringactivetotop $scratchpadsize = size 80% 85% $scratchpad = class:^(scratchpad)$