add tmuxpopup script

hyprland/.config/hypr/hyprland.conf

@@ -15,7 +15,8 @@
 ################
 
 # See https://wiki.hyprland.org/Configuring/Monitors/
-
+# automatically choose highest refresh rate and postition of monitors
+monitor = ,highrr,auto,1
 
 ###################
 ### MY PROGRAMS ###
@@ -26,7 +27,7 @@
 # Set programs that you use
 $terminal = kitty
 $fileManager = dolphin
-$menu = wofi --show drun
+$menu = fuzzel
 
 
 #################
@@ -37,7 +38,10 @@ $menu = wofi --show drun
 # Or execute your favorite apps at launch like this:
 
 # exec-once = nm-applet &
-exec-once = waybar
+exec-once = uwsm app -- waybar
+exec-once = uwsm app -- hypridle
+exec-once = uwsm app -- swaync
+exec-once = uwsm app -- systemctl --user start hyprpolkitagent
 exec-once = $terminal
 
 # clipboard
@@ -209,7 +213,7 @@ $mainMod = Alt # Sets "Alt" key as main modifier
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
 bind = $mainMod, Return, exec, $terminal
 bind = $mainMod, Q, killactive,
-bind = $mainMod, M, exit,
+bind = $mainMod, M, exec, loginctl terminate-user ""
 bind = $mainMod, E, exec, $fileManager
 bind = $mainMod, G, exec, firefox
 bind = $mainMod, D, exec, $menu
@@ -294,11 +298,11 @@ bind = $mainMod, N, exec, swaync-client -t
 # See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
 
 # Example windowrule v1
-# windowrule = float, ^(kitty)$
 
 # Example windowrule v2
 # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
 
+windowrule = float, class:^(com.saivert.pwvucontrol)$
 windowrule = float, class:^(org.prismlauncher.PrismLauncher)$
 
 # Ignore maximize requests from apps. You'll probably like this.

kitty/.config/kitty/kitty.conf

@@ -24,7 +24,7 @@ font_family      JetBrains Mono NF
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-font_size 14.0
+font_size 16.0
 
 #: Font size (in pts)
 
@@ -239,7 +239,7 @@ cursor_blink_interval 0
 
 #: Scrollback {{{
 
-# scrollback_lines 2000
+scrollback_lines 200000
 
 #: Number of lines of history to keep in memory for scrolling back.
 #: Memory is allocated on demand. Negative numbers are (effectively)
@@ -1584,13 +1584,13 @@ confirm_os_window_close 0
 #: The full list of actions that can be mapped to key presses is
 #: available here <https://sw.kovidgoyal.net/kitty/actions/>.
 
-# kitty_mod ctrl+shift
+kitty_mod ctrl+shift
 
 #: Special modifier key alias for default shortcuts. You can change
 #: the value of this option to alter all default shortcuts that use
 #: kitty_mod.
 
-# clear_all_shortcuts no
+clear_all_shortcuts no
 
 #: Remove all shortcut definitions up to this point. Useful, for
 #: instance, to remove the default shortcuts.
@@ -1627,7 +1627,7 @@ confirm_os_window_close 0
 
 #: Copy to clipboard
 
-# map kitty_mod+c copy_to_clipboard
+map ctrl+shift+c copy_to_clipboard
 # map cmd+c       copy_to_clipboard
 
 #::  There is also a copy_or_interrupt action that can be optionally
@@ -1638,7 +1638,7 @@ confirm_os_window_close 0
 
 #: Paste from clipboard
 
-# map kitty_mod+v paste_from_clipboard
+map ctrl+shift+v paste_from_clipboard
 # map cmd+v       paste_from_clipboard
 
 #: Paste from selection
@@ -1703,7 +1703,7 @@ confirm_os_window_close 0
 
 #: Scroll to previous shell prompt
 
