From e57370dbf542b165e430cc8c708677625a9f8ed4 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 9 Sep 2024 00:07:54 -0400 Subject: laptop config --- .config/hypr/#hyprland.conf# | 65 +++++++++++++++++++++++++++ .config/hypr/#hyprpaper.conf# | 2 + .config/hypr/#monitors.conf# | 26 +++++++++++ .config/hypr/binds.conf | 81 +++++++++++++++++++++++++++++++++ .config/hypr/binds.conf~ | 80 +++++++++++++++++++++++++++++++++ .config/hypr/hypridle.conf | 9 ++++ .config/hypr/hyprland.conf | 60 +++++++++++++++++++++++++ .config/hypr/hyprland.conf~ | 62 +++++++++++++++++++++++++ .config/hypr/hyprlock.conf | 102 ++++++++++++++++++++++++++++++++++++++++++ .config/hypr/hyprpaper.conf | 2 + .config/hypr/hyprpaper.conf~ | 2 + .config/hypr/misc.conf | 0 .config/hypr/monitors.conf | 26 +++++++++++ .config/hypr/monitors.conf~ | 26 +++++++++++ .config/hypr/style.conf | 61 +++++++++++++++++++++++++ .config/hypr/style.conf~ | 61 +++++++++++++++++++++++++ .config/hypr/windowrules.conf | 2 + 17 files changed, 667 insertions(+) create mode 100644 .config/hypr/#hyprland.conf# create mode 100644 .config/hypr/#hyprpaper.conf# create mode 100644 .config/hypr/#monitors.conf# create mode 100644 .config/hypr/binds.conf create mode 100644 .config/hypr/binds.conf~ create mode 100644 .config/hypr/hypridle.conf create mode 100644 .config/hypr/hyprland.conf create mode 100644 .config/hypr/hyprland.conf~ create mode 100644 .config/hypr/hyprlock.conf create mode 100644 .config/hypr/hyprpaper.conf create mode 100644 .config/hypr/hyprpaper.conf~ create mode 100644 .config/hypr/misc.conf create mode 100644 .config/hypr/monitors.conf create mode 100644 .config/hypr/monitors.conf~ create mode 100644 .config/hypr/style.conf create mode 100644 .config/hypr/style.conf~ create mode 100644 .config/hypr/windowrules.conf (limited to '.config/hypr') diff --git a/.config/hypr/#hyprland.conf# b/.config/hypr/#hyprland.conf# new file mode 100644 index 0000000..5df0c2c --- /dev/null +++ b/.config/hypr/#hyprland.conf# @@ -0,0 +1,65 @@ +source=binds.conf +source=monitors.conf +source=style.conf +source=windowrules.conf + +# Slow app launch fix +exec-once = systemctl --user import-environment & +exec-once = hash dbus-update-activation-environment 2>/dev/null & +exec-once = dbus-update-activation-environment --systemd & +#exec-once = xdg-desktop-portal-hyprland & + +exec-once = hyprctl setcursor HyprBibataModernClassicSVG 24 +exec-once = hyprctl dispatch workspace 1 +exec-once = xrandr --output XWAYLAND0 --primary +exec-once = gsettings set org.gnome.desktop.interface cursor-theme "Bibata-Modern-Classic" +exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" +exec-once = gsettings set org.gnome.desktop.interface gtk-theme Adwaita +exec-once = hyprpaper +exec-once = waybar + +# Some default env vars. +env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that +env = XDG_SESSION_TYPE,wayland +env = XDG_SESSION_DESKTOP,Hyprland +env = XCURSOR_THEME,"Bibata-Modern-Classic" +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_THEME,HyprBibataModernClassicSVG +env = HYPRCURSOR_SIZE,64 +env = LIBVA_DRIVER_NAME,nvidia +env = GBM_BACKEND,nvidia-drm +env = __GLX_VENDOR_LIBRARY_NAME,nvidia + +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = ctrl:nocaps + kb_rules = + + follow_mouse = 1 + + repeat_delay = 300 + repeat_rate = 30 + + touchpad { + natural_scroll = no + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + layout = dwindle + #layout = master + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false +} + +windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ diff --git a/.config/hypr/#hyprpaper.conf# b/.config/hypr/#hyprpaper.conf# new file mode 100644 index 0000000..60a08a1 --- /dev/null +++ b/.config/hypr/#hyprpaper.conf# @@ -0,0 +1,2 @@ +preload = /home/nahtaiv3l/wallpapers/current_wallpaper/ +wallpaper = ,/home/nahtaiv3l/wallpapers/current_wallpaper diff --git a/.config/hypr/#monitors.conf# b/.config/hypr/#monitors.conf# new file mode 100644 index 0000000..9fd450f --- /dev/null +++ b/.config/hypr/#monitors.conf# @@ -0,0 +1,26 @@ +# See https://wiki.hyprland.org/Configuring/Monitors/ +#monitor=DP-1,2560x1440@144,0x0,auto +monitor=eDP1,highres,auto,1 +#monitor=DP-2,1920x1080@60,2560x0,auto + +# FOR HYPRSOME (MULTIPLE MONITORS) +workspace=1,monitor:eDP-1 +workspace=2,monitor:eDP-1 +workspace=3,monitor:eDP-1 +workspace=4,monitor:eDP-1 +workspace=5,monitor:eDP-1 +workspace=6,monitor:eDP-1 +workspace=7,monitor:eDP-1 +workspace=8,monitor:eDP-1 +workspace=9,monitor:eDP-1 +workspace=10,monitor:eDP-1 + +workspace=11,monitor:eDP-2 +workspace=12,monitor:eDP-2 +workspace=13,monitor:eDP-2 +workspace=14,monitor:eDP-2 +workspace=15,monitor:eDP-2 +workspace=17,monitor:eDP-2 +workspace=18,monitor:eDP-2 +workspace=19,monitor:eDP-2 +workspace=10,monitor:eDP-2 diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf new file mode 100644 index 0000000..ae659c0 --- /dev/null +++ b/.config/hypr/binds.conf @@ -0,0 +1,81 @@ +# See https://wiki.hyprland.org/Configuring/Keywords/ for more +$mainMod = SUPER + +# Set programs that you use +$terminal = alacritty +$fileManager = kitty xplr +$browser = waterfox +$menu = wmenu-run + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, RETURN, exec, $menu +bind = $mainMod, A, exec, $terminal +bind = $mainMod, D, killactive, +bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill +bind = $mainMod, S, exec, hyprshot -m region +bind = , PRINT, exec, hyprshot -m output +bind = $mainMod, PRINT, exec, hyprshot -m window +bind = $mainMod, M, exit, +bind = $mainMod, V, togglefloating, +bind = $mainMod, P, exec, hyprpicker -a +bind = $mainMod, L, exec, hyprlock +bind = $mainMod, R, togglesplit, # dwindle +bind = $mainMod, F, fullscreen +bind = $mainMod, G, fullscreenstate, 0 3 +bind = $mainMod, W, exec, $browser +bind = $mainMod, X, exec, $fileManager +bind = $mainMod, K, exec, $terminal -e htop +bind = $mainMod SHIFT, B, exec, /bin/sh -c "pidof waybar && pkill -x waybar || waybar" +bind = $mainMod SHIFT, Q, exit, +bind = $mainMod SHIFT, RETURN, layoutmsg, swapwithmaster +bind = $mainMod, E, exec, emacsclient -c + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, lp +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +bind = $mainMod SHIFT,left ,movewindow, l +bind = $mainMod SHIFT,right ,movewindow, r +bind = $mainMod SHIFT,up ,movewindow, u +bind = $mainMod SHIFT,down ,movewindow, d + +# screenshot + crop keybind +bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" + +# Example special workspace (scratchpad) COMMENTED OUT FOR SCREENSHOT KEYBIND +# bind = $mainMod, S, togglespecialworkspace, magic +# bind = $mainMod SHIFT, S, movetoworkspace, special:magic + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# switch workspaces with mainMod + [0-9] +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 +bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 +bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 +bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 +bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 +bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 +bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 +bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 +bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 +bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 diff --git a/.config/hypr/binds.conf~ b/.config/hypr/binds.conf~ new file mode 100644 index 0000000..0973750 --- /dev/null +++ b/.config/hypr/binds.conf~ @@ -0,0 +1,80 @@ +# See https://wiki.hyprland.org/Configuring/Keywords/ for more +$mainMod = SUPER + +# Set programs that you use +$terminal = alacritty +$fileManager = kitty xplr +$browser = waterfox +$menu = wmenu-run + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +bind = $mainMod, RETURN, exec, $menu +bind = $mainMod, A, exec, $terminal +bind = $mainMod, D, killactive, +bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill +bind = $mainMod, S, exec, hyprshot -m region +bind = , PRINT, exec, hyprshot -m output +bind = $mainMod, PRINT, exec, hyprshot -m window +bind = $mainMod, M, exit, +bind = $mainMod, V, togglefloating, +bind = $mainMod, P, exec, hyprpicker -a +bind = $mainMod, L, exec, hyprlock +bind = $mainMod, R, togglesplit, # dwindle +bind = $mainMod, F, fullscreen +bind = $mainMod, G, fullscreenstate, 0 3 +bind = $mainMod, W, exec, $browser +bind = $mainMod, X, exec, $fileManager +bind = $mainMod, K, exec, kitty btm +bind = $mainMod SHIFT, B, exec, /bin/sh -c "pidof waybar && pkill -x waybar || waybar" +bind = $mainMod SHIFT, Q, exit, +bind = $mainMod SHIFT, RETURN, layoutmsg, swapwithmaster + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, lp +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +bind = $mainMod SHIFT,left ,movewindow, l +bind = $mainMod SHIFT,right ,movewindow, r +bind = $mainMod SHIFT,up ,movewindow, u +bind = $mainMod SHIFT,down ,movewindow, d + +# screenshot + crop keybind +bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" + +# Example special workspace (scratchpad) COMMENTED OUT FOR SCREENSHOT KEYBIND +# bind = $mainMod, S, togglespecialworkspace, magic +# bind = $mainMod SHIFT, S, movetoworkspace, special:magic + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + +# switch workspaces with mainMod + [0-9] +bind = $mainMod, 1, workspace, 1 +bind = $mainMod, 2, workspace, 2 +bind = $mainMod, 3, workspace, 3 +bind = $mainMod, 4, workspace, 4 +bind = $mainMod, 5, workspace, 5 +bind = $mainMod, 6, workspace, 6 +bind = $mainMod, 7, workspace, 7 +bind = $mainMod, 8, workspace, 8 +bind = $mainMod, 9, workspace, 9 +bind = $mainMod, 0, workspace, 10 + +# move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 +bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 +bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 +bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 +bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 +bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 +bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 +bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 +bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 +bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf new file mode 100644 index 0000000..8a4a3c0 --- /dev/null +++ b/.config/hypr/hypridle.conf @@ -0,0 +1,9 @@ +general { + before_sleep_cmd = pidof hyprlock || hyprlock + after_sleep_cmd = hyprctl dispatch dpms on +} + +listener { + timeout = 300 # 5min + on-timeout = loginctl suspend +} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf new file mode 100644 index 0000000..3042e6e --- /dev/null +++ b/.config/hypr/hyprland.conf @@ -0,0 +1,60 @@ +source=binds.conf +source=monitors.conf +source=style.conf +source=windowrules.conf + +# Slow app launch fix +exec-once = systemctl --user import-environment & +exec-once = hash dbus-update-activation-environment 2>/dev/null & +exec-once = dbus-update-activation-environment --systemd & +exec-once = startup +#exec-once = xdg-desktop-portal-hyprland & + +exec-once = hyprctl dispatch workspace 1 + +exec-once = gsettings set org.gnome.desktop.interface cursor-theme "Bibata-Modern-Classic" +exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" +exec-once = gsettings set org.gnome.desktop.interface gtk-theme Adwaita + +# Some default env vars. +env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that +env = XDG_SESSION_TYPE,wayland +env = XDG_SESSION_DESKTOP,Hyprland +env = XCURSOR_THEME,"Bibata-Modern-Classic" +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_THEME,HyprBibataModernClassicSVG + +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = ctrl:nocaps + kb_rules = + + follow_mouse = 1 + + repeat_delay = 300 + repeat_rate = 30 + + touchpad { + natural_scroll = yes + disable_while_typing = true + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + #layout = dwindle + layout = master + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false +} + +windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ diff --git a/.config/hypr/hyprland.conf~ b/.config/hypr/hyprland.conf~ new file mode 100644 index 0000000..672ef72 --- /dev/null +++ b/.config/hypr/hyprland.conf~ @@ -0,0 +1,62 @@ +source=binds.conf +source=monitors.conf +source=style.conf +source=windowrules.conf + +# Slow app launch fix +exec-once = systemctl --user import-environment & +exec-once = hash dbus-update-activation-environment 2>/dev/null & +exec-once = dbus-update-activation-environment --systemd & +exec-once = startup +#exec-once = xdg-desktop-portal-hyprland & + +exec-once = hyprctl dispatch workspace 1 + +exec-once = gsettings set org.gnome.desktop.interface cursor-theme "Bibata-Modern-Classic" +exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" +exec-once = gsettings set org.gnome.desktop.interface gtk-theme Adwaita +exec-once = hyprpaper +exec-once = waybar + +# Some default env vars. +env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that +env = XDG_SESSION_TYPE,wayland +env = XDG_SESSION_DESKTOP,Hyprland +env = XCURSOR_THEME,"Bibata-Modern-Classic" +env = XCURSOR_SIZE,24 +env = HYPRCURSOR_THEME,HyprBibataModernClassicSVG + +# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = ctrl:nocaps + kb_rules = + + follow_mouse = 1 + + repeat_delay = 300 + repeat_rate = 30 + + touchpad { + natural_scroll = yes + disable_while_typing = true + } + + sensitivity = 0 # -1.0 - 1.0, 0 means no modification. +} + +general { + #layout = dwindle + layout = master + + # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on + allow_tearing = false +} + +windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ +windowrulev2 = noanim,class:^(xwaylandvideobridge)$ +windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ +windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ +windowrulev2 = noblur,class:^(xwaylandvideobridge)$ diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf new file mode 100644 index 0000000..3150f25 --- /dev/null +++ b/.config/hypr/hyprlock.conf @@ -0,0 +1,102 @@ +# $text_color = rgba(E3E1EFFF) +# $entry_background_color = rgba(12131C11) +# $entry_border_color = rgba(908F9F55) +# $entry_color = rgba(C6C5D6FF) +$text_color = rgba(FFFFFFFF) +$entry_background_color = rgba(33333311) +$entry_border_color = rgba(3B3B3B55) +$entry_color = rgba(FFFFFFFF) +$font_family = Rubik Light +$font_family_clock = Rubik Light +$font_material_symbols = Material Symbols Rounded + +background { + # color = rgba(0D0D17FF) + color = rgba(000000FF) + # path = {{ SWWW_WALL }} + # path = screenshot + # blur_size = 5 + # blur_passes = 4 +} +input-field { + monitor = + size = 250, 50 + outline_thickness = 2 + dots_size = 0.1 + dots_spacing = 0.3 + outer_color = $entry_border_color + inner_color = $entry_background_color + font_color = $entry_color + # fade_on_empty = true + + position = 0, 20 + halign = center + valign = center +} + +label { # Clock + monitor = + text = $TIME + shadow_passes = 1 + shadow_boost = 0.5 + color = $text_color + font_size = 65 + font_family = $font_family_clock + + position = 0, 300 + halign = center + valign = center +} +label { # Greeting + monitor = + text = hi $USER !!! + shadow_passes = 1 + shadow_boost = 0.5 + color = $text_color + font_size = 20 + font_family = $font_family + + position = 0, 240 + halign = center + valign = center +} +label { # lock icon + monitor = + text = lock + shadow_passes = 1 + shadow_boost = 0.5 + color = $text_color + font_size = 21 + font_family = $font_material_symbols + + position = 0, 65 + halign = center + valign = bottom +} +label { # "locked" text + monitor = + text = locked + shadow_passes = 1 + shadow_boost = 0.5 + color = $text_color + font_size = 14 + font_family = $font_family + + position = 0, 45 + halign = center + valign = bottom +} + +label { # Status + monitor = + text = cmd[update:5000] ~/.config/hypr/hyprlock/status.sh + shadow_passes = 1 + shadow_boost = 0.5 + color = $text_color + font_size = 14 + font_family = $font_family + + position = 30, -30 + halign = left + valign = top +} diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf new file mode 100644 index 0000000..5c09733 --- /dev/null +++ b/.config/hypr/hyprpaper.conf @@ -0,0 +1,2 @@ +preload = /home/jack/.dotfiles/wallpapers/signalis.png +wallpaper = ,/home/jack/.dotfiles/wallpapers/signalis.png diff --git a/.config/hypr/hyprpaper.conf~ b/.config/hypr/hyprpaper.conf~ new file mode 100644 index 0000000..2612cc8 --- /dev/null +++ b/.config/hypr/hyprpaper.conf~ @@ -0,0 +1,2 @@ +preload = /home/nahtaiv3l/wallpapers/current_wallpaper +wallpaper = ,/home/nahtaiv3l/wallpapers/current_wallpaper diff --git a/.config/hypr/misc.conf b/.config/hypr/misc.conf new file mode 100644 index 0000000..e69de29 diff --git a/.config/hypr/monitors.conf b/.config/hypr/monitors.conf new file mode 100644 index 0000000..813f6d6 --- /dev/null +++ b/.config/hypr/monitors.conf @@ -0,0 +1,26 @@ +# See https://wiki.hyprland.org/Configuring/Monitors/ +#monitor=DP-1,2560x1440@144,0x0,auto +monitor=,highres,auto,1 +#monitor=DP-2,1920x1080@60,2560x0,auto + +# FOR HYPRSOME (MULTIPLE MONITORS) +workspace=1,monitor:eDP-1 +workspace=2,monitor:eDP-1 +workspace=3,monitor:eDP-1 +workspace=4,monitor:eDP-1 +workspace=5,monitor:eDP-1 +workspace=6,monitor:eDP-1 +workspace=7,monitor:eDP-1 +workspace=8,monitor:eDP-1 +workspace=9,monitor:eDP-1 +workspace=10,monitor:eDP-1 + +workspace=11,monitor:eDP-2 +workspace=12,monitor:eDP-2 +workspace=13,monitor:eDP-2 +workspace=14,monitor:eDP-2 +workspace=15,monitor:eDP-2 +workspace=17,monitor:eDP-2 +workspace=18,monitor:eDP-2 +workspace=19,monitor:eDP-2 +workspace=10,monitor:eDP-2 diff --git a/.config/hypr/monitors.conf~ b/.config/hypr/monitors.conf~ new file mode 100644 index 0000000..9fd450f --- /dev/null +++ b/.config/hypr/monitors.conf~ @@ -0,0 +1,26 @@ +# See https://wiki.hyprland.org/Configuring/Monitors/ +#monitor=DP-1,2560x1440@144,0x0,auto +monitor=eDP1,highres,auto,1 +#monitor=DP-2,1920x1080@60,2560x0,auto + +# FOR HYPRSOME (MULTIPLE MONITORS) +workspace=1,monitor:eDP-1 +workspace=2,monitor:eDP-1 +workspace=3,monitor:eDP-1 +workspace=4,monitor:eDP-1 +workspace=5,monitor:eDP-1 +workspace=6,monitor:eDP-1 +workspace=7,monitor:eDP-1 +workspace=8,monitor:eDP-1 +workspace=9,monitor:eDP-1 +workspace=10,monitor:eDP-1 + +workspace=11,monitor:eDP-2 +workspace=12,monitor:eDP-2 +workspace=13,monitor:eDP-2 +workspace=14,monitor:eDP-2 +workspace=15,monitor:eDP-2 +workspace=17,monitor:eDP-2 +workspace=18,monitor:eDP-2 +workspace=19,monitor:eDP-2 +workspace=10,monitor:eDP-2 diff --git a/.config/hypr/style.conf b/.config/hypr/style.conf new file mode 100644 index 0000000..e818cbf --- /dev/null +++ b/.config/hypr/style.conf @@ -0,0 +1,61 @@ +general { + gaps_in = 3 + gaps_out = 25 + + border_size = 2 + col.active_border = rgba(EEABC4aa) rgba(0099ccee) 45deg + col.inactive_border = rgba(595959aa) +} + +decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 4 + + blur { + enabled = true + size = 2 + passes = 3 + } + + drop_shadow = no + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +animations { + enabled = yes + + bezier = defaultBezier, 0.05, 0.9, 0.1, 1.05 + + animation = windows, 1, 7, defaultBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 3, default + animation = workspaces, 1, 6, defaultBezier +} + +dwindle { + # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more + pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # you probably want this +} + +master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_status = master + new_on_top = true + mfact = 0.5 +} + +gestures { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + workspace_swipe = on +} + +misc { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers +} diff --git a/.config/hypr/style.conf~ b/.config/hypr/style.conf~ new file mode 100644 index 0000000..ceef549 --- /dev/null +++ b/.config/hypr/style.conf~ @@ -0,0 +1,61 @@ +general { + gaps_in = 3 + gaps_out = 25 + + border_size = 2 + col.active_border = rgba(EEABC4aa) + col.inactive_border = rgba(595959aa) +} + +decoration { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + + rounding = 4 + + blur { + enabled = true + size = 2 + passes = 3 + } + + drop_shadow = no + shadow_range = 4 + shadow_render_power = 3 + col.shadow = rgba(1a1a1aee) +} + +animations { + enabled = yes + + bezier = defaultBezier, 0.05, 0.9, 0.1, 1.05 + + animation = windows, 1, 7, defaultBezier + animation = windowsOut, 1, 7, default, popin 80% + animation = border, 1, 10, default + animation = borderangle, 1, 8, default + animation = fade, 1, 3, default + animation = workspaces, 1, 6, defaultBezier +} + +dwindle { + # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more + pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below + preserve_split = yes # you probably want this +} + +master { + # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more + new_status = master + new_on_top = true + mfact = 0.5 +} + +gestures { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + workspace_swipe = on +} + +misc { + # See https://wiki.hyprland.org/Configuring/Variables/ for more + force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers +} diff --git a/.config/hypr/windowrules.conf b/.config/hypr/windowrules.conf new file mode 100644 index 0000000..30cbcaa --- /dev/null +++ b/.config/hypr/windowrules.conf @@ -0,0 +1,2 @@ +windowrulev2 = float,title:^(Friends List)$ +windowrulev2 = float,title:^(btm)$ -- cgit v1.2.3 From 8d2eb22af95e156b44dfd0aff7923cde1a76caf3 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 9 Sep 2024 00:12:38 -0400 Subject: fixed keybinds --- .config/hypr/binds.conf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.config/hypr') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index ae659c0..09505ac 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -27,11 +27,11 @@ bind = $mainMod, X, exec, $fileManager bind = $mainMod, K, exec, $terminal -e htop bind = $mainMod SHIFT, B, exec, /bin/sh -c "pidof waybar && pkill -x waybar || waybar" bind = $mainMod SHIFT, Q, exit, -bind = $mainMod SHIFT, RETURN, layoutmsg, swapwithmaster +bind = $mainMod, SPACE, layoutmsg, swapwithmaster bind = $mainMod, E, exec, emacsclient -c # Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, lp +bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d -- cgit v1.2.3 From ab36bab40071b2b6d4b235cedefb196ab0b4749e Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 9 Sep 2024 01:11:37 -0400 Subject: start hyprpaper --- .config/hypr/binds.conf | 6 +++++- scripts/get-brightness-percentage | 5 +++++ scripts/startup | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100755 scripts/get-brightness-percentage (limited to '.config/hypr') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 09505ac..eee39ef 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -7,7 +7,7 @@ $fileManager = kitty xplr $browser = waterfox $menu = wmenu-run -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more +# Main Binds bind = $mainMod, RETURN, exec, $menu bind = $mainMod, A, exec, $terminal bind = $mainMod, D, killactive, @@ -41,6 +41,10 @@ bind = $mainMod SHIFT,right ,movewindow, r bind = $mainMod SHIFT,up ,movewindow, u bind = $mainMod SHIFT,down ,movewindow, d +# controls +bind = , xf86monbrightnessup , exec, brightnessctl set 10%+ +bind = , xf86monbrightnessdown, exec, brightnessctl set 10%- + # screenshot + crop keybind bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" diff --git a/scripts/get-brightness-percentage b/scripts/get-brightness-percentage new file mode 100755 index 0000000..40073f0 --- /dev/null +++ b/scripts/get-brightness-percentage @@ -0,0 +1,5 @@ +#!/bin/bash +brightness=$(cat /sys/class/backlight/amdgpu_bl1/brightness) +max_brightness=$(cat /sys/class/backlight/amdgpu_bl1/max_brightness) +brightness_percentage=$(( $brightness * 100 / $max_brightness )) +echo "$brightness_percentage%" diff --git a/scripts/startup b/scripts/startup index 6a423a2..f69b35f 100755 --- a/scripts/startup +++ b/scripts/startup @@ -5,4 +5,5 @@ pipewire & mpd & dunst & waybar & +hyprpaper & gpg-agent --daemon -- cgit v1.2.3 From 524f5e38eb32c287f1d8e57da19dc7629831f1b5 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 9 Sep 2024 08:54:10 -0400 Subject: volume control --- .config/hypr/binds.conf | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to '.config/hypr') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index eee39ef..3394c32 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -42,8 +42,14 @@ bind = $mainMod SHIFT,up ,movewindow, u bind = $mainMod SHIFT,down ,movewindow, d # controls -bind = , xf86monbrightnessup , exec, brightnessctl set 10%+ -bind = , xf86monbrightnessdown, exec, brightnessctl set 10%- +binde = , xf86monbrightnessup , exec, brightnessctl set 10%+ +binde = , xf86monbrightnessdown, exec, brightnessctl set 10%- + +binde = , XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%+ +binde = , XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%- +binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%+ +binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%- +binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle # screenshot + crop keybind bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" -- cgit v1.2.3 From e812a702bcc1c66608dfe3339ac53d4670607b2d Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Mon, 9 Sep 2024 19:43:22 -0400 Subject: Wallpapers and EMACS --- .config/emacs/.gitignore | 15 +++ .config/emacs/init.el | 258 ++++++++++++++++++++++++++++++++++++++++++++ .config/hypr/hyprpaper.conf | 4 +- .config/waybar/config | 1 + .config/waybar/style.css | 12 ++- wallpapers/fogCreek.png | Bin 0 -> 5787435 bytes wallpapers/ghibliForest.png | Bin 0 -> 15822184 bytes 7 files changed, 285 insertions(+), 5 deletions(-) create mode 100644 .config/emacs/.gitignore create mode 100644 .config/emacs/init.el create mode 100644 wallpapers/fogCreek.png create mode 100644 wallpapers/ghibliForest.png (limited to '.config/hypr') diff --git a/.config/emacs/.gitignore b/.config/emacs/.gitignore new file mode 100644 index 0000000..c188f7b --- /dev/null +++ b/.config/emacs/.gitignore @@ -0,0 +1,15 @@ +/straight/ +/elpaca/ +/transient/ +/projectile-bookmarks.eld +/persp-confs/ +/history +/games/ +/eshell/ +/eln-cache/ +/auto-save-list/ +/.lsp-session-v1 +/.local/ +/.cache/ +/var/ +/etc/ \ No newline at end of file diff --git a/.config/emacs/init.el b/.config/emacs/init.el new file mode 100644 index 0000000..bffe787 --- /dev/null +++ b/.config/emacs/init.el @@ -0,0 +1,258 @@ +(setq make-backup-files nil + create-lockfiles nil + confirm-kill-processes nil) + +(setq inhibit-startup-message t + backup-inhibited t) + +(scroll-bar-mode -1) +(tool-bar-mode -1) +(tooltip-mode -1) +(menu-bar-mode -1) + +(setq scroll-up-aggressively nil + scroll-down-aggressively nil + scroll-conservatively 101 + display-line-numbers-type 'relative) + +(setq scroll-step 1) +(setq scroll-margin 8) + +(column-number-mode +1) +(global-display-line-numbers-mode t) +(setq-default fill-column 80) + +(electric-pair-mode +1) + +(dolist (mode '(org-mode-hook + term-mode-hook + vterm-mode-hook + shell-mode-hook + eshell-mode-hook + mu4e-main-mode-hook + mu4e-headers-mode-hook)) + (add-hook mode (lambda () (display-line-numbers-mode 0)))) + +(set-frame-parameter (selected-frame) 'alpha '(90 . 90)) +(add-to-list 'default-frame-alist '(alpha . (90 . 90))) + +(set-face-attribute 'default nil + :font "DejaVu Sans Mono" + :family "Monospace" + :height 97) +(set-face-attribute 'variable-pitch nil + :font "DejaVu Sans" + :height 97) +(set-face-attribute 'fixed-pitch nil + :font "DejaVu Sans Mono" + :family "Monospace" + :height 97) + +(defvar elpaca-installer-version 0.7) +(defvar elpaca-directory (expand-file-name "elpaca/" user-emacs-directory)) +(defvar elpaca-builds-directory (expand-file-name "builds/" elpaca-directory)) +(defvar elpaca-repos-directory (expand-file-name "repos/" elpaca-directory)) +(defvar elpaca-order '(elpaca :repo "https://github.com/progfolio/elpaca.git" + :ref nil :depth 1 + :files (:defaults "elpaca-test.el" (:exclude "extensions")) + :build (:not elpaca--activate-package))) +(let* ((repo (expand-file-name "elpaca/" elpaca-repos-directory)) + (build (expand-file-name "elpaca/" elpaca-builds-directory)) + (order (cdr elpaca-order)) + (default-directory repo)) + (add-to-list 'load-path (if (file-exists-p build) build repo)) + (unless (file-exists-p repo) + (make-directory repo t) + (when (< emacs-major-version 28) (require 'subr-x)) + (condition-case-unless-debug err + (if-let ((buffer (pop-to-buffer-same-window "*elpaca-bootstrap*")) + ((zerop (apply #'call-process `("git" nil ,buffer t "clone" + ,@(when-let ((depth (plist-get order :depth))) + (list (format "--depth=%d" depth) "--no-single-branch")) + ,(plist-get order :repo) ,repo)))) + ((zerop (call-process "git" nil buffer t "checkout" + (or (plist-get order :ref) "--")))) + (emacs (concat invocation-directory invocation-name)) + ((zerop (call-process emacs nil buffer nil "-Q" "-L" "." "--batch" + "--eval" "(byte-recompile-directory \".\" 0 'force)"))) + ((require 'elpaca)) + ((elpaca-generate-autoloads "elpaca" repo))) + (progn (message "%s" (buffer-string)) (kill-buffer buffer)) + (error "%s" (with-current-buffer buffer (buffer-string)))) + ((error) (warn "%s" err) (delete-directory repo 'recursive)))) + (unless (require 'elpaca-autoloads nil t) + (require 'elpaca) + (elpaca-generate-autoloads "elpaca" repo) + (load "./elpaca-autoloads"))) +(add-hook 'after-init-hook #'elpaca-process-queues) +(elpaca `(,@elpaca-order)) + +(elpaca elpaca-use-package + ;; Enable use-package :ensure support for Elpaca. + (elpaca-use-package-mode) + (setq elpaca-use-package-by-default t)) + +(elpaca-wait) + +(use-package diminish) +(elpaca-wait) + +(diminish 'abbrev-mode) +(auto-revert-mode 1) +(diminish 'auto-revert-mode) +(diminish 'eldoc-mode) +(diminish 'isearch-mode) +(diminish 'abbrev-mode) + +(recentf-mode 1) + +(use-package no-littering + :config + (add-to-list 'recentf-exclude + (recentf-expand-file-name no-littering-var-directory)) + (add-to-list 'recentf-exclude + (recentf-expand-file-name no-littering-etc-directory)) + (setq custom-file (no-littering-expand-etc-file-name "custom.el"))) + +(use-package gcmh + :diminish gcmh-mode + :init + (gcmh-mode 1)) + +(use-package which-key + :init (which-key-mode) + :diminish which-key-mode + :config + (setq which-key-idle-delay 3)) + +(use-package vertico + :ensure (vertico :files (:defaults "extensions/*")) + :diminish vertico-mode + :bind (:map vertico-map + ("C-n" . vertico-next) + ("C-p" . vertico-previous)) + :init + (vertico-mode 1) + ;; (vertico-flat-mode 1) + (setq vertico-count 15)) + +(use-package vertico-directory + :after vertico + :ensure nil + ;; More convenient directory navigation commands + :bind (:map vertico-map + ("RET" . vertico-directory-enter) + ("DEL" . vertico-directory-delete-char) + ("M-DEL" . vertico-directory-delete-word)) + ;; Tidy shadowed file names + :hook (rfn-eshadow-update-overlay . vertico-directory-tidy)) + +(use-package savehist + :ensure nil + :diminish savehist-mode + :init + (savehist-mode 1)) + +(use-package marginalia + :diminish marginalia-mode + :after vertico + :custom + (marginalia-annotators '(marginalia-annotators-heavy marginalia-annotators-light nil)) + :config + (marginalia-mode)) + +(use-package consult + :config + (setq completion-in-region-function + (lambda (&rest args) + (apply (if vertico-mode + #'consult-completion-in-region + #'completion--in-region) + args))) + (consult-customize consult-buffer :preview-key "M-.")) + +(use-package orderless + :config + (setq completion-styles '(orderless) + completion-category-defaults nil + completion-category-overrides '((file (styles . (partial-completion)))))) + +(use-package doom-themes + :config + (setq doom-themes-enable-bold t + doom-themes-enable-italic t) + (load-theme 'doom-vibrant t) + (doom-themes-org-config)) + +(use-package embark + :bind + (("C-." . embark-act) + ("C-;" . embark-dwim)) + :init + (setq prefix-help-command #'embark-prefix-help-command) + :config + (setq embark--minimal-indicator-overlay nil) + (setq embark-indicators (delq 'embark-mixed-indicator embark-indicators)) + (add-to-list 'embark-indicators #'embark-minimal-indicator)) + +(use-package embark-consult + :config + (define-key embark-file-map (kbd "S") 'sudo-find-file)) + +(use-package nerd-icons) +(use-package all-the-icons) + +(use-package flyspell + :ensure nil + ;; :diminish flyspell-mode + ) + +(use-package flyspell-correct + :after flyspell) + +(use-package consult-flyspell + :ensure (consult-flyspell :host gitlab :repo "OlMon/consult-flyspell" :branch "master") + :config + ;; default settings + (setq consult-flyspell-select-function (lambda () (flyspell-correct-at-point) (consult-flyspell)) + consult-flyspell-set-point-after-word t + consult-flyspell-always-check-buffer nil)) + +(use-package rainbow-delimiters + :diminish rainbow-delimiters-mode + :hook (prog-mode . rainbow-delimiters-mode)) + +(use-package emojify + :hook (after-init . global-emojify-mode) + :config + (add-hook 'prog-mode-hook #'(lambda () (emojify-mode -1)))) + +(use-package helpful + :bind + ([remap describe-command] . helpful-command) + ([remap describe-function] . helpful-callable) + ([remap describe-variable] . helpful-variable) + ([remap describe-key] . helpful-key)) + +(use-package writeroom-mode + :diminish) + +(use-package undo-tree + :diminish undo-tree-mode + :config + (global-undo-tree-mode) + (add-hook 'authinfo-mode-hook #'(lambda () (setq-local undo-tree-auto-save-history nil))) + (defvar --undo-history-directory (concat user-emacs-directory "undotreefiles/") + "Directory to save undo history files.") + (unless (file-exists-p --undo-history-directory) + (make-directory --undo-history-directory t)) + ;; stop littering with *.~undo-tree~ files everywhere + (setq undo-tree-history-directory-alist `(("." . ,--undo-history-directory)))) + + +;; Keybinds + +(global-unset-key (kbd "C-z")) +(global-set-key (kbd "") #'keyboard-escape-quit) +(global-set-key (kbd "C-/") #'undo-tree-undo) +(global-set-key (kbd "M-/") #'undo-tree-redo) diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 5c09733..961f0ca 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = /home/jack/.dotfiles/wallpapers/signalis.png -wallpaper = ,/home/jack/.dotfiles/wallpapers/signalis.png +preload = /home/jack/.dotfiles/wallpapers/ghibliForest.png +wallpaper = ,/home/jack/.dotfiles/wallpapers/ghibliForest.png diff --git a/.config/waybar/config b/.config/waybar/config index c6ec0e0..532109d 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -16,6 +16,7 @@ }, "custom/brightness": { "exec": "get-brightness-percentage", + "interval": 1, "format": "{} 󰃝", }, "network": { diff --git a/.config/waybar/style.css b/.config/waybar/style.css index bfa642d..7e9c40e 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -8,7 +8,7 @@ window#waybar { background-color: rgba(13, 27, 42, 0.5); color: rgba(228, 228, 239, 1); - border: 1px solid rgba(238, 171, 196, 0.8); + border: 2px solid rgba(238, 171, 196, 0.8); border-radius: 10px; } @@ -36,13 +36,13 @@ window#waybar { /* background-color: #2a3f38; */ /* background-color: rgba(51, 102, 0, 0.5); */ /* margin: 0 0 0 2px; */ - /* padding: 0 3px 0 0; */ + padding: 0 0 0 15px; } tooltip { background-color: rgba(13, 27, 42, 1); color: rgba(228, 228, 239, 1); - border: 1px solid rgba(238, 171, 196, 0.8); + border: 2px solid rgba(238, 171, 196, 0.8); border-radius: 10px; } @@ -57,6 +57,7 @@ tooltip { #workspaces button.active { color: rgba(238, 171, 196, 0.8); + transition: all 150ms ease; } #workspaces button:hover { @@ -64,6 +65,11 @@ tooltip { border-color: rgba(238, 171, 196, 0.8); box-shadow: none; text-shadow: none; + transition: all 150ms ease; +} + +#workspaces button:not(:last-child) { + transition: all 150ms ease; } #network, diff --git a/wallpapers/fogCreek.png b/wallpapers/fogCreek.png new file mode 100644 index 0000000..6381292 Binary files /dev/null and b/wallpapers/fogCreek.png differ diff --git a/wallpapers/ghibliForest.png b/wallpapers/ghibliForest.png new file mode 100644 index 0000000..1c1dce4 Binary files /dev/null and b/wallpapers/ghibliForest.png differ -- cgit v1.2.3 From 0ddd38e5fa62949d1161d06c7c70ee9ff135ebdb Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Tue, 10 Sep 2024 21:32:18 -0400 Subject: emacs lsp and hyprland --- .bash_profile~ | 9 --- .bashrc~ | 10 ---- .config/emacs/Emacs.org | 126 ++++++++++++++++++++++++++++++++++++++++++ .config/emacs/init.el | 107 +++++++++++++++++++++++++++++++++++ .config/hypr/#hyprland.conf# | 65 ---------------------- .config/hypr/#hyprpaper.conf# | 2 - .config/hypr/#monitors.conf# | 26 --------- .config/hypr/binds.conf~ | 80 --------------------------- .config/hypr/hyprland.conf~ | 62 --------------------- .config/hypr/hyprpaper.conf~ | 2 - .config/hypr/monitors.conf~ | 26 --------- .config/hypr/style.conf | 1 + .config/hypr/style.conf~ | 61 -------------------- .config/waybar/config | 2 +- scripts/git-ps1~ | 9 --- scripts/startup~ | 10 ---- 16 files changed, 235 insertions(+), 363 deletions(-) delete mode 100644 .bash_profile~ delete mode 100644 .bashrc~ delete mode 100644 .config/hypr/#hyprland.conf# delete mode 100644 .config/hypr/#hyprpaper.conf# delete mode 100644 .config/hypr/#monitors.conf# delete mode 100644 .config/hypr/binds.conf~ delete mode 100644 .config/hypr/hyprland.conf~ delete mode 100644 .config/hypr/hyprpaper.conf~ delete mode 100644 .config/hypr/monitors.conf~ delete mode 100644 .config/hypr/style.conf~ delete mode 100644 scripts/git-ps1~ delete mode 100755 scripts/startup~ (limited to '.config/hypr') diff --git a/.bash_profile~ b/.bash_profile~ deleted file mode 100644 index 277ac2d..0000000 --- a/.bash_profile~ +++ /dev/null @@ -1,9 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc - -if [[ -t 0 && $(tty) == /dev/tty1 && ! $DISPLAY ]]; then - exec dbus-launch --exit-with-session Hyprland -fi diff --git a/.bashrc~ b/.bashrc~ deleted file mode 100644 index 11b877e..0000000 --- a/.bashrc~ +++ /dev/null @@ -1,10 +0,0 @@ -# -# ~/.bashrc -# - -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -alias ls='ls --color=auto' -alias grep='grep --color=auto' -PS1='\u@\h \W ($(git branch --show-current 2>/dev/null)) \$ ' diff --git a/.config/emacs/Emacs.org b/.config/emacs/Emacs.org index b372a51..04d1965 100644 --- a/.config/emacs/Emacs.org +++ b/.config/emacs/Emacs.org @@ -306,6 +306,7 @@ :config (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l) aw-scope 'frame)) + (elpaca-wait) #+end_src @@ -355,3 +356,128 @@ best git frontend ever (global-set-key (kbd "M-n") #'move-text-down) #+end_src + +* Development + +#+begin_src emacs-lisp + (use-package lsp-mode + :init + (setq lsp-keymap-prefix "C-c l" + lsp-headerline-breadcrumb-enable nil + lsp-headerline-breadcrumb-icons-enable nil + lsp-keep-workspace-alive nil + lsp-enable-snippet nil + lsp-lens-enable nil) + :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) + (c-mode . lsp) + (c++-mode . lsp) + (python-mode . lsp-deferred) + ;; if you want which-key integration + (lsp-mode . lsp-enable-which-key-integration)) + :commands lsp) + + + (use-package consult-lsp + :after lsp) + + (defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (c-set-offset 'substatement-open 0) + ;; other customizations can go here + + (setq c++-tab-always-indent t) + (setq c-basic-offset 4) ;; Default is 2 + (setq c-indent-level 4) ;; Default is 2 + + (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) + (setq tab-width 4) + (setq indent-tabs-mode t) ; use spaces only if nil + ) + + (add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + + (use-package lsp-ui + :after lsp + :diminish lsp-lens-mode + :config + (setq lsp-ui-sideline-update-mode 'point) + (setq lsp-ui-sideline-show-diagnostics t) + (setq lsp-ui-sideline-ignore-duplicate t)) + + (use-package hydra) + + (use-package lsp-treemacs + :ensure t + :commands lsp-treemacs-errors-list) + + ;; company + (use-package company + :ensure t + :diminish + :config + (setq company-show-numbers t + company-minimum-prefix-length 1 + company-idle-delay 0 + company-backends + '((company-files ; files & directory + company-keywords ; keywords + company-capf ; what is this? + company-yasnippet) + (company-abbrev company-dabbrev))) + (global-company-mode +1)) + + (use-package clang-format) + (use-package clang-format+) + + + (use-package company-box + :ensure t + :diminish + :after company + :hook (company-mode . company-box-mode)) + + ;; flycheck + (use-package flycheck + :diminish flycheck-mode + :config + (setq flycheck-error-message-buffer " *Flycheck error messages*") + (setq-default flycheck-emacs-lisp-load-path 'inherit) + (global-flycheck-mode 1)) + + (use-package flycheck-pos-tip + :ensure t + :after flycheck + :config + (flycheck-pos-tip-mode)) + + (use-package ccls + :ensure t + :config + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp))) + (setq ccls-executable "/usr/local/bin/ccls") + (setq ccls-initialization-options + '(:index (:comments 2) :completion (:detailedLabel t)))) + + (use-package srefactor + :ensure t + :config + (semantic-mode 1) + (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) + (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + + +#+end_src + +** multiple cursors + +#+begin_src emacs-lisp + (use-package multiple-cursors + :bind (:map global-map + ("C->" . 'mc/mark-next-like-this) + ("C-<" . 'mc/mark-previous-like-this) + ("C-c C->" . 'mc/mark-all-like-this) + :map mc/keymap + ("" . nil))) +#+end_src + diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 27a5a2e..7ca42e3 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -295,6 +295,7 @@ :config (setq aw-keys '(?a ?s ?d ?f ?g ?h ?j ?k ?l) aw-scope 'frame)) +(elpaca-wait) (use-package tree-sitter :diminish tree-sitter-mode @@ -306,6 +307,12 @@ :diminish highlight-quoted-mode :hook (emacs-lisp-mode . highlight-quoted-mode)) +(use-package transient) +(use-package magit + :bind (("C-x g" . magit-status)) + :custom + (magit-display-buffer-function #'magit-display-buffer-same-window-except-diff-v1)) + (global-unset-key (kbd "C-z")) (global-set-key (kbd "") #'keyboard-escape-quit) (global-set-key (kbd "C-/") #'undo-tree-undo) @@ -313,3 +320,103 @@ (global-set-key (kbd "C-c v") #'avy-goto-char-timer) (global-set-key (kbd "M-p") #'move-text-up) (global-set-key (kbd "M-n") #'move-text-down) + +(use-package lsp-mode + :init + (setq lsp-keymap-prefix "C-c l" + lsp-headerline-breadcrumb-enable nil + lsp-headerline-breadcrumb-icons-enable nil + lsp-keep-workspace-alive nil + lsp-enable-snippet nil + lsp-lens-enable nil) + :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) + (c-mode . lsp) + (c++-mode . lsp) + (python-mode . lsp-deferred) + ;; if you want which-key integration + (lsp-mode . lsp-enable-which-key-integration)) + :commands lsp) + + +(use-package consult-lsp + :after lsp) + +(defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (c-set-offset 'substatement-open 0) + ;; other customizations can go here + + (setq c++-tab-always-indent t) + (setq c-basic-offset 4) ;; Default is 2 + (setq c-indent-level 4) ;; Default is 2 + + (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) + (setq tab-width 4) + (setq indent-tabs-mode t) ; use spaces only if nil + ) + +(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + +(use-package lsp-ui + :after lsp + :diminish lsp-lens-mode + :config + (setq lsp-ui-sideline-update-mode 'point) + (setq lsp-ui-sideline-show-diagnostics t) + (setq lsp-ui-sideline-ignore-duplicate t)) + +(use-package hydra) + +(use-package lsp-treemacs + :ensure t + :commands lsp-treemacs-errors-list) + +;; company +(use-package company + :ensure t + :config + (setq company-show-numbers t + company-minimum-prefix-length 1 + company-idle-delay 0.5 + company-backends + '((company-files ; files & directory + company-keywords ; keywords + company-capf ; what is this? + company-yasnippet) + (company-abbrev company-dabbrev))) + (global-company-mode +1)) + +(use-package company-box + :ensure t + :after company + :hook (company-mode . company-box-mode)) + +;; flycheck +(use-package flycheck + :diminish flycheck-mode + :config + (setq flycheck-error-message-buffer " *Flycheck error messages*") + (setq-default flycheck-emacs-lisp-load-path 'inherit) + (global-flycheck-mode 1)) + +(use-package flycheck-pos-tip + :ensure t + :after flycheck + :config + (flycheck-pos-tip-mode)) + +(use-package ccls + :ensure t + :config + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp))) + (setq ccls-executable "/usr/local/bin/ccls") + (setq ccls-initialization-options + '(:index (:comments 2) :completion (:detailedLabel t)))) + +(use-package srefactor + :ensure t + :config + (semantic-mode 1) + (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) + (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) diff --git a/.config/hypr/#hyprland.conf# b/.config/hypr/#hyprland.conf# deleted file mode 100644 index 5df0c2c..0000000 --- a/.config/hypr/#hyprland.conf# +++ /dev/null @@ -1,65 +0,0 @@ -source=binds.conf -source=monitors.conf -source=style.conf -source=windowrules.conf - -# Slow app launch fix -exec-once = systemctl --user import-environment & -exec-once = hash dbus-update-activation-environment 2>/dev/null & -exec-once = dbus-update-activation-environment --systemd & -#exec-once = xdg-desktop-portal-hyprland & - -exec-once = hyprctl setcursor HyprBibataModernClassicSVG 24 -exec-once = hyprctl dispatch workspace 1 -exec-once = xrandr --output XWAYLAND0 --primary -exec-once = gsettings set org.gnome.desktop.interface cursor-theme "Bibata-Modern-Classic" -exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" -exec-once = gsettings set org.gnome.desktop.interface gtk-theme Adwaita -exec-once = hyprpaper -exec-once = waybar - -# Some default env vars. -env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that -env = XDG_SESSION_TYPE,wayland -env = XDG_SESSION_DESKTOP,Hyprland -env = XCURSOR_THEME,"Bibata-Modern-Classic" -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_THEME,HyprBibataModernClassicSVG -env = HYPRCURSOR_SIZE,64 -env = LIBVA_DRIVER_NAME,nvidia -env = GBM_BACKEND,nvidia-drm -env = __GLX_VENDOR_LIBRARY_NAME,nvidia - -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = ctrl:nocaps - kb_rules = - - follow_mouse = 1 - - repeat_delay = 300 - repeat_rate = 30 - - touchpad { - natural_scroll = no - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -general { - layout = dwindle - #layout = master - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false -} - -windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ -windowrulev2 = noanim,class:^(xwaylandvideobridge)$ -windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ -windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ -windowrulev2 = noblur,class:^(xwaylandvideobridge)$ diff --git a/.config/hypr/#hyprpaper.conf# b/.config/hypr/#hyprpaper.conf# deleted file mode 100644 index 60a08a1..0000000 --- a/.config/hypr/#hyprpaper.conf# +++ /dev/null @@ -1,2 +0,0 @@ -preload = /home/nahtaiv3l/wallpapers/current_wallpaper/ -wallpaper = ,/home/nahtaiv3l/wallpapers/current_wallpaper diff --git a/.config/hypr/#monitors.conf# b/.config/hypr/#monitors.conf# deleted file mode 100644 index 9fd450f..0000000 --- a/.config/hypr/#monitors.conf# +++ /dev/null @@ -1,26 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Monitors/ -#monitor=DP-1,2560x1440@144,0x0,auto -monitor=eDP1,highres,auto,1 -#monitor=DP-2,1920x1080@60,2560x0,auto - -# FOR HYPRSOME (MULTIPLE MONITORS) -workspace=1,monitor:eDP-1 -workspace=2,monitor:eDP-1 -workspace=3,monitor:eDP-1 -workspace=4,monitor:eDP-1 -workspace=5,monitor:eDP-1 -workspace=6,monitor:eDP-1 -workspace=7,monitor:eDP-1 -workspace=8,monitor:eDP-1 -workspace=9,monitor:eDP-1 -workspace=10,monitor:eDP-1 - -workspace=11,monitor:eDP-2 -workspace=12,monitor:eDP-2 -workspace=13,monitor:eDP-2 -workspace=14,monitor:eDP-2 -workspace=15,monitor:eDP-2 -workspace=17,monitor:eDP-2 -workspace=18,monitor:eDP-2 -workspace=19,monitor:eDP-2 -workspace=10,monitor:eDP-2 diff --git a/.config/hypr/binds.conf~ b/.config/hypr/binds.conf~ deleted file mode 100644 index 0973750..0000000 --- a/.config/hypr/binds.conf~ +++ /dev/null @@ -1,80 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Keywords/ for more -$mainMod = SUPER - -# Set programs that you use -$terminal = alacritty -$fileManager = kitty xplr -$browser = waterfox -$menu = wmenu-run - -# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more -bind = $mainMod, RETURN, exec, $menu -bind = $mainMod, A, exec, $terminal -bind = $mainMod, D, killactive, -bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill -bind = $mainMod, S, exec, hyprshot -m region -bind = , PRINT, exec, hyprshot -m output -bind = $mainMod, PRINT, exec, hyprshot -m window -bind = $mainMod, M, exit, -bind = $mainMod, V, togglefloating, -bind = $mainMod, P, exec, hyprpicker -a -bind = $mainMod, L, exec, hyprlock -bind = $mainMod, R, togglesplit, # dwindle -bind = $mainMod, F, fullscreen -bind = $mainMod, G, fullscreenstate, 0 3 -bind = $mainMod, W, exec, $browser -bind = $mainMod, X, exec, $fileManager -bind = $mainMod, K, exec, kitty btm -bind = $mainMod SHIFT, B, exec, /bin/sh -c "pidof waybar && pkill -x waybar || waybar" -bind = $mainMod SHIFT, Q, exit, -bind = $mainMod SHIFT, RETURN, layoutmsg, swapwithmaster - -# Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, lp -bind = $mainMod, right, movefocus, r -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d - -bind = $mainMod SHIFT,left ,movewindow, l -bind = $mainMod SHIFT,right ,movewindow, r -bind = $mainMod SHIFT,up ,movewindow, u -bind = $mainMod SHIFT,down ,movewindow, d - -# screenshot + crop keybind -bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" - -# Example special workspace (scratchpad) COMMENTED OUT FOR SCREENSHOT KEYBIND -# bind = $mainMod, S, togglespecialworkspace, magic -# bind = $mainMod SHIFT, S, movetoworkspace, special:magic - -# Scroll through existing workspaces with mainMod + scroll -bind = $mainMod, mouse_down, workspace, e+1 -bind = $mainMod, mouse_up, workspace, e-1 - -# Move/resize windows with mainMod + LMB/RMB and dragging -bindm = $mainMod, mouse:272, movewindow -bindm = $mainMod, mouse:273, resizewindow - -# switch workspaces with mainMod + [0-9] -bind = $mainMod, 1, workspace, 1 -bind = $mainMod, 2, workspace, 2 -bind = $mainMod, 3, workspace, 3 -bind = $mainMod, 4, workspace, 4 -bind = $mainMod, 5, workspace, 5 -bind = $mainMod, 6, workspace, 6 -bind = $mainMod, 7, workspace, 7 -bind = $mainMod, 8, workspace, 8 -bind = $mainMod, 9, workspace, 9 -bind = $mainMod, 0, workspace, 10 - -# move active window to a workspace with mainMod + SHIFT + [0-9] -bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1 -bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2 -bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3 -bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4 -bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5 -bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6 -bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7 -bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8 -bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9 -bind = $mainMod SHIFT, 0, movetoworkspacesilent, 10 diff --git a/.config/hypr/hyprland.conf~ b/.config/hypr/hyprland.conf~ deleted file mode 100644 index 672ef72..0000000 --- a/.config/hypr/hyprland.conf~ +++ /dev/null @@ -1,62 +0,0 @@ -source=binds.conf -source=monitors.conf -source=style.conf -source=windowrules.conf - -# Slow app launch fix -exec-once = systemctl --user import-environment & -exec-once = hash dbus-update-activation-environment 2>/dev/null & -exec-once = dbus-update-activation-environment --systemd & -exec-once = startup -#exec-once = xdg-desktop-portal-hyprland & - -exec-once = hyprctl dispatch workspace 1 - -exec-once = gsettings set org.gnome.desktop.interface cursor-theme "Bibata-Modern-Classic" -exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark" -exec-once = gsettings set org.gnome.desktop.interface gtk-theme Adwaita -exec-once = hyprpaper -exec-once = waybar - -# Some default env vars. -env = QT_QPA_PLATFORMTHEME,qt6ct # change to qt6ct if you have that -env = XDG_SESSION_TYPE,wayland -env = XDG_SESSION_DESKTOP,Hyprland -env = XCURSOR_THEME,"Bibata-Modern-Classic" -env = XCURSOR_SIZE,24 -env = HYPRCURSOR_THEME,HyprBibataModernClassicSVG - -# For all categories, see https://wiki.hyprland.org/Configuring/Variables/ -input { - kb_layout = us - kb_variant = - kb_model = - kb_options = ctrl:nocaps - kb_rules = - - follow_mouse = 1 - - repeat_delay = 300 - repeat_rate = 30 - - touchpad { - natural_scroll = yes - disable_while_typing = true - } - - sensitivity = 0 # -1.0 - 1.0, 0 means no modification. -} - -general { - #layout = dwindle - layout = master - - # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on - allow_tearing = false -} - -windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$ -windowrulev2 = noanim,class:^(xwaylandvideobridge)$ -windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$ -windowrulev2 = maxsize 1 1,class:^(xwaylandvideobridge)$ -windowrulev2 = noblur,class:^(xwaylandvideobridge)$ diff --git a/.config/hypr/hyprpaper.conf~ b/.config/hypr/hyprpaper.conf~ deleted file mode 100644 index 2612cc8..0000000 --- a/.config/hypr/hyprpaper.conf~ +++ /dev/null @@ -1,2 +0,0 @@ -preload = /home/nahtaiv3l/wallpapers/current_wallpaper -wallpaper = ,/home/nahtaiv3l/wallpapers/current_wallpaper diff --git a/.config/hypr/monitors.conf~ b/.config/hypr/monitors.conf~ deleted file mode 100644 index 9fd450f..0000000 --- a/.config/hypr/monitors.conf~ +++ /dev/null @@ -1,26 +0,0 @@ -# See https://wiki.hyprland.org/Configuring/Monitors/ -#monitor=DP-1,2560x1440@144,0x0,auto -monitor=eDP1,highres,auto,1 -#monitor=DP-2,1920x1080@60,2560x0,auto - -# FOR HYPRSOME (MULTIPLE MONITORS) -workspace=1,monitor:eDP-1 -workspace=2,monitor:eDP-1 -workspace=3,monitor:eDP-1 -workspace=4,monitor:eDP-1 -workspace=5,monitor:eDP-1 -workspace=6,monitor:eDP-1 -workspace=7,monitor:eDP-1 -workspace=8,monitor:eDP-1 -workspace=9,monitor:eDP-1 -workspace=10,monitor:eDP-1 - -workspace=11,monitor:eDP-2 -workspace=12,monitor:eDP-2 -workspace=13,monitor:eDP-2 -workspace=14,monitor:eDP-2 -workspace=15,monitor:eDP-2 -workspace=17,monitor:eDP-2 -workspace=18,monitor:eDP-2 -workspace=19,monitor:eDP-2 -workspace=10,monitor:eDP-2 diff --git a/.config/hypr/style.conf b/.config/hypr/style.conf index e818cbf..db0c6de 100644 --- a/.config/hypr/style.conf +++ b/.config/hypr/style.conf @@ -47,6 +47,7 @@ master { # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more new_status = master new_on_top = true + orientation = right mfact = 0.5 } diff --git a/.config/hypr/style.conf~ b/.config/hypr/style.conf~ deleted file mode 100644 index ceef549..0000000 --- a/.config/hypr/style.conf~ +++ /dev/null @@ -1,61 +0,0 @@ -general { - gaps_in = 3 - gaps_out = 25 - - border_size = 2 - col.active_border = rgba(EEABC4aa) - col.inactive_border = rgba(595959aa) -} - -decoration { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - - rounding = 4 - - blur { - enabled = true - size = 2 - passes = 3 - } - - drop_shadow = no - shadow_range = 4 - shadow_render_power = 3 - col.shadow = rgba(1a1a1aee) -} - -animations { - enabled = yes - - bezier = defaultBezier, 0.05, 0.9, 0.1, 1.05 - - animation = windows, 1, 7, defaultBezier - animation = windowsOut, 1, 7, default, popin 80% - animation = border, 1, 10, default - animation = borderangle, 1, 8, default - animation = fade, 1, 3, default - animation = workspaces, 1, 6, defaultBezier -} - -dwindle { - # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more - pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below - preserve_split = yes # you probably want this -} - -master { - # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more - new_status = master - new_on_top = true - mfact = 0.5 -} - -gestures { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - workspace_swipe = on -} - -misc { - # See https://wiki.hyprland.org/Configuring/Variables/ for more - force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers -} diff --git a/.config/waybar/config b/.config/waybar/config index 532109d..f14f700 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -39,7 +39,7 @@ "interval": 1, }, "clock": { - // "timezone": "America/New_York", + "timezone": "America/New_York", "format": "{:%r}", "tooltip-format": "{:%d %B %Y}", "interval": 1, diff --git a/scripts/git-ps1~ b/scripts/git-ps1~ deleted file mode 100644 index 22093d4..0000000 --- a/scripts/git-ps1~ +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -out=$(git branch --show-current) -if [ -z "$out" ] then - out-"" -else - out="($out)" -fi -echo -n "($out)" - \ No newline at end of file diff --git a/scripts/startup~ b/scripts/startup~ deleted file mode 100755 index f0da64f..0000000 --- a/scripts/startup~ +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -backlightctrl -set 10 -gpgconf -K gpg-agent -restartsearxng & -restartemacs >/dev/null & -pipewire & -mpd & -dunst & -waybar & -gpg-agent --daemon -- cgit v1.2.3 From e4d544ff68a1885be156230afae09d0f96024c9e Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Fri, 13 Sep 2024 00:37:28 -0400 Subject: screenshot --- .config/hypr/binds.conf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to '.config/hypr') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 3394c32..b4646e9 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -12,9 +12,8 @@ bind = $mainMod, RETURN, exec, $menu bind = $mainMod, A, exec, $terminal bind = $mainMod, D, killactive, bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill -bind = $mainMod, S, exec, hyprshot -m region -bind = , PRINT, exec, hyprshot -m output -bind = $mainMod, PRINT, exec, hyprshot -m window +bind = $mainMod CTRL, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png') +bind = $mainMod, S, exec, grim -o eDP-1 ~/Pictures/Screenshots/$(date +'%s_grim.png') bind = $mainMod, M, exit, bind = $mainMod, V, togglefloating, bind = $mainMod, P, exec, hyprpicker -a @@ -23,7 +22,6 @@ bind = $mainMod, R, togglesplit, # dwindle bind = $mainMod, F, fullscreen bind = $mainMod, G, fullscreenstate, 0 3 bind = $mainMod, W, exec, $browser -bind = $mainMod, X, exec, $fileManager bind = $mainMod, K, exec, $terminal -e htop bind = $mainMod SHIFT, B, exec, /bin/sh -c "pidof waybar && pkill -x waybar || waybar" bind = $mainMod SHIFT, Q, exit, -- cgit v1.2.3 From 87d1769dcbdd5fe5e5ebde8f2bc6e490611947cb Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Tue, 1 Oct 2024 15:41:38 -0400 Subject: I'm going through changes --- .bash_profile | 3 +- .config/emacs/Emacs.org | 20 ++++++- .config/emacs/init.el | 18 +++++- .config/hypr/binds.conf | 4 ++ .config/hypr/hyprlock.conf | 134 +++++++++++++-------------------------------- .config/mpd/.gitignore | 4 ++ .config/mpd/mpd.conf | 20 +++++++ .config/mpd/mpd.pid | 1 + .config/waybar/config | 2 +- .gitignore | 1 + scripts/restartsearxng | 3 + scripts/startup | 1 + scripts/yt-dla | 8 +++ scripts/yt-dlv | 8 +++ 14 files changed, 128 insertions(+), 99 deletions(-) create mode 100644 .config/mpd/.gitignore create mode 100644 .config/mpd/mpd.conf create mode 100644 .config/mpd/mpd.pid create mode 100755 scripts/restartsearxng create mode 100755 scripts/yt-dla create mode 100644 scripts/yt-dlv (limited to '.config/hypr') diff --git a/.bash_profile b/.bash_profile index a70742b..81ae1ca 100644 --- a/.bash_profile +++ b/.bash_profile @@ -4,7 +4,8 @@ [[ -f ~/.bashrc ]] && . ~/.bashrc -export PATH=$PATH:$HOME/.dotfiles/scripts +export PATH="$PATH:$HOME/.dotfiles/scripts" +export PATH="$PATH:/home/jack/.dotnet/tools" if [[ -t 0 && $(tty) == /dev/tty1 && ! $DISPLAY ]]; then exec dbus-launch --exit-with-session Hyprland diff --git a/.config/emacs/Emacs.org b/.config/emacs/Emacs.org index a98f70f..71a342c 100644 --- a/.config/emacs/Emacs.org +++ b/.config/emacs/Emacs.org @@ -6,6 +6,7 @@ #+begin_src emacs-lisp (setq make-backup-files nil create-lockfiles nil + erc-join-buffer 'window confirm-kill-processes nil) (setq inhibit-startup-message t @@ -372,6 +373,7 @@ best git frontend ever (c-mode . lsp) (c++-mode . lsp) (python-mode . lsp-deferred) + (csharp-mode . lsp) ;; if you want which-key integration (lsp-mode . lsp-enable-which-key-integration)) :commands lsp) @@ -420,7 +422,7 @@ best git frontend ever :config (setq company-show-numbers t company-minimum-prefix-length 1 - company-idle-delay 0 + company-idle-delay 0.2 company-backends '((company-files company-keywords @@ -484,3 +486,19 @@ best git frontend ever ("" . nil))) #+end_src +* Dired +#+begin_src emacs-lisp + (use-package dired + :ensure nil + :ensure nil + :commands (dired dired-jump) + :bind (:map dired-mode-map ("SPC" . dired-single-buffer)) + :config + (setq dired-dwim-target t) + (evil-collection-define-key 'normal 'dired-mode-map + "h" 'dired-single-up-directory + "l" 'dired-single-buffer)) + + (use-package dired-single + :commands (dired dired-jump)) +#+end_src diff --git a/.config/emacs/init.el b/.config/emacs/init.el index ffa75a9..e10998b 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -1,5 +1,6 @@ (setq make-backup-files nil create-lockfiles nil + erc-join-buffer 'window confirm-kill-processes nil) (setq inhibit-startup-message t @@ -333,6 +334,7 @@ (c-mode . lsp) (c++-mode . lsp) (python-mode . lsp-deferred) + (csharp-mode . lsp) ;; if you want which-key integration (lsp-mode . lsp-enable-which-key-integration)) :commands lsp) @@ -381,7 +383,7 @@ :config (setq company-show-numbers t company-minimum-prefix-length 1 - company-idle-delay 0 + company-idle-delay 0.2 company-backends '((company-files company-keywords @@ -437,3 +439,17 @@ ("C-c C->" . 'mc/mark-all-like-this) :map mc/keymap ("" . nil))) + +(use-package dired + :ensure nil + :ensure nil + :commands (dired dired-jump) + :bind (:map dired-mode-map ("SPC" . dired-single-buffer)) + :config + (setq dired-dwim-target t) + (evil-collection-define-key 'normal 'dired-mode-map + "h" 'dired-single-up-directory + "l" 'dired-single-buffer)) + +(use-package dired-single + :commands (dired dired-jump)) diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index b4646e9..186ee78 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -31,11 +31,15 @@ bind = $mainMod, E, exec, emacsclient -c # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l bind = $mainMod, right, movefocus, r +bind = $mainMod, n, cyclenext, prev +bind = $mainMod, p, cyclenext bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d bind = $mainMod SHIFT,left ,movewindow, l bind = $mainMod SHIFT,right ,movewindow, r +bind = $mainMod SHIFT, n, swapnext, prev +bind = $mainMod SHIFT, p, swapnext bind = $mainMod SHIFT,up ,movewindow, u bind = $mainMod SHIFT,down ,movewindow, d diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index 3150f25..fb4be3c 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -1,102 +1,46 @@ -# $text_color = rgba(E3E1EFFF) -# $entry_background_color = rgba(12131C11) -# $entry_border_color = rgba(908F9F55) -# $entry_color = rgba(C6C5D6FF) -$text_color = rgba(FFFFFFFF) -$entry_background_color = rgba(33333311) -$entry_border_color = rgba(3B3B3B55) -$entry_color = rgba(FFFFFFFF) -$font_family = Rubik Light -$font_family_clock = Rubik Light -$font_material_symbols = Material Symbols Rounded +disable_loading_bar = true +hide_cursor = true +no_fade_in = true background { - # color = rgba(0D0D17FF) - color = rgba(000000FF) - # path = {{ SWWW_WALL }} - # path = screenshot - # blur_size = 5 - # blur_passes = 4 -} -input-field { monitor = - size = 250, 50 - outline_thickness = 2 - dots_size = 0.1 - dots_spacing = 0.3 - outer_color = $entry_border_color - inner_color = $entry_background_color - font_color = $entry_color - # fade_on_empty = true - - position = 0, 20 - halign = center - valign = center + path = screenshot + + # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations + blur_passes = 2 # 0 disables blurring + blur_size = 2 + noise = 0.0117 + contrast = 0.8916 + brightness = 0.8172 + vibrancy = 0.1696 + vibrancy_darkness = 0.0 } - -label { # Clock - monitor = - text = $TIME - shadow_passes = 1 - shadow_boost = 0.5 - color = $text_color - font_size = 65 - font_family = $font_family_clock - - position = 0, 300 - halign = center - valign = center -} -label { # Greeting +input-field { monitor = - text = hi $USER !!! - shadow_passes = 1 - shadow_boost = 0.5 - color = $text_color - font_size = 20 - font_family = $font_family - - position = 0, 240 + size = 50, 50 + outline_thickness = 3 + dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 + dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 + dots_center = false + dots_rounding = -1 # -1 default circle, -2 follow input-field rounding + outer_color = rgb(151515) + inner_color = rgb(200, 200, 200) + font_color = rgb(10, 10, 10) + fade_on_empty = true + fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. + hide_input = true + rounding = -1 # -1 means complete rounding (circle/oval) + check_color = rgb(204, 136, 34) + fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color + fail_text = $FAIL ($ATTEMPTS) # can be set to empty + fail_transition = 300 # transition time in ms between normal outer_color and fail_color + capslock_color = -1 + numlock_color = -1 + bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) + invert_numlock = false # change color if numlock is off + swap_font_color = false # see below + + position = 0, -20 halign = center valign = center -} -label { # lock icon - monitor = - text = lock - shadow_passes = 1 - shadow_boost = 0.5 - color = $text_color - font_size = 21 - font_family = $font_material_symbols - - position = 0, 65 - halign = center - valign = bottom -} -label { # "locked" text - monitor = - text = locked - shadow_passes = 1 - shadow_boost = 0.5 - color = $text_color - font_size = 14 - font_family = $font_family - - position = 0, 45 - halign = center - valign = bottom -} - -label { # Status - monitor = - text = cmd[update:5000] ~/.config/hypr/hyprlock/status.sh - shadow_passes = 1 - shadow_boost = 0.5 - color = $text_color - font_size = 14 - font_family = $font_family - - position = 30, -30 - halign = left - valign = top -} +} \ No newline at end of file diff --git a/.config/mpd/.gitignore b/.config/mpd/.gitignore new file mode 100644 index 0000000..af73ba5 --- /dev/null +++ b/.config/mpd/.gitignore @@ -0,0 +1,4 @@ +mpd.log +mpdstate +mpd.db +/playlists/ \ No newline at end of file diff --git a/.config/mpd/mpd.conf b/.config/mpd/mpd.conf new file mode 100644 index 0000000..0d0d817 --- /dev/null +++ b/.config/mpd/mpd.conf @@ -0,0 +1,20 @@ +bind_to_address "127.0.0.1" +#bind_to_address "~/.mpd/socket" +music_directory "~/Music" +playlist_directory "~/.config/mpd/playlists" +db_file "~/.config/mpd/mpd.db" +log_file "~/.config/mpd/mpd.log" +pid_file "~/.config/mpd/mpd.pid" +state_file "~/.config/mpd/mpdstate" +audio_output { + type "pipewire" + name "pw audio" + mixer_type "hardware" +} + +audio_output { + type "fifo" + name "my_fifo" + path "/tmp/mpd.fifo" + format "44100:16:2" +} diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid new file mode 100644 index 0000000..30ed602 --- /dev/null +++ b/.config/mpd/mpd.pid @@ -0,0 +1 @@ +1378 diff --git a/.config/waybar/config b/.config/waybar/config index f14f700..8915b2b 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -5,7 +5,7 @@ "modules-left": ["hyprland/workspaces", "custom/separator", "tray"], "modules-center": ["hyprland/window"], - "modules-right": ["wireplumber", "custom/brightness", "battery", "cpu", "memory", "network", "custom/separator", "clock"], + "modules-right": ["wireplumber", "custom/brightness", "battery", "cpu", "memory", "custom/separator", "network", "custom/separator", "clock"], "hyprland/workspaces": { "format": "{id}", diff --git a/.gitignore b/.gitignore index e2e4f38..92d748d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /.config/emacs/recentf /.config/emacs/undotreefiles/ +/.config/emacs/elpa/ diff --git a/scripts/restartsearxng b/scripts/restartsearxng new file mode 100755 index 0000000..0593803 --- /dev/null +++ b/scripts/restartsearxng @@ -0,0 +1,3 @@ +#!/bin/sh +pkill -x uwsgi +uwsgi --ini $HOME/opt/searxng/searxng.ini diff --git a/scripts/startup b/scripts/startup index f69b35f..46e4c17 100755 --- a/scripts/startup +++ b/scripts/startup @@ -1,5 +1,6 @@ #!/bin/sh gpgconf -K gpg-agent +restartsearxng & restartemacs >/dev/null & pipewire & mpd & diff --git a/scripts/yt-dla b/scripts/yt-dla new file mode 100755 index 0000000..f87f145 --- /dev/null +++ b/scripts/yt-dla @@ -0,0 +1,8 @@ +#!/bin/sh + +echo "$1" +if [ -z "$1" ] ; then + echo "usage: $0 [url of youtube video]" + exit 1 +fi +yt-dlp -x --audio-format mp3 --audio-quality 0 "$1" diff --git a/scripts/yt-dlv b/scripts/yt-dlv new file mode 100644 index 0000000..6b96b4e --- /dev/null +++ b/scripts/yt-dlv @@ -0,0 +1,8 @@ +#!/bin/sh + +echo "$1" +if [ -z "$1" ] ; then + echo "usage: $0 [url of youtube video]" + exit 1 +fi +yt-dlp "$1" \ No newline at end of file -- cgit v1.2.3 From 632b0a5b5b8fe5456750eb030d54a52a285a6870 Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Thu, 3 Oct 2024 21:54:39 -0400 Subject: changes --- .bashrc | 1 + .config/hypr/hyprlock.conf | 13 +++++++------ .config/hypr/hyprpaper.conf | 4 ++-- .config/mpd/mpd.pid | 2 +- scripts/godot | 3 +++ scripts/startup | 1 + wallpapers/snowy.png | Bin 0 -> 6936996 bytes 7 files changed, 15 insertions(+), 9 deletions(-) create mode 100755 scripts/godot create mode 100644 wallpapers/snowy.png (limited to '.config/hypr') diff --git a/.bashrc b/.bashrc index c1ccf49..6371ac8 100644 --- a/.bashrc +++ b/.bashrc @@ -8,3 +8,4 @@ alias ls='ls --color=auto' alias grep='grep --color=auto' PS1='\[\033[1;1m\]\u\[\033[00m\]@\[\033[34m\]\h \[\033[32m\]\w \[\033[35m\]$(git-ps1)\[\033[00m\]\$ ' + diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf index fb4be3c..e12fee9 100644 --- a/.config/hypr/hyprlock.conf +++ b/.config/hypr/hyprlock.conf @@ -17,8 +17,8 @@ background { } input-field { monitor = - size = 50, 50 - outline_thickness = 3 + size = 200, 200 + outline_thickness = 15 dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8 dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0 dots_center = false @@ -27,13 +27,14 @@ input-field { inner_color = rgb(200, 200, 200) font_color = rgb(10, 10, 10) fade_on_empty = true - fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered. + fade_timeout = 50 # Milliseconds before fade_on_empty is triggered. hide_input = true rounding = -1 # -1 means complete rounding (circle/oval) - check_color = rgb(204, 136, 34) + check_color = rgb(100, 118, 48) fail_color = rgb(204, 34, 34) # if authentication failed, changes outer_color and fail message color - fail_text = $FAIL ($ATTEMPTS) # can be set to empty - fail_transition = 300 # transition time in ms between normal outer_color and fail_color + placeholder_text = + fail_text = ($ATTEMPTS) # can be set to empty + fail_transition = 50 # transition time in ms between normal outer_color and fail_color capslock_color = -1 numlock_color = -1 bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above) diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 961f0ca..ac582db 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = /home/jack/.dotfiles/wallpapers/ghibliForest.png -wallpaper = ,/home/jack/.dotfiles/wallpapers/ghibliForest.png +preload = /home/jack/.dotfiles/wallpapers/snowy.png +wallpaper = ,/home/jack/.dotfiles/wallpapers/snowy.png diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 30ed602..5ae289b 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1378 +1371 diff --git a/scripts/godot b/scripts/godot new file mode 100755 index 0000000..a2d74f9 --- /dev/null +++ b/scripts/godot @@ -0,0 +1,3 @@ +#!/bin/sh + +godot-mono --single-window \ No newline at end of file diff --git a/scripts/startup b/scripts/startup index 46e4c17..818acb4 100755 --- a/scripts/startup +++ b/scripts/startup @@ -7,4 +7,5 @@ mpd & dunst & waybar & hyprpaper & +hypridle & gpg-agent --daemon diff --git a/wallpapers/snowy.png b/wallpapers/snowy.png new file mode 100644 index 0000000..b1ef37f Binary files /dev/null and b/wallpapers/snowy.png differ -- cgit v1.2.3 From 84012003fe1b7a6ef5c20f132d851792e72de5fa Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Sat, 5 Oct 2024 00:18:08 -0400 Subject: fix screenshot and update wallpaper --- .config/hypr/binds.conf | 5 +---- .config/hypr/hyprpaper.conf | 4 ++-- .config/mpd/mpd.pid | 2 +- README.md | 21 --------------------- install.sh | 13 +------------ scripts/discord | 3 +++ wallpapers/active/snowy-tower.png | Bin 0 -> 6936996 bytes wallpapers/fogCreek.png | Bin 5787435 -> 0 bytes wallpapers/fogForest-transformed.png | Bin 8987674 -> 0 bytes wallpapers/fogForest-transformed2.png | Bin 8071771 -> 0 bytes wallpapers/fogForest.png | Bin 2758165 -> 0 bytes wallpapers/ghibliForest.png | Bin 15822184 -> 0 bytes wallpapers/inactive/fogForest.png | Bin 0 -> 2758165 bytes wallpapers/inactive/ghibliForest.png | Bin 0 -> 15822184 bytes wallpapers/inactive/signalis.png | Bin 0 -> 205675 bytes wallpapers/signalis.png | Bin 205675 -> 0 bytes wallpapers/snowy.png | Bin 6936996 -> 0 bytes 17 files changed, 8 insertions(+), 40 deletions(-) create mode 100644 scripts/discord create mode 100644 wallpapers/active/snowy-tower.png delete mode 100644 wallpapers/fogCreek.png delete mode 100644 wallpapers/fogForest-transformed.png delete mode 100644 wallpapers/fogForest-transformed2.png delete mode 100644 wallpapers/fogForest.png delete mode 100644 wallpapers/ghibliForest.png create mode 100644 wallpapers/inactive/fogForest.png create mode 100644 wallpapers/inactive/ghibliForest.png create mode 100644 wallpapers/inactive/signalis.png delete mode 100644 wallpapers/signalis.png delete mode 100644 wallpapers/snowy.png (limited to '.config/hypr') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 186ee78..46e829d 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -12,7 +12,7 @@ bind = $mainMod, RETURN, exec, $menu bind = $mainMod, A, exec, $terminal bind = $mainMod, D, killactive, bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill -bind = $mainMod CTRL, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png') +bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png') bind = $mainMod, S, exec, grim -o eDP-1 ~/Pictures/Screenshots/$(date +'%s_grim.png') bind = $mainMod, M, exit, bind = $mainMod, V, togglefloating, @@ -53,9 +53,6 @@ binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDI binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 1%- binde = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle -# screenshot + crop keybind -bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" "${HOME}/Pictures/screenshots/screenshot-$(date +%F-%T).png" - # Example special workspace (scratchpad) COMMENTED OUT FOR SCREENSHOT KEYBIND # bind = $mainMod, S, togglespecialworkspace, magic # bind = $mainMod SHIFT, S, movetoworkspace, special:magic diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index ac582db..c759e59 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = /home/jack/.dotfiles/wallpapers/snowy.png -wallpaper = ,/home/jack/.dotfiles/wallpapers/snowy.png +preload = /home/jack/.dotfiles/wallpapers/active/snowy-tower.png +wallpaper = ,/home/jack/.dotfiles/wallpapers/active/snowy-tower.png diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index 5ae289b..3f3c936 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1371 +1344 diff --git a/README.md b/README.md index 1fca88a..3c9c9c3 100644 --- a/README.md +++ b/README.md @@ -11,24 +11,3 @@ Dependencies: - Brightnessctl - Calcurse - Pipewire - -## TODO -- [x] Lock keybind -- [x] Screenshot keybind -- [x] Reconfigure waybar (better styling + date + battery charging + working buttons) -- [x] System monitor -- [x] Wallpaper -- [ ] Multiple monitors -- [ ] Redo weird purple theme (is it gtk? gdb? fml?) -- [ ] Settings app -- [ ] Monitor scaling for laptop -- [ ] Reconfigure hyprlock, wofi, kitty -- [ ] Laptop backlight + auto suspend + volume control buttons -- [ ] Cachy browser settings -- [ ] Add more initial settings and optional app install - -## FIXES -- [ ] Discord push to talk -- [ ] Hyprshot keybind broken -- [ ] Go through env vars -- [ ] Make waybar use pipewire widget diff --git a/install.sh b/install.sh index d72e8ec..9cc6b11 100755 --- a/install.sh +++ b/install.sh @@ -1,12 +1 @@ -# install dependencies (TODO) - - -# stow dotfiles -stow hypr --adopt -stow waybar --adopt -stow fish --adopt -stow kitty --adopt -stow wofi --adopt - -# do other stuff (TODO) -git config --global core.editor "micro" +# stow . ? (TODO) diff --git a/scripts/discord b/scripts/discord new file mode 100644 index 0000000..52af980 --- /dev/null +++ b/scripts/discord @@ -0,0 +1,3 @@ +#!/bin/sh + +discord-screenaudio \ No newline at end of file diff --git a/wallpapers/active/snowy-tower.png b/wallpapers/active/snowy-tower.png new file mode 100644 index 0000000..b1ef37f Binary files /dev/null and b/wallpapers/active/snowy-tower.png differ diff --git a/wallpapers/fogCreek.png b/wallpapers/fogCreek.png deleted file mode 100644 index 6381292..0000000 Binary files a/wallpapers/fogCreek.png and /dev/null differ diff --git a/wallpapers/fogForest-transformed.png b/wallpapers/fogForest-transformed.png deleted file mode 100644 index ed786fd..0000000 Binary files a/wallpapers/fogForest-transformed.png and /dev/null differ diff --git a/wallpapers/fogForest-transformed2.png b/wallpapers/fogForest-transformed2.png deleted file mode 100644 index 476add9..0000000 Binary files a/wallpapers/fogForest-transformed2.png and /dev/null differ diff --git a/wallpapers/fogForest.png b/wallpapers/fogForest.png deleted file mode 100644 index bd58509..0000000 Binary files a/wallpapers/fogForest.png and /dev/null differ diff --git a/wallpapers/ghibliForest.png b/wallpapers/ghibliForest.png deleted file mode 100644 index 1c1dce4..0000000 Binary files a/wallpapers/ghibliForest.png and /dev/null differ diff --git a/wallpapers/inactive/fogForest.png b/wallpapers/inactive/fogForest.png new file mode 100644 index 0000000..bd58509 Binary files /dev/null and b/wallpapers/inactive/fogForest.png differ diff --git a/wallpapers/inactive/ghibliForest.png b/wallpapers/inactive/ghibliForest.png new file mode 100644 index 0000000..1c1dce4 Binary files /dev/null and b/wallpapers/inactive/ghibliForest.png differ diff --git a/wallpapers/inactive/signalis.png b/wallpapers/inactive/signalis.png new file mode 100644 index 0000000..f51166f Binary files /dev/null and b/wallpapers/inactive/signalis.png differ diff --git a/wallpapers/signalis.png b/wallpapers/signalis.png deleted file mode 100644 index f51166f..0000000 Binary files a/wallpapers/signalis.png and /dev/null differ diff --git a/wallpapers/snowy.png b/wallpapers/snowy.png deleted file mode 100644 index b1ef37f..0000000 Binary files a/wallpapers/snowy.png and /dev/null differ -- cgit v1.2.3 From 56e7ff4771761e1a75a8ac59f1632a9d550fda1b Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Thu, 24 Oct 2024 00:51:55 -0400 Subject: screenshot copy and idle suspend --- .config/hypr/binds.conf | 4 ++++ .config/hypr/hypridle.conf | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to '.config/hypr') diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 46e829d..62d15a3 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -12,8 +12,12 @@ bind = $mainMod, RETURN, exec, $menu bind = $mainMod, A, exec, $terminal bind = $mainMod, D, killactive, bind = $mainMod CTRL SHIFT, D, exec, hyprctl kill +# screenshot (region + full) bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" ~/Pictures/Screenshots/$(date +'%s_grim.png') bind = $mainMod, S, exec, grim -o eDP-1 ~/Pictures/Screenshots/$(date +'%s_grim.png') +# screenshot and copy +bind = $mainMod CTRL SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy +bind = $mainMod CTRL, S, exec, grim -o eDP-1 - | wl-copy bind = $mainMod, M, exit, bind = $mainMod, V, togglefloating, bind = $mainMod, P, exec, hyprpicker -a diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf index 8a4a3c0..d871778 100644 --- a/.config/hypr/hypridle.conf +++ b/.config/hypr/hypridle.conf @@ -5,5 +5,5 @@ general { listener { timeout = 300 # 5min - on-timeout = loginctl suspend + on-timeout = systemctl suspend } -- cgit v1.2.3 From ddd43ed96249932652c7427dbdbbac92e5ef49ed Mon Sep 17 00:00:00 2001 From: JackJ30 Date: Fri, 8 Nov 2024 13:10:20 -0500 Subject: keybind and fastfetch --- .bashrc | 2 +- .config/alacritty/alacritty.yml | 4 +- .config/emacs/Emacs.org | 3 +- .config/emacs/init.el | 218 ++++++++++++++++++++-------------------- .config/fastfetch/config.jsonc | 33 ++++++ .config/hypr/binds.conf | 24 ++--- .config/mpd/mpd.pid | 2 +- .gitignore | 1 + 8 files changed, 162 insertions(+), 125 deletions(-) create mode 100644 .config/fastfetch/config.jsonc (limited to '.config/hypr') diff --git a/.bashrc b/.bashrc index 6371ac8..16dc9c9 100644 --- a/.bashrc +++ b/.bashrc @@ -4,7 +4,7 @@ # If not running interactively, don't do anything [[ $- != *i* ]] && return - +fastfetch alias ls='ls --color=auto' alias grep='grep --color=auto' PS1='\[\033[1;1m\]\u\[\033[00m\]@\[\033[34m\]\h \[\033[32m\]\w \[\033[35m\]$(git-ps1)\[\033[00m\]\$ ' diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 79c905e..ce5abcd 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -47,8 +47,8 @@ window: # Blank space added around the window in pixels. This padding is scaled # by DPI and the specified value is always added at both opposing sides. padding: - x: 0 - y: 0 + x: 5 + y: 5 # Spread additional padding evenly around the terminal content. dynamic_padding: false diff --git a/.config/emacs/Emacs.org b/.config/emacs/Emacs.org index 8ecb98e..5865bcc 100644 --- a/.config/emacs/Emacs.org +++ b/.config/emacs/Emacs.org @@ -480,7 +480,8 @@ best git frontend ever (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) - +(use-package tagedit) + #+end_src ** multiple cursors diff --git a/.config/emacs/init.el b/.config/emacs/init.el index 09dace5..5f1978e 100644 --- a/.config/emacs/init.el +++ b/.config/emacs/init.el @@ -331,114 +331,116 @@ (global-set-key "\M-f" 'next-word) (use-package lsp-mode - :init - (setq lsp-keymap-prefix "C-c l" - lsp-headerline-breadcrumb-enable nil - lsp-headerline-breadcrumb-icons-enable nil - lsp-keep-workspace-alive nil - lsp-enable-snippet nil - lsp-lens-enable nil) - :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) - (c-mode . lsp) - (c++-mode . lsp) - (python-mode . lsp-deferred) - (csharp-mode . lsp) - ;; if you want which-key integration - (lsp-mode . lsp-enable-which-key-integration)) - :commands lsp) - - -(use-package consult-lsp - :after lsp) - -(defun my-c-mode-common-hook () - ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode - (c-set-offset 'substatement-open 0) - ;; other customizations can go here - - (setq c++-tab-always-indent t) - (setq c-basic-offset 4) ;; Default is 2 - (setq c-indent-level 4) ;; Default is 2 - - (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) - (setq tab-width 4) - (setq indent-tabs-mode t) ; use spaces only if nil - ) - -(add-hook 'c-mode-common-hook 'my-c-mode-common-hook) - -(use-package lsp-ui - :after lsp - :diminish lsp-lens-mode - :config - (setq lsp-ui-sideline-update-mode 'point) - (setq lsp-ui-sideline-show-diagnostics t) - (setq lsp-ui-sideline-ignore-duplicate t)) - -(use-package hydra) - -(use-package lsp-treemacs - :ensure t - :commands lsp-treemacs-errors-list) - -(use-package expand-region) -(global-set-key (kbd "C-=") 'er/expand-region) - -;; company -(use-package company - :ensure t - :diminish - :config - (setq company-show-numbers t - company-minimum-prefix-length 1 - company-idle-delay 0.2 - company-backends - '((company-files - company-keywords - company-capf - company-yasnippet) - (company-abbrev company-dabbrev))) - (global-company-mode +1)) - -(use-package clang-format) -(use-package clang-format+) - - -(use-package company-box - :ensure t - :diminish - :after company - :hook (company-mode . company-box-mode)) - -;; flycheck -(use-package flycheck - :diminish flycheck-mode - :config - (setq flycheck-error-message-buffer " *Flycheck error messages*") - (setq-default flycheck-emacs-lisp-load-path 'inherit) - (global-flycheck-mode 1)) - -(use-package flycheck-pos-tip - :ensure t - :after flycheck - :config - (flycheck-pos-tip-mode)) - -(use-package ccls - :ensure t - :config - :hook ((c-mode c++-mode objc-mode cuda-mode) . - (lambda () (require 'ccls) (lsp))) - (setq ccls-executable "/usr/local/bin/ccls") - (setq ccls-initialization-options - '(:index (:comments 2) :completion (:detailedLabel t)))) - -(use-package srefactor - :ensure t - :config - (semantic-mode 1) - (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) - (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + :init + (setq lsp-keymap-prefix "C-c l" + lsp-headerline-breadcrumb-enable nil + lsp-headerline-breadcrumb-icons-enable nil + lsp-keep-workspace-alive nil + lsp-enable-snippet nil + lsp-lens-enable nil) + :hook (;; replace XXX-mode with concrete major-mode(e. g. python-mode) + (c-mode . lsp) + (c++-mode . lsp) + (python-mode . lsp-deferred) + (csharp-mode . lsp) + ;; if you want which-key integration + (lsp-mode . lsp-enable-which-key-integration)) + :commands lsp) + + + (use-package consult-lsp + :after lsp) + + (defun my-c-mode-common-hook () + ;; my customizations for all of c-mode, c++-mode, objc-mode, java-mode + (c-set-offset 'substatement-open 0) + ;; other customizations can go here + + (setq c++-tab-always-indent t) + (setq c-basic-offset 4) ;; Default is 2 + (setq c-indent-level 4) ;; Default is 2 + + (setq tab-stop-list '(4 8 12 16 20 24 28 32 36 40 44 48 52 56 60)) + (setq tab-width 4) + (setq indent-tabs-mode t) ; use spaces only if nil + ) + + (add-hook 'c-mode-common-hook 'my-c-mode-common-hook) + + (use-package lsp-ui + :after lsp + :diminish lsp-lens-mode + :config + (setq lsp-ui-sideline-update-mode 'point) + (setq lsp-ui-sideline-show-diagnostics t) + (setq lsp-ui-sideline-ignore-duplicate t)) + + (use-package hydra) + + (use-package lsp-treemacs + :ensure t + :commands lsp-treemacs-errors-list) + + (use-package expand-region) + (global-set-key (kbd "C-=") 'er/expand-region) + + ;; company + (use-package company + :ensure t + :diminish + :config + (setq company-show-numbers t + company-minimum-prefix-length 1 + company-idle-delay 0.2 + company-backends + '((company-files + company-keywords + company-capf + company-yasnippet) + (company-abbrev company-dabbrev))) + (global-company-mode +1)) + + (use-package clang-format) + (use-package clang-format+) + + + (use-package company-box + :ensure t + :diminish + :after company + :hook (company-mode . company-box-mode)) + + ;; flycheck + (use-package flycheck + :diminish flycheck-mode + :config + (setq flycheck-error-message-buffer " *Flycheck error messages*") + (setq-default flycheck-emacs-lisp-load-path 'inherit) + (global-flycheck-mode 1)) + + (use-package flycheck-pos-tip + :ensure t + :after flycheck + :config + (flycheck-pos-tip-mode)) + + (use-package ccls + :ensure t + :config + :hook ((c-mode c++-mode objc-mode cuda-mode) . + (lambda () (require 'ccls) (lsp))) + (setq ccls-executable "/usr/local/bin/ccls") + (setq ccls-initialization-options + '(:index (:comments 2) :completion (:detailedLabel t)))) + + (use-package srefactor + :ensure t + :config + (semantic-mode 1) + (define-key c-mode-map (kbd "M-RET") 'srefactor-refactor-at-point) + (define-key c++-mode-map (kbd "M-RET") 'srefactor-refactor-at-point)) + +(use-package tagedit) (use-package multiple-cursors :bind (:map global-map diff --git a/.config/fastfetch/config.jsonc b/.config/fastfetch/config.jsonc new file mode 100644 index 0000000..52344a9 --- /dev/null +++ b/.config/fastfetch/config.jsonc @@ -0,0 +1,33 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "modules": [ + "title", + "separator", + "os", + "host", + "kernel", + "uptime", + "packages", + "shell", + "display", + "de", + "wm", + "wmtheme", + "theme", + "icons", + "font", + "cursor", + "terminal", + "terminalfont", + "cpu", + "gpu", + "memory", + "swap", + "disk", + "battery", + "poweradapter", + "locale", + "break", + "colors" + ] +} diff --git a/.config/hypr/binds.conf b/.config/hypr/binds.conf index 62d15a3..54c04b5 100644 --- a/.config/hypr/binds.conf +++ b/.config/hypr/binds.conf @@ -33,19 +33,19 @@ bind = $mainMod, SPACE, layoutmsg, swapwithmaster bind = $mainMod, E, exec, emacsclient -c # Move focus with mainMod + arrow keys -bind = $mainMod, left, movefocus, l -bind = $mainMod, right, movefocus, r -bind = $mainMod, n, cyclenext, prev -bind = $mainMod, p, cyclenext -bind = $mainMod, up, movefocus, u -bind = $mainMod, down, movefocus, d +binde = $mainMod, left, movefocus, l +binde = $mainMod, right, movefocus, r +binde = $mainMod, n, cyclenext, prev +binde = $mainMod, p, cyclenext +binde = $mainMod, up, movefocus, u +binde = $mainMod, down, movefocus, d -bind = $mainMod SHIFT,left ,movewindow, l -bind = $mainMod SHIFT,right ,movewindow, r -bind = $mainMod SHIFT, n, swapnext, prev -bind = $mainMod SHIFT, p, swapnext -bind = $mainMod SHIFT,up ,movewindow, u -bind = $mainMod SHIFT,down ,movewindow, d +binde = $mainMod SHIFT,left ,movewindow, l +binde = $mainMod SHIFT,right ,movewindow, r +binde = $mainMod SHIFT, n, swapnext, prev +binde = $mainMod SHIFT, p, swapnext +binde = $mainMod SHIFT,up ,movewindow, u +binde = $mainMod SHIFT,down ,movewindow, d # controls binde = , xf86monbrightnessup , exec, brightnessctl set 10%+ diff --git a/.config/mpd/mpd.pid b/.config/mpd/mpd.pid index c4425ac..ea29ccd 100644 --- a/.config/mpd/mpd.pid +++ b/.config/mpd/mpd.pid @@ -1 +1 @@ -1395 +1362 diff --git a/.gitignore b/.gitignore index 92d748d..42623f0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.config/emacs/recentf /.config/emacs/undotreefiles/ /.config/emacs/elpa/ +.config/emacs/init.el -- cgit v1.2.3