diff --git a/modules/home/gui/base/default.nix b/modules/home/gui/base/default.nix index 007a926..0a4ef74 100644 --- a/modules/home/gui/base/default.nix +++ b/modules/home/gui/base/default.nix @@ -16,7 +16,6 @@ nextcloud-client gramps - sweethome3d.application ]; }; } diff --git a/modules/home/wayland/apps/eww/bar/eww.yuck b/modules/home/wayland/apps/eww/bar/eww.yuck index 81f7b7a..2fd52d5 100644 --- a/modules/home/wayland/apps/eww/bar/eww.yuck +++ b/modules/home/wayland/apps/eww/bar/eww.yuck @@ -48,7 +48,7 @@ (defwindow bar - :monitor 0 + :monitor 1 :geometry (geometry :x "0%" :y "0%" diff --git a/modules/home/wayland/apps/eww/bar/windows/calendar.yuck b/modules/home/wayland/apps/eww/bar/windows/calendar.yuck index e295a40..df3e4a4 100755 --- a/modules/home/wayland/apps/eww/bar/windows/calendar.yuck +++ b/modules/home/wayland/apps/eww/bar/windows/calendar.yuck @@ -1,5 +1,5 @@ (defwindow calendar - :monitor 0 + :monitor 1 :geometry (geometry :x "0%" :y "0%" diff --git a/modules/home/wayland/apps/eww/bar/windows/powermenu.yuck b/modules/home/wayland/apps/eww/bar/windows/powermenu.yuck index a6da69e..1373c1d 100644 --- a/modules/home/wayland/apps/eww/bar/windows/powermenu.yuck +++ b/modules/home/wayland/apps/eww/bar/windows/powermenu.yuck @@ -34,7 +34,7 @@ ) (defwindow powermenu - :monitor 0 + :monitor 1 :stacking "overlay" :geometry (geometry :anchor "center" diff --git a/modules/home/wayland/apps/eww/bar/windows/radio.yuck b/modules/home/wayland/apps/eww/bar/windows/radio.yuck index ff1ef0c..7579b4f 100644 --- a/modules/home/wayland/apps/eww/bar/windows/radio.yuck +++ b/modules/home/wayland/apps/eww/bar/windows/radio.yuck @@ -2,7 +2,7 @@ (defvar radio_rev false) (defwindow radio - :monitor 0 + :monitor 1 :geometry (geometry :x "0%" :y "0%" diff --git a/modules/home/wayland/apps/eww/bar/windows/sys.yuck b/modules/home/wayland/apps/eww/bar/windows/sys.yuck index 7b88674..2835261 100644 --- a/modules/home/wayland/apps/eww/bar/windows/sys.yuck +++ b/modules/home/wayland/apps/eww/bar/windows/sys.yuck @@ -129,7 +129,7 @@ ) (defwindow sys - :monitor 0 + :monitor 1 :stacking "overlay" :geometry (geometry :x "0%" diff --git a/modules/home/wayland/base/default.nix b/modules/home/wayland/base/default.nix index 106ab04..d77e5f4 100644 --- a/modules/home/wayland/base/default.nix +++ b/modules/home/wayland/base/default.nix @@ -17,8 +17,12 @@ in { dbus-hyprland-environment wayland - grim + hyprpicker + + hyprshot slurp + satty + swappy cliphist wl-clipboard diff --git a/modules/home/wayland/hyprland/config.nix b/modules/home/wayland/hyprland/config.nix index 0bd71c8..c5955e2 100755 --- a/modules/home/wayland/hyprland/config.nix +++ b/modules/home/wayland/hyprland/config.nix @@ -166,7 +166,7 @@ bind = SUPER SHIFT,D,exec, ~/.config/hypr/themes/apatheia/eww/launch_bar bind = SUPER, V, exec, cliphist list | wofi -dmenu | cliphist decode | wl-copy - bind = , Print, exec, grim -g "$(slurp -d)" - | swappy -f - + bind = , PRINT, exec, hyprshot -m region --raw | satty --filename - --early-exit --action-on-enter save-to-clipboard --copy-command 'wl-copy' bind = SUPER, L, exec, swaylock diff --git a/modules/home/xorg/bspwm/config.nix b/modules/home/xorg/bspwm/config.nix index c4a92f5..c998e52 100755 --- a/modules/home/xorg/bspwm/config.nix +++ b/modules/home/xorg/bspwm/config.nix @@ -110,7 +110,7 @@ telegram-desktop & nextcloud & jellyfin-mpv-shim & - flameshot & + #flameshot & sleep 2 @@ -265,7 +265,7 @@ # Screenshots Print - flameshot gui + hyprshot -m region # Lock Desktop super + l diff --git a/modules/home/xorg/bspwm/default.nix b/modules/home/xorg/bspwm/default.nix index 999b076..49b81b0 100755 --- a/modules/home/xorg/bspwm/default.nix +++ b/modules/home/xorg/bspwm/default.nix @@ -5,7 +5,7 @@ config = lib.mkIf (config.usercfg.wm == "X11") { xsession.windowManager.bspwm = { enable = true; }; services.sxhkd = { enable = true; }; - home.packages = with pkgs; [ xrandr arandr flameshot xtrlock i3lock ]; + home.packages = with pkgs; [ xrandr arandr hyprshot xtrlock i3lock ]; }; } diff --git a/modules/nixos/tools/debug/default.nix b/modules/nixos/tools/debug/default.nix index 3f8c2da..fe3d4f5 100644 --- a/modules/nixos/tools/debug/default.nix +++ b/modules/nixos/tools/debug/default.nix @@ -2,6 +2,9 @@ config = lib.mkIf (config.syscfg.make.develop) { programs.adb.enable = true; + services.udev.packages = [ + pkgs.android-udev-rules + ]; programs.wireshark.enable = true; environment.systemPackages = with pkgs; [ wget dconf wireshark ]; diff --git a/modules/nixos/tools/develop/default.nix b/modules/nixos/tools/develop/default.nix index 6bccbe4..9e7b679 100644 --- a/modules/nixos/tools/develop/default.nix +++ b/modules/nixos/tools/develop/default.nix @@ -10,7 +10,7 @@ in { environment.systemPackages = with pkgs; [ # android-tools - # androidStudioPackages.canary + unstable.androidStudioPackages.canary ]; }; }