-# map kitty_mod+z scroll_to_prompt -1
+map ctrl+space>z scroll_to_prompt -1
 
 #::  Use a parameter of 0 for scroll_to_prompt to scroll to the last
 #::  jumped to or the last clicked position. Requires shell
@@ -1712,7 +1712,7 @@ confirm_os_window_close 0
 
 #: Scroll to next shell prompt
 
-# map kitty_mod+x scroll_to_prompt 1
+map ctrl+space>x scroll_to_prompt 1
 
 #: Browse scrollback buffer in pager
 
@@ -1761,7 +1761,11 @@ confirm_os_window_close 0
 
 #: New window
 
-# map kitty_mod+enter new_window
+enabled_layouts splits:split_axis=horizontal
+
+map ctrl+space>c launch --type=tab --cwd=current
+map ctrl+space>shift+5 launch --location=vsplit --cwd=current
+map ctrl+space>shift+2 launch --location=hsplit --cwd=current
 # map cmd+enter       new_window
 
 #::  You can open a new kitty window running an arbitrary program, for
@@ -1806,7 +1810,8 @@ confirm_os_window_close 0
 
 #: Next window
 
-# map kitty_mod+] next_window
+map ctrl+space>j next_window
+map ctrl+space>k previous_window
 
 #: Previous window
 
@@ -1942,7 +1947,15 @@ confirm_os_window_close 0
 #: the first tab, 2 the second tab and -1 being the previously active
 #: tab, and any number larger than the last tab being the last tab::
 
-#:     map ctrl+alt+1 goto_tab 1
+map ctrl+space>1 goto_tab 1
+map ctrl+space>2 goto_tab 2
+map ctrl+space>3 goto_tab 3
+map ctrl+space>4 goto_tab 4
+map ctrl+space>5 goto_tab 5
+map ctrl+space>6 goto_tab 6
+map ctrl+space>7 goto_tab 7
+map ctrl+space>8 goto_tab 8
+map ctrl+space>9 goto_tab 9
 #:     map ctrl+alt+2 goto_tab 2
 
 #: Just as with new_window above, you can also pass the name of
@@ -1974,7 +1987,7 @@ confirm_os_window_close 0
 #: Useful to temporarily "zoom" the active window by switching to the
 #: stack layout::
 
-#:     map ctrl+alt+z toggle_layout stack
+map ctrl+space>z toggle_layout stack
 #: }}}
 
 #: Font sizes {{{
@@ -2022,7 +2035,7 @@ confirm_os_window_close 0
 
 #: Open URL
 
-# map kitty_mod+e open_url_with_hints
+map ctrl+space>e open_url_with_hints
 
 #::  Open a currently visible URL using the keyboard. The program used
 #::  to open the URL is specified in open_url_with.

