diff --git a/apps/hyprland/hypr/binds.nix b/apps/hyprland/hypr/binds.nix index 14f5d40..58379b4 100644 --- a/apps/hyprland/hypr/binds.nix +++ b/apps/hyprland/hypr/binds.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + # TODO: implement a way to show binds, preferably use vicinae. wayland.windowManager.hyprland.settings = { bindel = [ ", XF86MonBrightnessUp, exec, ddcutil setvcp 10 + 10" diff --git a/apps/hyprland/scripts/movement.nix b/apps/hyprland/scripts/movement.nix index 4004e83..754da4a 100644 --- a/apps/hyprland/scripts/movement.nix +++ b/apps/hyprland/scripts/movement.nix @@ -1,16 +1,12 @@ {pkgs, ...}: let hakase-workspace-switch-force = pkgs.writeShellScriptBin "hakase-workspace-switch-force" '' - # Define binary paths to ensure they work regardless of environment PATH HYPRCTL="${pkgs.hyprland}/bin/hyprctl" JQ="${pkgs.jq}/bin/jq" - # Get the special workspace name special_workspace=$($HYPRCTL monitors -j | $JQ -r '.[] | select(.focused) | .specialWorkspace.name') - # Strip the "special:" prefix (Nix escape: ''${var#*:}) workspace_name=''${special_workspace#*:} - # Get the target workspace number from argument chosen_workspace_num=$1 if [[ -z ''${chosen_workspace_num} ]]; then @@ -18,14 +14,11 @@ exit 1 fi - # Check if we are actually in a special workspace if [[ "''${special_workspace}" == *"special"* ]]; then echo "[LOG] workspace is ''${special_workspace}" - # Toggle the special workspace OFF $HYPRCTL dispatch togglespecialworkspace "''${workspace_name}" - # Switch to the requested normal workspace $HYPRCTL dispatch workspace "''${chosen_workspace_num}" else echo "[LOG] workspace is not special" diff --git a/apps/screenshot/default.nix b/apps/screenshot/default.nix index 4102036..d244f7b 100644 --- a/apps/screenshot/default.nix +++ b/apps/screenshot/default.nix @@ -1,31 +1,28 @@ {pkgs, ...}: let - # Screenshot script with swappy integration + # Screenshot script using grimblast (Hyprland-native) screenshot = pkgs.writeShellScriptBin "screenshot" '' #!/usr/bin/env bash case "$1" in region) # Select region and edit - grim -g "$(slurp)" - | swappy -f - + grimblast --freeze save area - | swappy -f - ;; window) - # Screenshot active window - grim -g "$(hyprctl -j activewindow | jq -r '"\(.at[0]),\(.at[1]) \(.size[0])x\(.size[1])"')" - | swappy -f - + # Screenshot active window and edit + grimblast --freeze save active - | swappy -f - ;; screen) - # Screenshot current monitor - grim -o "$(hyprctl -j monitors | jq -r '.[] | select(.focused) | .name')" - | swappy -f - + # Screenshot current monitor and edit + grimblast save output - | swappy -f - ;; all) - # Screenshot all monitors - grim - | swappy -f - + # Screenshot all monitors and edit + grimblast save screen - | swappy -f - ;; region-save) - # Quick region screenshot (save without editing and copy to clipboard) - filepath=~/Pictures/Screenshots/$(date +'%Y-%m-%d_%H-%M-%S.png') - grim -g "$(slurp)" "$filepath" - wl-copy < "$filepath" - notify-send "Screenshot saved" "Saved and copied to clipboard" + # Quick region screenshot (save and copy to clipboard) + grimblast --freeze --notify copysave area ~/Pictures/Screenshots/$(date +'%Y-%m-%d_%H-%M-%S.png') ;; *) echo "Usage: screenshot {region|window|screen|all|region-save}" @@ -35,12 +32,10 @@ ''; in { home.packages = with pkgs; [ - grim # Screenshot utility - slurp # Region selector - swappy # Annotation tool - jq # For window selection - wl-clipboard # For copying to clipboard - screenshot # Our wrapper script + grimblast # Hyprland screenshot utility + swappy # Annotation tool + wl-clipboard # For clipboard operations + screenshot # Our wrapper script ]; # Create Screenshots directory diff --git a/assets/Wallpapers/02-light_tower.jpg b/assets/Wallpapers/02-light_tower.jpg deleted file mode 100644 index 0b9f3de..0000000 Binary files a/assets/Wallpapers/02-light_tower.jpg and /dev/null differ diff --git a/assets/Wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg b/assets/Wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg deleted file mode 120000 index 4d1acae..0000000 --- a/assets/Wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg +++ /dev/null @@ -1 +0,0 @@ -/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/1-Pawel-Czerwinski-Abstract-Purple-Blue.jpg \ No newline at end of file diff --git a/assets/Wallpapers/1-everforest.jpg b/assets/Wallpapers/1-everforest.jpg deleted file mode 120000 index 1c70d0a..0000000 --- a/assets/Wallpapers/1-everforest.jpg +++ /dev/null @@ -1 +0,0 @@ -/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/1-everforest.jpg \ No newline at end of file diff --git a/assets/Wallpapers/ai_pixel_purple.jpg b/assets/Wallpapers/ai_pixel_purple.jpg deleted file mode 100644 index b75f755..0000000 Binary files a/assets/Wallpapers/ai_pixel_purple.jpg and /dev/null differ diff --git a/assets/Wallpapers/cattppucin_minimal.png b/assets/Wallpapers/cattppucin_minimal.png deleted file mode 100644 index da95e50..0000000 Binary files a/assets/Wallpapers/cattppucin_minimal.png and /dev/null differ diff --git a/assets/Wallpapers/firewatch.png b/assets/Wallpapers/firewatch.png new file mode 100644 index 0000000..786fdb1 Binary files /dev/null and b/assets/Wallpapers/firewatch.png differ diff --git a/assets/Wallpapers/firewatch_dawn.jpg b/assets/Wallpapers/firewatch_dawn.jpg deleted file mode 100644 index 9025991..0000000 Binary files a/assets/Wallpapers/firewatch_dawn.jpg and /dev/null differ diff --git a/assets/Wallpapers/firewatch_dusk.jpg b/assets/Wallpapers/firewatch_dusk.jpg deleted file mode 100644 index 3860098..0000000 Binary files a/assets/Wallpapers/firewatch_dusk.jpg and /dev/null differ diff --git a/assets/Wallpapers/firewatch_night.jpg b/assets/Wallpapers/firewatch_night.jpg deleted file mode 100644 index fa1ef82..0000000 Binary files a/assets/Wallpapers/firewatch_night.jpg and /dev/null differ diff --git a/assets/Wallpapers/gruvbox-1.jpg b/assets/Wallpapers/gruvbox-1.jpg deleted file mode 120000 index 4eef819..0000000 --- a/assets/Wallpapers/gruvbox-1.jpg +++ /dev/null @@ -1 +0,0 @@ -/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/gruvbox-1.jpg \ No newline at end of file diff --git a/assets/Wallpapers/kanagawa-1.png b/assets/Wallpapers/kanagawa-1.png deleted file mode 120000 index c60d58c..0000000 --- a/assets/Wallpapers/kanagawa-1.png +++ /dev/null @@ -1 +0,0 @@ -/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/kanagawa-1.png \ No newline at end of file diff --git a/assets/Wallpapers/kanagawa.jpg b/assets/Wallpapers/kanagawa.jpg deleted file mode 100644 index 8a3d2f7..0000000 Binary files a/assets/Wallpapers/kanagawa.jpg and /dev/null differ diff --git a/assets/Wallpapers/macos_tahoe.jpg b/assets/Wallpapers/macos_tahoe.jpg deleted file mode 100644 index 2adc7d9..0000000 Binary files a/assets/Wallpapers/macos_tahoe.jpg and /dev/null differ diff --git a/assets/Wallpapers/nixos_rainbow.png b/assets/Wallpapers/nixos_rainbow.png deleted file mode 100644 index fbe01b6..0000000 Binary files a/assets/Wallpapers/nixos_rainbow.png and /dev/null differ diff --git a/assets/Wallpapers/nord-1.png b/assets/Wallpapers/nord-1.png deleted file mode 120000 index 25bb553..0000000 --- a/assets/Wallpapers/nord-1.png +++ /dev/null @@ -1 +0,0 @@ -/nix/store/yckzy9k5i7pvmlk6xjkdj4wwbfms1zpl-home-manager-files/Pictures/Wallpapers/nord-1.png \ No newline at end of file diff --git a/assets/example/desktop_display.png b/assets/example/desktop_display.png new file mode 100644 index 0000000..d9989dd Binary files /dev/null and b/assets/example/desktop_display.png differ diff --git a/config.nix b/config.nix index 9da9fcd..b19ced4 100644 --- a/config.nix +++ b/config.nix @@ -23,7 +23,7 @@ "HDMI-A-1, highres@highrr@120, 3440x1440, 1.6" ]; - wallpaper = "ai_pixel_purple.jpg"; + wallpaper = "firewatch.png"; }; firefox = { bookmarks = [