diff --git a/hosts/marty-latitude/home.nix b/hosts/marty-latitude/home.nix index af771bc..5f59f01 100644 --- a/hosts/marty-latitude/home.nix +++ b/hosts/marty-latitude/home.nix @@ -101,6 +101,10 @@ waybar.enable = true; walker.enable = true; wallpaper.enable = true; + grimblast.enable = true; + }; + misc = { + bitwarden.enable = true; }; syncthing = { devices = { diff --git a/hosts/marty-pc/home.nix b/hosts/marty-pc/home.nix index e6602d9..78f557b 100644 --- a/hosts/marty-pc/home.nix +++ b/hosts/marty-pc/home.nix @@ -97,10 +97,13 @@ "monitor = desc:Panasonic Industry Company Panasonic-TV, 3840x2160@30, 0x0, 1 # tv" ]; }; - waybar.enable = true; + rofi.enable = true; walker.enable = true; wallpaper.enable = true; }; + misc = { + bitwarden.enable = true; + }; imports = [ inputs.walker.homeManagerModules.default diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix index 736acba..67971b8 100644 --- a/modules/desktop/default.nix +++ b/modules/desktop/default.nix @@ -12,6 +12,9 @@ ./waybar.nix ./rofi.nix ./wallpaper.nix - ./screenshot.nix + ./grimblast.nix + ]; + home.packages = with pkgs; [ + wl-clipboard ]; } diff --git a/modules/desktop/screenshot.nix b/modules/desktop/grimblast.nix similarity index 58% rename from modules/desktop/screenshot.nix rename to modules/desktop/grimblast.nix index b3785de..8ab5552 100644 --- a/modules/desktop/screenshot.nix +++ b/modules/desktop/grimblast.nix @@ -9,11 +9,11 @@ { options = { desktop = { - grimshot.enable = lib.mkEnableOption "enable grimshot"; + grimblast.enable = lib.mkEnableOption "enable grimblast"; }; }; - config = lib.mkIf config.desktop.grimshot.enable { + config = lib.mkIf config.desktop.grimblast.enable { home.packages = with pkgs; [ grimblast gradia diff --git a/modules/desktop/hyprland.nix b/modules/desktop/hyprland.nix index 8a9d2af..5877896 100644 --- a/modules/desktop/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -47,6 +47,11 @@ (lib.mkIf (config.desktop.walker.enable) "$mod, D, exec, walker") (lib.mkIf (config.desktop.rofi.enable) "$mod, D, exec, rofi -show drun") (lib.mkIf (config.terminal.kitty.enable) "$mod, return, exec, kitty") + (lib.mkIf (config.desktop.grimblast.enable) ", print, exec, GRIMBLAST_EDITOR=gradia grimblast edit area") + (lib.mkIf (config.desktop.rofi.enable) (lib.mkIf (config.misc.bitwarden.enable) "$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; rofi-rbw")) + (lib.mkIf (config.desktop.walker.enable) ( lib.mkIf (config.misc.bitwarden.enable) "$mod, B, exec, rbw unlocked || kitty --class kitty-floating -e rbw unlock; selected=$(rbw list | walker -d); wl-copy $(rbw get $selected)")) + "$mod, F, fullscreen, 1" + "$shiftmod, F, fullscreen, 0" "$shiftmod, Q, killactive," ]; input = {