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/binds.conf | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .config/hypr/binds.conf (limited to '.config/hypr/binds.conf') 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 -- 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/binds.conf') 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/binds.conf') 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/binds.conf') 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 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/binds.conf') 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/binds.conf') 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 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/binds.conf') 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/binds.conf') 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/binds.conf') 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