diff --git a/modules/home-manager/hyprland.nix b/modules/desktop/hyprland.nix similarity index 95% rename from modules/home-manager/hyprland.nix rename to modules/desktop/hyprland.nix index 4da785e..69672c1 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/desktop/hyprland.nix @@ -143,6 +143,14 @@ in "workspace 10, Minecraft" ]; + "$mainMod" = "SUPER"; + "$altMod" = "ALT"; + "$ctrlMod" = "CTRL"; + + + # used for screenshots + "$screenshotarea" = "hyprctl keyword animation 'fadeOut,0,0,default'; grimblast --notify copy area; hyprctl keyword animation 'fadeOut,1,4,default'"; + bind = [ "$altMod, Return, exec, ${home}/.local/bin/ghostty" "$mainMod, Return, exec, ${home}/.local/bin/ghostty" # for apps that yoink alt- binds @@ -161,6 +169,10 @@ in "$mainMod SHIFT, S, togglesplit," # dwindle "$mainMod, F, fullscreen," + # Screenshot + ", Print, exec, $screenshotarea" + "SHIFT, Print, exec, grimblast --notify --cursor copy output" + "$mainMod, H, movefocus, l" "$mainMod, L, movefocus, r" "$mainMod, K, movefocus, u" @@ -241,10 +253,6 @@ in # Screenshots and Submaps extraConfig = '' - $screenshotarea = hyprctl keyword animation "fadeOut,0,0,default"; grimblast --notify copy area; hyprctl keyword animation "fadeOut,1,4,default" - bind = , Print, exec, $screenshotarea - bind = SHIFT, Print, exec, grimblast --notify --cursor copy output - bind = $mainMod, R, submap, resize submap = resize bind=, escape,submap,reset diff --git a/modules/old_configs/hypr/.#hyprland.conf b/modules/old_configs/hypr/.#hyprland.conf deleted file mode 120000 index 4fc13f5..0000000 --- a/modules/old_configs/hypr/.#hyprland.conf +++ /dev/null @@ -1 +0,0 @@ -liamm@nixos.1814:1710425515 \ No newline at end of file diff --git a/modules/old_configs/hypr/hyprland.conf b/modules/old_configs/hypr/hyprland.conf index 6e94ed2..e3edeab 100644 --- a/modules/old_configs/hypr/hyprland.conf +++ b/modules/old_configs/hypr/hyprland.conf @@ -6,12 +6,10 @@ monitor=,preferred,auto,1,mirror, eDP-1 # default treatment for external monito #monitor=,preferred,auto,1 # default treatment for external monitors # Environment variables -env = XCURSOR_SIZE,24 -env = XCURSOR_THEME,Breeze +env = PATH,$PATH:$HOME/.local/bin:$HOME/.cargo/bin env = XDG_CURRENT_DESKTOP,Hyprland env = XDG_SESSION_TYPE,wayland env = XDG_SESSION_DESKTOP,Hyprland -env = PATH,$PATH:$HOME/.local/bin:$HOME/.cargo/bin env = WLR_NO_HARDWARE_CURSORS,1 env = GDK_BACKEND, wayland,x11 @@ -20,6 +18,9 @@ env = QT_QPA_PLATFORM,wayland;xcb env = QT_QPA_PLATFORMTHEME,qt6ct env = SDL_VIDEODRIVER,wayland +env = XCURSOR_SIZE,24 +env = XCURSOR_THEME,Bibata + #auto-runs exec-once = /home/liamm/.config/hypr/xdg-portal-hyprland exec-once = wl-clipboard-history -t @@ -34,7 +35,7 @@ exec-once = wl-paste -p --watch wl-copy -p '' exec-once = fcitx5 -d exec-once = dunst -# exec-once = /usr/lib/kdeconnectd +exec-once = blueman-applet # set $gnome-schema org.gnome.desktop.interface exec-once = gsettings set $gnome-schema gtk-theme 'Arc Dark' @@ -239,13 +240,13 @@ bind=, escape,submap,reset submap=reset # Flatpak Binds -bind = $mainMod, S, exec, flatpak run com.spotify.Client +bind = $mainMod, S, exec, spotify bind = $mainMod SHIFT, V, submap, video_stuff submap = video_stuff -bind = , O, exec, flatpak run com.obsproject.Studio +bind = , O, exec, flatpak run obs bind = , O, submap, reset -bind = , V, exec , flatpak run org.kde.kdenlive +bind = , V, exec , flatpak run kdenlive bind = , V, submap, reset bind=, escape,submap,reset