scripts/.local/bin/tmuxpopup

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-if [ "$(tmux display-message -p -F "#{session-name}")" = "popup" ]; then
+if [ "$(tmux display-message -p -F "#{session_name}")" = "popup" ]; then
 	tmux detach-client
 else
 	tmux popup -d "#{pane_current_path}" -xC -yC -w90% -h90% -E "tmux attach -t popup || tmux new -s popup"

tmux/.tmux.conf

@@ -1,4 +1,5 @@
-set-option -g default-shell /usr/bin/zsh
+set-option -g default-command "${SHELL}"
+set-option -g default-shell "${SHELL}"
 
 set -g mouse on
 
@@ -28,4 +29,4 @@ bind c new-window -c "#{pane_current_path}"
 bind \" split-pane -c "#{pane_current_path}"
 bind % split-pane -h -c "#{pane_current_path}"
 
-bind p run-shell tmuxpopup
+bind p run-shell /home/fergus/.local/bin/tmuxpopup

waybar/.config/waybar/config.jsonc

@@ -20,9 +20,9 @@
     "clock",
     "tray",
     ],
-    "custom": {
+    // "custom": {
-        "exec": ""
+    //     "exec": ""
-    },
+    // },
     "hyprland/window": {
       "format": "{}",
       "max-length": 35,
@@ -54,12 +54,13 @@
       "tooltip": false
     },
     "memory": {
-      "format": "{}%  "
+      "format": "{}%  "
     },
     "temperature": {
+      "thermal-zone": 3,
       "critical-threshold": 80,
       "format": "{temperatureC}°C",
-      "format-icons": ["", "", ""]
+      "format-icons": ["", "", ""]
     },
     "battery": {
       "states": {
@@ -75,9 +76,9 @@
     },
     "network": {
       "format-wifi": "  {signalStrength}%",
-      "format-ethernet": "{cidr} ",
+      "format-ethernet": "{cidr}  ",
-      "tooltip-format": "{ifname} via {gwaddr} ",
+      "tooltip-format": "{ifname} via {gwaddr}  ",
-      "format-linked": "{ifname} (No IP) ",
+      "format-linked": "{ifname} (No IP)  ",
       "format-disconnected": " ⚠ ",
       "format-alt": "{ifname}: {ipaddr}/{cidr}"
     },
@@ -93,9 +94,9 @@
         "phone": "",
         "portable": "",
         "car": "",
-        "default": ["", "", ""]
+        "default": ["", " ", " "]
       },
-      "on-click": "pavucontrol"
+      "on-click": "pwvucontrol"
     },
     "tray": {
         "spacing": 10,

waybar/.config/waybar/style.css

@@ -1,7 +1,7 @@
 @import "macchiato.css";
 
 * {
-  font-family: "JetBrainsMono Nerd Font", Roboto, Helvetica, Arial, sans-serif;
+  font-family: "JetBrainsMonoNerdFont";
   font-size: 16px;
 }
 

zsh/.zshrc

@@ -55,10 +55,10 @@ command -v starship >/dev/null 2>&1 && eval "$(starship init zsh)"
 command -v fastfetch >/dev/null 2>&1 && fastfetch
 
 # automatically enter a tmux session
-tmux start-server
+# tmux start-server
-if [ -z "$TMUX" ]; then
+# if [ -z "$TMUX" ]; then
-  tmux has-session -t dev 2> /dev/null && tmux new-session || tmux new-session -s dev
+#   tmux has-session -t dev 2> /dev/null && tmux new-session || tmux new-session -s dev
-fi
+# fi
 
 # load kitty shell integrations
 if test -n "$KITTY_INSTALLATION_DIR"; then
@@ -87,11 +87,13 @@ total	%*E
 # add common bin dirs to path
 export PATH="/home/fergus/.local/bin:$PATH"
 export PATH="/home/fergus/.local/bin:/home/fergus/.cargo/bin:$PATH"
+export PATH="/home/fergus/go/bin/:$PATH"
 
 # import any extra env that doesn't want to be kept in vsc
-[[ -f ~/.extra-env ]] && source ~/.extra-env
+[[ -f ~/.extra-env.zsh ]] && source ~/.extra-env.zsh
 
 # add common options
+alias -- less='less -R'
 alias -- cp='cp -r'
 alias -- mkdir='mkdir -p'
 alias -- rm='rm -vr'
@@ -114,6 +116,7 @@ alias -- gC='git commit -m'
 alias -- gD='git diff --staged -w'
 alias -- gP='git push'
 alias -- gPf='git push --force-with-lease'
+alias -- gPt='git push --follow-tags'
 alias -- gS='git switch -c'
 alias -- gaa='git add --all'
 alias -- gau='git add -u'
@@ -144,3 +147,11 @@ fi
 ZSH_HIGHLIGHT_HIGHLIGHTERS+=()
 
 
+
+# pnpm
+export PNPM_HOME="/home/fergus/.local/share/pnpm"
+case ":$PATH:" in
+  *":$PNPM_HOME:"*) ;;
+  *) export PATH="$PNPM_HOME:$PATH" ;;
+esac
+# pnpm end