diff --git a/TODO.md b/TODO.md index 38405f3..4808827 100644 --- a/TODO.md +++ b/TODO.md @@ -10,5 +10,6 @@ # Arch Todos -- Separate scripts that are used for configurations / store them somewhere - aside from `~/.local/bin` +- Separate scripts that are used for configurations / store them somewhere aside + from `~/.local/bin` +- Remove system-d stuff (don't think it's needed). diff --git a/gpg/gpg-agent.conf b/gpg/gpg-agent.conf index 594eb62..9756cd4 100644 --- a/gpg/gpg-agent.conf +++ b/gpg/gpg-agent.conf @@ -5,7 +5,7 @@ ttyname $GPG_TTY default-cache-ttl 60 max-cache-ttl 120 #pinentry-program /usr/bin/pinentry-curses -pinentry-program /usr/bin/pinentry-gnome3 +#pinentry-program /usr/bin/pinentry-gnome3 #pinentry-program /usr/bin/pinentry-tty #pinentry-program /usr/bin/pinentry-x11 #pinentry-program /usr/local/bin/pinentry-curses diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 2fc39f7..a4db6d1 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -38,8 +38,8 @@ source = ~/.config/hypr/autostart.conf # https://wiki.hyprland.org/Configuring/Variables/#general general { - gaps_in = 2 - gaps_out = 3 + gaps_in = 3 + gaps_out = 0, 5, 5, 5 border_size = 1 diff --git a/hypr/keybinds.conf b/hypr/keybinds.conf index 0063d46..8073efd 100644 --- a/hypr/keybinds.conf +++ b/hypr/keybinds.conf @@ -4,6 +4,7 @@ # See https://wiki.hyprland.org/Configuring/Keywords/ $mainMod = SUPER # Sets "Command/Windows" key as main modifier +$HYPER = ALT SHIFT WIN CTRL ################### ### MY PROGRAMS ### @@ -32,6 +33,7 @@ bind = $mainMod, A, exec, $pwa "https://chatgpt.com" bind = $mainMod, B, exec, $browser bind = $mainMod SHIFT, B, exec, $browser --private-window bind = $mainMod, C, exec, $terminal -e ~/.local/share/scripts/tmux-sessionator ~/.config +bind = $mainMod, D, exec, $pwa "https://pro.housecallpro.com/app/calendar_new" bind = $mainMod SHIFT, D, exec, ~/.local/bin/toggle-desktop bind = $mainMod, E, exec, $pwa "https://mail.proton.me" bind = $mainMod SHIFT, E, exec, uwsm app -- thunderbird @@ -39,6 +41,7 @@ bind = $mainMod, F, exec, $fileManager #bind = $mainMod, K, exec, $launch Komodo bind = $mainMod SHIFT, F, exec, $fileBrowser bind = $mainMod, G, exec, $pwa "https://git.housh.dev" +bind = $mainMod, J, togglesplit, # dwindle bind = $mainMod, M, exec, ~/.local/bin/toggle-waybar bind = $mainMod, N, exec, $terminal -e nvim bind = $mainMod, P, exec, $pwa "https://pass.proton.me" @@ -53,7 +56,6 @@ bind = $mainMod SHIFT, R, exec, ~/.local/bin/waybar-restart # TODO: change modifier key. #bind = $mainMod, V, togglefloating #bind = $mainMod, P, pseudo, # dwindle -#bind = $mainMod, J, togglesplit, # dwindle # # Screenshots bind = $mainMod SHIFT ALT, 4, exec, hyprshot -m region -o ~/Pictures @@ -61,9 +63,6 @@ bind = $mainMod SHIFT ALT, 3, exec, hyprshot -m window -o ~/Pictures bind = CTRL, F, exec, ~/.local/bin/window-toggle-floating -# hyprctl dispatch togglefloating \ -# && hyprctl dispatch centerwindow - # Move focus with mainMod + arrow keys bind = $mainMod, H, movefocus, l bind = $mainMod, L, movefocus, r @@ -85,7 +84,7 @@ bind = $mainMod, MINUS, resizeactive, -20 0 bind = $mainMod SHIFT, EQUAL, resizeactive, 0 20 bind = $mainMod SHIFT, MINUS, resizeactive, 0 -20 -# Switch workspaces with mainMod + [0-9] +# Switch to workspaces with mainMod + [0-9] bind = $mainMod, 1, workspace, 1 bind = $mainMod, 2, workspace, 2 bind = $mainMod, 3, workspace, 3 @@ -97,6 +96,14 @@ bind = $mainMod, 8, workspace, 8 bind = $mainMod, 9, workspace, 9 bind = $mainMod, 0, workspace, 10 +# Move all workspaces to a monitor +bind = $HYPER, 0, exec, ~/.local/bin/mv-all-workspaces-to-monitor 0 +bind = $HYPER, 1, exec, ~/.local/bin/mv-all-workspaces-to-monitor 1 + +# Move current workspace. +bind = $HYPER, H, movecurrentworkspacetomonitor, 1 +bind = $HYPER, L, movecurrentworkspacetomonitor, 0 + # Move active window to a workspace with mainMod + SHIFT + [0-9] bind = $mainMod SHIFT, 1, movetoworkspace, 1 bind = $mainMod SHIFT, 2, movetoworkspace, 2 diff --git a/scripts/arch/mv-all-workspaces-to-monitor b/scripts/arch/mv-all-workspaces-to-monitor new file mode 100755 index 0000000..b956969 --- /dev/null +++ b/scripts/arch/mv-all-workspaces-to-monitor @@ -0,0 +1,15 @@ +#!/bin/bash + +# Moves all workspaces to the passed in monitor id, which can be useful when +# connecting or disconnecting from a monitor. + +MONITOR=$1 + +if [ ! $# = 1 ]; then + echo "Usage: mv-all-workspaces-to-monitor " + exit 1 +fi + +hyprctl workspaces -j | + jq '.[] | select(.monitorID != "$MONITOR") | .id' | + xargs -I{} hyprctl dispatch moveworkspacetomonitor {} "$MONITOR" >/dev/null 2>&1 diff --git a/scripts/enable-services b/scripts/enable-services new file mode 100755 index 0000000..b1cea29 --- /dev/null +++ b/scripts/enable-services @@ -0,0 +1,5 @@ +#!/bin/bash + +systemctl --user enable --now hyprpaper.service +systemctl --user enable --now hypridle.service + diff --git a/systemd/user/default.target.wants/hypr-lid.service b/systemd/user/default.target.wants/hypr-lid.service deleted file mode 120000 index 39e9ba7..0000000 --- a/systemd/user/default.target.wants/hypr-lid.service +++ /dev/null @@ -1 +0,0 @@ -/home/michael/.config/systemd/user/hypr-lid.service \ No newline at end of file diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 4a97a93..5cb52b5 100755 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -108,22 +108,23 @@ set -g @offline_icon "nok" # status left look and feel set -g status-left-length 100 set -g status-left "" -set -ga status-left "#{?client_prefix,#{#[bg=#{@thm_red},fg=#{@thm_bg},bold]  #S },#{#[bg=#{@thm_bg},fg=#{@thm_green}]  #S }}" -set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│" -set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_maroon}]  #{pane_current_command} " -set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│" -set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_blue}]  #{=/-32/...:#{s|$USER|~|:#{b:pane_current_path}}} " -set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]#{?window_zoomed_flag,│,}" -set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_yellow}]#{?window_zoomed_flag,  zoom ,}" +# set -ga status-left "#{?#{e|>=:10,#{battery_percentage}},#{#[bg=#{@thm_red},fg=#{@thm_bg}]},#{#[bg=#{@thm_bg},fg=#{@thm_pink}]}} #{battery_icon} #{battery_percentage} " +# set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│" +# set -ga status-left "#[bg=#{@thm_bg}]#{?#{==:#{online_status},ok},#[fg=#{@thm_mauve}] 󰖩 on ,#[fg=#{@thm_red},bold]#[reverse] 󰖪 off }" +# set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│" +# set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_blue}] 󰭦 %Y-%m-%d 󰅐 %H:%M " # status right look and feel set -g status-right-length 100 set -g status-right "" -set -ga status-right "#{?#{e|>=:10,#{battery_percentage}},#{#[bg=#{@thm_red},fg=#{@thm_bg}]},#{#[bg=#{@thm_bg},fg=#{@thm_pink}]}} #{battery_icon} #{battery_percentage} " -set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│" -set -ga status-right "#[bg=#{@thm_bg}]#{?#{==:#{online_status},ok},#[fg=#{@thm_mauve}] 󰖩 on ,#[fg=#{@thm_red},bold]#[reverse] 󰖪 off }" -set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│" -set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_blue}] 󰭦 %Y-%m-%d 󰅐 %H:%M " +set -ga status-right "#{?client_prefix,#{#[bg=#{@thm_red},fg=#{@thm_bg},bold]  #S },#{#[bg=#{@thm_bg},fg=#{@thm_green}]  #S }}" +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│" +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_maroon}]  #{pane_current_command} " +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│" +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_blue}]  #{=/-32/...:#{s|$USER|~|:#{b:pane_current_path}}} " +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]#{?window_zoomed_flag,│,}" +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_yellow}]#{?window_zoomed_flag,  zoom ,}" + # bootstrap tpm if "test ! -d ~/.tmux/plugins/tpm" \ diff --git a/waybar/config.jsonc b/waybar/config.jsonc index 22950dc..5c71f85 100644 --- a/waybar/config.jsonc +++ b/waybar/config.jsonc @@ -25,7 +25,7 @@ "spacing": 10, }, "clock": { - "timezone": "America/Denver", + "timezone": "America/New_York", "tooltip-format": "{:%Y %B}\n{calendar}", "format": "{:%d - %H:%M}", }, diff --git a/waybar/style.css b/waybar/style.css index e09f5cf..0d2b0dd 100644 --- a/waybar/style.css +++ b/waybar/style.css @@ -4,6 +4,8 @@ @define-color blue #89b4fa; @define-color red #f38ba8; @define-color yellow #f9e2af; +@define-color peach #fab387; +@define-color lavender #b4befe; * { font-family: JetbrainsMono Nerd Font; @@ -81,10 +83,12 @@ } #cpu { + color: @lavender; border-radius: 10px 0px 0px 10px; } #memory { + color: @peach; margin-right: 1rem; border-radius: 0px 10px 10px 0px; }