hypr changes

.config/dunst/dunstrc

@@ -7,6 +7,7 @@ height = (0, 200)
 origin = top-right
 offset = (15, 15)
 transparency = 20
+sort = update
 
 [urgency_low]
     background = "#1e1e2e77"
@@ -25,4 +26,4 @@ transparency = 20
     background = "#1e1e2e77"
     foreground = "#cdd6f4"
     frame_color = "#f38ba8"
-    timeout = 0
+    timeout = 30

.config/hypr/binds.conf

@@ -1,58 +0,0 @@
-# Script Path
-$scrPath = ~/.config/scripts
-
-# Assign apps
-$term = kitty
-$file = nemo
-$browser = firefox
-$launcher = $scrPath/otter-launch.sh
-
-# Window/Session actions
-bind = $mainMod, backspace, exec, $scrPath/dontkillsteam.sh # close focused window
-bind = $mainMod, d, exec, $launcher
-
-# Super key to drag windows
-binds {
-    drag_threshold = 10
-    scroll_event_delay = 0
-}
-bindm = $submod, mouse:272, movewindow
-bindr = $submod, mouse:272, layoutmsg, promote
-bindc = $submod, mouse:272, togglefloating
-
-# Resize floating window with scrollwheels
-bind = $submod, mouse_down, resizeactive, 0 -30
-bind = $submod, mouse_up, resizeactive, 0 30
-bind = $submod, mouse_left, resizeactive, 30 0
-bind = $submod, mouse_right, resizeactive, -30 0
-bind = $submod, space, togglefloating, # toggle the window between focus and float
-
-# Screenshot/Screencapture
-bind = Super+SHIFT, S, exec, grimblast copy area
-
-# Move/Change window focus
-bind = $mainMod, h, layoutmsg, focus l
-bind = $mainMod, l, layoutmsg, focus r
-bind = $mainMod, k, movefocus, u
-bind = $mainMod, j, movefocus, d
-
-# Resize floating windows with keyboard
-bind = $submod ctrl, h, resizeactive, -50 0
-bind = $submod ctrl, l, resizeactive, 50 0
-bind = $submod ctrl, k, resizeactive, 0 50
-bind = $submod ctrl, j, resizeactive, 0 -50
-
-# Change window positions with keyboard
-bind = $mainMod SHIFT, H, swapwindow, l
-bind = $mainMod SHIFT, L, swapwindow, r
-bind = $mainMod SHIFT, K, swapwindow, u
-bind = $mainMod SHIFT, J, swapwindow, d
-
-# Move/Switch to special workspace (scratchpad)
-bind = $mainMod, MINUS, togglespecialworkspace, scratch
-bind = $mainMod SHIFT, MINUS, movetoworkspacesilent, special:scratch
-
-# Music workspace
-bind = $mainMod, m, togglespecialworkspace, music
-
-source = ~/.config/hypr/binds-local.conf

.config/hypr/hyprland.conf

@@ -1,7 +0,0 @@
-source = ~/.config/hypr/local.conf
-source = ~/.config/hypr/binds.conf
-source = ~/.config/hypr/style.conf
-source = ~/.config/hypr/input.conf
-source = ~/.config/hypr/rules.conf
-source = ~/.config/hypr/windows.conf
-source = ~/.config/hypr/startup.conf

.config/hypr/hyprlock.conf

@@ -1,109 +0,0 @@
-source = $HOME/.config/hypr/mocha.conf
-
-$accent = $mauve
-$accentAlpha = $mauveAlpha
-$font = JetBrainsMono Nerd Font
-
-# GENERAL
-general {
-  hide_cursor = true
-}
-
-# BACKGROUND
-background {
-  monitor =
-  path = $HOME/.config/background
-  blur_passes = 0
-  color = $base
-}
-
-
-# LAYOUT
-label {
-  monitor =
-  text = Layout: $LAYOUT
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = 30, -30
-  halign = left
-  valign = top
-}
-
-# TIME
-label {
-  monitor =
-  text = $TIME
-  color = $text
-  font_size = 90
-  font_family = $font
-  position = -30, 0
-  halign = right
-  valign = top
-}
-
-# DATE
-label {
-  monitor =
-  text = cmd[update:43200000] date +"%A, %d %B %Y"
-  color = $text
-  font_size = 25
-  font_family = $font
-  position = -30, -150
-  halign = right
-  valign = top
-}
-
-# FINGERPRINT
-{
-  monitor = "";
-  text = "$FPRINTPROMPT";
-  color = "$text";
-  font_size = 14;
-  font_family = $font;
-  position = "0, -107";
-  halign = "center";
-  valign = "center";
-}
-
-image {
-  path = $HOME/.config/hypr/cat.png
-  size = 240
-  border_color = transparent
-  rounding = 0
-  position = 0, 7px
-}
-
-# USER AVATAR
-image {
-  monitor =
-  path = $HOME/.face
-  size = 100
-  border_color = $accent
-  position = 0, 75
-  halign = center
-  valign = center
-}
-
-# INPUT FIELD
-input-field {
-  monitor =
-  size = 300, 60
-  outline_thickness = 4
-  dots_size = 0.2
-  dots_spacing = 0.2
-  dots_center = true
-  outer_color = $accent
-  inner_color = $surface0
-  font_color = $text
-  fade_on_empty = false
-  placeholder_text = <span foreground="##$textAlpha"><i>󰌾 Logged in as </i><span foreground="##$accentAlpha">$USER</span></span>
-  hide_input = false
-  check_color = $accent
-  fail_color = $red
-  fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i>
-  capslock_color = $yellow
-  position = 0, -47
-  halign = center
-  valign = center
-}

.config/hypr/input.conf

@@ -1,25 +0,0 @@
-input {
-    kb_layout = gb
-    follow_mouse = 1
-
-    touchpad {
-        natural_scroll = true
-        disable_while_typing = true
-    }
-
-    sensitivity = -0.3
-    force_no_accel = false
-}
-
-cursor {
-    inactive_timeout = 2
-		warp_on_change_workspace = 1
-		hide_on_key_press = true
-		warp_on_toggle_special = 1
-}
-
-device {
-	name = 2.4g-wireless-optical-mouse--mouse
-	sensitivity = -0.65
-	accel_profile = adaptive
-}

.config/hypr/mocha.conf

@@ -1,78 +0,0 @@
-
-$rosewater = rgb(f5e0dc)
-$rosewaterAlpha = f5e0dc
-
-$flamingo = rgb(f2cdcd)
-$flamingoAlpha = f2cdcd
-
-$pink = rgb(f5c2e7)
-$pinkAlpha = f5c2e7
-
-$mauve = rgb(cba6f7)
-$mauveAlpha = cba6f7
-
-$red = rgb(f38ba8)
-$redAlpha = f38ba8
-
-$maroon = rgb(eba0ac)
-$maroonAlpha = eba0ac
-
-$peach = rgb(fab387)
-$peachAlpha = fab387
-
-$yellow = rgb(f9e2af)
-$yellowAlpha = f9e2af
-
-$green = rgb(a6e3a1)
-$greenAlpha = a6e3a1
-
-$teal = rgb(94e2d5)
-$tealAlpha = 94e2d5
-
-$sky = rgb(89dceb)
-$skyAlpha = 89dceb
-
-$sapphire = rgb(74c7ec)
-$sapphireAlpha = 74c7ec
-
-$blue = rgb(89b4fa)
-$blueAlpha = 89b4fa
-
-$lavender = rgb(b4befe)
-$lavenderAlpha = b4befe
-
-$text = rgb(cdd6f4)
-$textAlpha = cdd6f4
-
-$subtext1 = rgb(bac2de)
-$subtext1Alpha = bac2de
-
-$subtext0 = rgb(a6adc8)
-$subtext0Alpha = a6adc8
-
-$overlay2 = rgb(9399b2)
-$overlay2Alpha = 9399b2
-
-$overlay1 = rgb(7f849c)
-$overlay1Alpha = 7f849c
-
-$overlay0 = rgb(6c7086)
-$overlay0Alpha = 6c7086
-
-$surface2 = rgb(585b70)
-$surface2Alpha = 585b70
-
-$surface1 = rgb(45475a)
-$surface1Alpha = 45475a
-
-$surface0 = rgb(313244)
-$surface0Alpha = 313244
-
-$base = rgb(1e1e2e)
-$baseAlpha = 1e1e2e
-
-$mantle = rgb(181825)
-$mantleAlpha = 181825
-
-$crust = rgb(11111b)
-$crustAlpha = 11111b

.config/hypr/rules.conf

@@ -1,154 +0,0 @@
-windowrule {
-  name = nodim-youtube
-  no_dim = on
-  opaque = on
-  match:class = ^(firefox|Firefox)$
-  match:title = ^(.*YouTube.*)$
-}
-
-windowrule {
-  name = nodim-delfin
-  no_dim = on
-  opaque = on
-  match:class = ^(cafe.avery.Delfin)$
-}
-
-windowrule {
-  name = float-firefoxDialogue
-  float = on
-  match:title = ^(About Mozilla Firefox)$
-}
-
-windowrule {
-  name = file-browser
-  float = on
-  size = 800 500
-  animation = popin
-  match:class = ^(xdg-desktop-portal-gtk)$
-}
-
-windowrule {
-  name = firefox-pip
-  float = on
-  match:class = ^(firefox)$
-  match:title = ^(Picture-in-Picture)$
-}
-
-windowrule {
-  name = float-history
-  float = on
-  match:class = ^(firefox)$
-  match:title = ^(Library)$
-}
-
-windowrule {
-  name = nwg-look
-  float = on
-  match:class = ^(nwg-look)$
-}
-
-windowrule {
-  name = volume-control
-  float = on
-  match:class = ^(org.pulseaudio.pavucontrol)$
-}
-
-windowrule {
-  name = blueman-size
-  float = on
-  size = 600 400
-  animation = popin
-  match:class = ^(.blueman-manager-wrapped)$
-}
-
-windowrule {
-  name = float-nm
-  float = on
-  match:class = ^(nm-applet)$
-}
-
-windowrule {
-  name = float-nm
-  float = on
-  match:class = ^(nm-connection-editor)$
-}
-
-windowrule {
-  name = float-auth-agent
-  float = on
-  match:class = ^(org.kde.polkit-kde-authentication-agent-1)$
-}
-
-windowrule {
-  name = firefox-popups
-  size = 800 500
-  animation = popin
-  match:class = ^(firefox)$
-  match:title = ^(.*Save.*)
-}
-
-windowrule {
-  name = otter-launcher-initial
-  size = 420 220
-	float = on
-	opaque = on
-  animation = popin 50%
-  match:class = ^(otter)$
-}
-
-windowrule {
-  name = jellyfin tui
-  animation = slide top
-  match:class = ^(jf-tui)$
-}
-
-windowrule {
-	name = nodim-fullscreen
-	match:fullscreen = 1
-	no_dim = on
-}
-
-windowrule {
-	name = nodim-kitty
-  match:class = ^(kitty)$
-	opaque = on
-	xray = on
-}
-
-layerrule {
-  name = layerrule-1
-  blur = on
-  ignore_alpha = 0
-  match:namespace = notifications
-}
-
-layerrule {
-  name = something to do with wlogout
-  blur = on
-  match:namespace = logout_dialog
-}
-
-layerrule {
-  name = layerrule-3
-  blur = on
-	ignore_alpha = 0
-  match:namespace = waybar
-}
-
-layerrule {
-  name = layerrule-4
-  ignore_alpha = 0
-  blur = on
-  animation = popin 70%
-  match:namespace = otter-panel
-}
-
-layerrule {
-  name = layerrule-5
-  animation = slide right
-  blur = on
-  ignore_alpha = 0
-  match:namespace = swaync-control-center
-}
-
-workspace = special:music, gapsout:5 400 400 400

.config/hypr/startup.conf

@@ -1,15 +0,0 @@
-exec-once = $scrPath/resetxdgportal.sh # reset XDPH for screenshare
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
-exec-once = dbus-update-activation-environment --systemd --all # for XDPH
-exec-once = dconf write /org/gnome/desktop/interface/color-scheme '"prefer-dark"'
-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
-exec-once = $scrPath/polkitkdeauth.sh # authentication dialogue for GUI apps
-exec-once = waybar # System bar
-exec-once = sleep 10 && curl -X POST -H "Content-Type: application/json" -d "{\"ref\":\"$(git -C ~/.dotfiles rev-parse HEAD)\", \"status\":\"$(git -C ~/.dotfiles diff --quiet && echo "clean" || echo "dirty")\"}" https://n8n.voidarc.co.uk/webhook/config-checker # check if config is up to date
-exec-once = elephant # Data for Walker
-exec-once = walker --gapplication-service # make walker faster
-exec-once = dunst # Notifications
-exec-once = ~/.config/scripts/.venv/bin/python ~/.config/scripts/notify.py # Android notification forwarding
-exec-once = wayvnc 0.0.0.0 --output=DP-1 # runs vnc server on all interfaces
-exec-once = syncthing -home=/home/user01/.config/syncthing -no-browser # starts syncthing in background
-exec-once = gotify-desktop # gotify daemon for service notifications

.config/hypr/style.conf

@@ -1,112 +0,0 @@
-# Environment
-env = PATH,$PATH:$scrPath
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = MOZ_ENABLE_WAYLAND,1
-env = GDK_SCALE,1
-
-# Misc
-misc {
-    vrr = 0
-    animate_manual_resizes = true
-    disable_hyprland_logo = true
-    disable_splash_rendering = true
-    force_default_wallpaper = 0
-}
-
-xwayland {
-    force_zero_scaling = false
-}
-
-# Layout
-dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true # You probably want this
-    permanent_direction_override = true
-}
-
-scrolling {
-		column_width = 0.8
-		follow_min_visible = 0.1
-		focus_fit_method = 1
-}
-
-# GTK shennanigans
-exec = gsettings set org.gnome.desktop.interface icon-theme 'BeautyDream'
-exec = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha'
-exec = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
-
-# Make things look nice
-general {
-    gaps_in = 3
-    gaps_out = 5, 6, 6, 6
-    border_size = 3
-    col.active_border = rgba(ca9ee6cc) rgba(f38ba8cc) 45deg
-		col.inactive_border = rgba(45475aaa) rgba(b4befeaa) 45deg
-    layout = scrolling
-    resize_on_border = true
-}
-
-ecosystem {
-		no_update_news = true
-		no_donation_nag = true
-}
-
-group {
-    col.border_active = rgba(ca9ee6cc) rgba(f2d5cfcc) 45deg
-    col.border_inactive = rgba(bac2decc) rgba(bac2decc) 45deg
-    col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
-    col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
-}
-
-decoration {
-    rounding = 10
-
-    active_opacity = 1.0
-    inactive_opacity = 0.8
-
-    dim_inactive = true
-    dim_strength = 0.2
-
-    blur {
-        enabled = true
-        size = 2
-        passes = 3
-				vibrancy = 0.5
-    }
-}
-
-# Fonts and Cursors
-exec = hyprctl setcursor Bibata-Modern-Ice 20
-exec = gsettings set org.gnome.desktop.interface cursor-theme 'Bibata-Modern-Ice'
-exec = gsettings set org.gnome.desktop.interface cursor-size 20
-exec = gsettings set org.gnome.desktop.interface font-name 'FiraMono Nerd Font'
-exec = gsettings set org.gnome.desktop.interface document-font-name 'Cantarell 10'
-exec = gsettings set org.gnome.desktop.interface monospace-font-name 'CaskaydiaCove Nerd Font Mono 9'
-exec = gsettings set org.gnome.desktop.interface font-antialiasing 'rgba'
-exec = gsettings set org.gnome.desktop.interface font-hinting 'full'
-env XCURSOR_SIZE = 20
-
-# Animations
-animations {
-    enabled = true
-
-    bezier = smooth, 0.3,0,0.5,1
-    bezier = my, 0.34,0.77,0.74,1.47
-
-    animation = windows, 1, 2, smooth, slide right
-    animation = windowsOut, 1, 2, smooth, slide right
-    animation = windowsMove, 1, 3, smooth, slide
-    animation = border, 1, 2, smooth
-    animation = borderangle, 1, 8, smooth
-    animation = fade, 1, 2, my
-    animation = workspaces, 1, 1.7, smooth
-		animation = specialWorkspace, 1, 1.7, smooth, slidefadevert -50%
-    animation = layers, 1, 2, smooth, fade
-    animation = fadeLayers, 1, 2, smooth
-}

.config/hypr/windows.conf

@@ -1 +0,0 @@
-monitor = , preferred, auto, 1.2

.config/lazygit/config.yml

@@ -1,2 +1,14 @@
 gui:
   nerdFontsVersion: "3"
+
+customCommands:
+  - key: 'p'
+    context: 'global'
+    command: 'git pull --recurse-submodules'
+    loadingText: 'Pulling with submodules'
+    output: 'log'
+  - key: '<c-p>'
+    context: 'global'
+    command: 'git pull'
+    loadingText: 'Pulling remote repo'
+    output: 'log'

.config/oh-my-posh/zen.toml

@@ -17,6 +17,33 @@ final_space = true
   alignment = 'left'
   newline = true
 
+[[blocks.segments]]
+type = 'text'
+style = 'plain'
+template = '''
+{{- if .Env.DEVSHELL_NAME -}}
+  {{- $parts := split "|" .Env.DEVSHELL_NAME -}}
+  {{- range $part := $parts -}}
+    {{- if $part -}}
+      {{- $sub := split "/" $part -}}
+      {{- if eq (len $sub) 2 -}}
+        <{{ index $sub "_1" }}>{{ index $sub "_0" }}</> <#7f849c>| </>
+      {{- end -}}
+    {{- end -}}
+  {{- end -}}
+{{- end -}}
+'''
+
+	[[blocks.segments]] # Python venv
+  type = 'text'
+  style = 'plain'
+  template = '{{ if .Env.VIRTUAL_ENV }}<yellow>🐍 venv</> <#7f849c>|</> {{ end }}'
+
+	[[blocks.segments]] # Nix shell indicator
+  type = 'text'
+  style = 'plain'
+  template = '{{ if and .Env.IN_NIX_SHELL (not .Env.DEVSHELL_NAME) }}<blue> nsh</> <#7f849c>|</> {{ end }}'
+
   [[blocks.segments]]
     template = '{{ .Path }}'
     foreground = 'blue'
@@ -29,8 +56,8 @@ final_space = true
       style = 'full'
 
   [[blocks.segments]]
-    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}*{{ end }} <cyan>{{ if gt .Behind 0 }}⇣{{ end }}{{ if gt .Ahead 0 }}⇡{{ end }}</>'
+    template = ' {{ .HEAD }}{{ if or (.Working.Changed) (.Staging.Changed) }}<yellow> *</>{{ end }} <cyan>{{ if gt .Behind 0 }}󰁅{{ end }}{{ if gt .Ahead 0 }}{{ end }}</>'
-    foreground = 'p:grey'
+    foreground = 'green'
     background = 'transparent'
     type = 'git'
     style = 'plain'

.config/otter-launcher/config.toml

@@ -16,7 +16,7 @@ delay_startup = 0 # sometimes the otter runs too fast even before the terminal w
 [interface]
 # use three quotes to write longer codes
 header = """
-  \u001B[1;36m$USER@nixos\u001B[0m     \u001B[34m 
+  \u001B[1;36m$USER@nixos\u001B[0m
 	"""
 header_cmd = "" # run a command and print stdout above the header
 header_cmd_trimmed_lines = 0 # remove trailing lines from header_cmd output, in case of some programs appending excessive empty lines
@@ -38,7 +38,7 @@ description_color = "\u001B[39m"
 place_holder_color = "\u001B[30m"
 hint_color = "\u001B[30m" # suggestion color in hint mode
 # move the interface rightward or downward
-move_interface_right = 20
+move_interface_right = 21
 move_interface_down = 0
 
 
@@ -49,108 +49,82 @@ chafa -s 20x20 ~/.config/otter-launcher/cat.png
 """
 overlay_trimmed_lines = 1
 
-
-# modules are defined as followed
 [[modules]]
-description = "google search"
+description = "programs"
-prefix = "gg"
-cmd = "firefox --new-window https://www.google.com/search?q='{}'"
-with_argument = true # if true, {} in cmd will be replaced with user input. if not explicitly set, taken as false.
-url_encode = true # should be true when calling webpages; this ensures special characters in url being readable to browsers; taken as false if not explicitly set
-unbind_proc = true # run cmd in a forked shell as opposed to as a child process (simply by prepending setsid -f to the configured cmd); useful for launching gui programs; taken as false if not explicitly set
-
-[[modules]]
-description = "launch programs"
 prefix = "app"
 cmd = """
-hyprctl dispatch resizeactive 300 500 &&
+hyprctl dispatch 'hl.dsp.window.resize({x = 700, y = 700, window = activewindow})' &&
-hyprctl dispatch centerwindow &&
+hyprctl dispatch 'hl.dsp.window.center({window = activewindow})'&&
-hyprctl dispatch exec $(fsel --no-exec)
+hyprctl dispatch "hl.dsp.exec_cmd('$(fsel --no-exec)')"
+"""
+
+[[modules]]
+description = "bluetooth"
+prefix = "bl"
+cmd = """
+hyprctl dispatch 'hl.dsp.window.resize({x = 650, y = 400, window = activewindow})' &&
+hyprctl dispatch 'hl.dsp.window.center({window = activewindow})'&&
+bluetui
 """
 
 [[modules]]
 description = "nerd icons"
 prefix = "nerd"
 cmd = """
-hyprctl dispatch resizeactive 300 500 &&
-hyprctl dispatch centerwindow &&
-hyprctl dispatch exec wl-copy $(cat ~/.config/otter-launcher/icons.json | jq -r '. | to_entries[] | "\\(.value.char)  \\(.key)"' | fzf | awk '{print $1}' | tr -d '\n')
-"""
-
-[[modules]]
-description = "run command"
-prefix = "sh"
-cmd = """
-hyprctl dispatch exec 'kitty -e zsh -c "{}"'
-"""
-with_argument = true
-unbind_proc = true
-
-[[modules]]
-description = "notes"
-prefix = "n"
-cmd = """
-hyprctl dispatch exec "kitty -e nvim --cmd 'cd ~/Notes/'"
 """
 
 [[modules]]
 description = "nixos wiki"
 prefix = "nw"
 cmd = """
-hyprctl dispatch exec "firefox --new-window 'https://wiki.nixos.org/w/index.php?search={}'"
+hyprctl dispatch "hl.dsp.exec_cmd('firefox --new-window https://wiki.nixos.org/w/index.php?search={}')"
 """
 with_argument = true
 url_encode = true
 unbind_proc = true
 
 [[modules]]
-description = "search nixpkgs"
+description = "nixpkgs"
 prefix = "nix"
 cmd = """
-hyprctl dispatch exec "firefox --new-window 'https://search.nixos.org/packages?query={}'"
+hyprctl dispatch "hl.dsp.exec_cmd('firefox --new-window https://search.nixos.org/packages?query={}')"
 """
 with_argument = true
 url_encode = true
 unbind_proc = true
 
 [[modules]]
-description = "cambridge dict"
+description = "open folder"
-prefix = "dc"
-cmd = """
-hyprctl dispatch exec "firefox --new-window 'https://dictionary.cambridge.org/dictionary/english/{}'"
-"""
-with_argument = true
-url_encode = true
-unbind_proc = true
-
-[[modules]]
-description = "open dirs (yazi)"
 prefix = "path"
 cmd = """
-hyprctl dispatch resizeactive 300 500 &&
+hyprctl dispatch 'hl.dsp.window.resize({x = 700, y = 700, window = activewindow})' &&
-hyprctl dispatch centerwindow &
+hyprctl dispatch 'hl.dsp.window.center({window = activewindow})'&&
-hyprctl dispatch exec thunar $(find . -maxdepth 2 -type d | fzf)
+hyprctl dispatch "hl.dsp.exec_cmd('nemo $(find . -maxdepth 2 -type d | fzf)')"
 """
 
 [[modules]]
-description = "run music"
+description = "jellyfin"
 prefix = "jf"
 cmd = """
-hyprctl dispatch exec '[workspace special:music]' 'kitty --class jf-tui -e jellyfin-tui'
+hyprctl dispatch  'hl.dsp.exec_cmd("kitty --class jf-tui -e jellyfin-tui", {workspace = "special:music"})'
 """
 
 [[modules]]
-description = "open youtube"
+description = "youtube"
 prefix = "y"
-cmd = "hyprctl dispatch exec 'firefox --new-window https://www.youtube.com'"
+cmd = """
+hyprctl dispatch "hl.dsp.exec_cmd('firefox --new-window https://www.youtube.com')"
+"""
 with_argument = false
 url_encode = true
 unbind_proc = true
 
 [[modules]]
-description = "open whatsapp"
+description = "whatsapp"
 prefix = "w"
-cmd = "hyprctl dispatch exec 'firefox --new-window https://web.whatsapp.com'"
+cmd = """
+hyprctl dispatch "hl.dsp.exec_cmd('firefox --new-window https://web.whatsapp.com')"
+"""
 with_argument = false
 url_encode = true
 unbind_proc = true

.config/wlogout/layout

@@ -6,7 +6,7 @@
 }
 {
     "label" : "logout",
-    "action" : "hyprctl dispatch exit",
+    "action" : "hyprctl dispatch 'hl.dsp.exit()'" ,
     "text" : "Logout",
     "keybind" : "e"
 }

.config/wpaperd/config.toml

@@ -1,2 +1,12 @@
 [any]
 path = "/home/user01/.config/wallpapers"
+
+[HDMI-A-1]
+path = "~/.config/wallpapers/topo1.png"
+
+[DP-1]
+path = "~/.config/wallpapers/topo2.png"
+
+[DP-2]
+path = "~/.config/wallpapers/topo3.png"
+

.gitmodules

@@ -5,3 +5,6 @@
 	path = .nixos
 	url = https://git.voidarc.co.uk/voidarc/nixos
 	branch = main
+[submodule ".config/hypr"]
+	path = .config/hypr
+	url = https://git.voidarc.co.uk/voidarc/hypr

.zshrc

@@ -8,6 +8,15 @@ zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]}' 'r:|[._-]=* r:|=
 # init oh my posh with theme from stow
 eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/zen.toml)"
 
+# make nix shell zsh instead of bash
+any-nix-shell zsh --info-right | source /dev/stdin
+
+# make nvim main editor
+export EDITOR=nvim
+
+# Fzf history search
+source <(fzf --zsh)
+
 # custom aliases
 alias ls="lsd -l"
 alias cat="bat"
@@ -17,5 +26,6 @@ alias lg="lazygit"
 alias nsh="nix-shell -p"
 alias ncg="sudo nix-collect-garbage -d"
 alias vinix="nvim --cmd 'cd ~/.dotfiles/.nixos'"
+alias man='man -P "bat -p"'
 
 source ~/.zshrc-local

laptop-files/.config/hypr/binds-local.conf

@@ -1,33 +0,0 @@
-
-bind = $mainMod, f, fullscreen # toggle the window between focus and fullscreen
-bind = $mainMod, e, exec, wlogout -b 5 # Wlogout menu
-
-# Application shortcuts
-bind = $mainMod, return, exec, $term # launch terminal emulator
-bind = $mainMod, i, exec, $editor # launch text editor
-bind = $mainMod, o, exec, $browser # launch web browser
-
-# Switch workspaces
-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 focused window to a workspace
-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
-

laptop-files/.config/hypr/local.conf

@@ -1,10 +0,0 @@
-# Main modifier
-$mainMod = mod1
-$submod = super
-
-input {
-		kb_options = caps:swapescape # swap caps and escape
-}
-
-exec-once = wpaperd -d # Wallpaper
-exec-once = way-edges # Screen Edge Shell

pc-files/.config/hypr/binds-local.conf

@@ -1,35 +0,0 @@
-
-# Script Path
-$scrPath = ~/.config/scripts
-
-# Window/Session actions
-bind = $mainMod, b, fullscreen # toggle the window between focus and fullscreen
-bind = $mainMod, a, exec, wlogout -b 5 # Wlogout menu
-
-# Application shortcuts
-bind = $mainMod, s, exec, $file # launch web browser
-bind = $mainMod, return, exec, $term # launch terminal emulator
-bind = $mainMod, f, exec, $browser # launch web browser
-
-# Switch workspaces
-bind = $mainMod, q, workspace, 1
-bind = $mainMod, w, workspace, 2
-bind = $mainMod, e, workspace, 3
-bind = $mainMod, r, workspace, 4
-bind = $mainMod, t, workspace, 5
-bind = $mainMod, y, workspace, 6
-bind = $mainMod, u, workspace, 7
-bind = $mainMod, i, workspace, 8
-bind = $mainMod, o, workspace, 9
-bind = $mainMod, p, workspace, 10
-
-bind = $mainMod+SHIFT, q, movetoworkspacesilent, 1
-bind = $mainMod+SHIFT, w, movetoworkspacesilent, 2
-bind = $mainMod+SHIFT, e, movetoworkspacesilent, 3
-bind = $mainMod+SHIFT, r, movetoworkspacesilent, 4
-bind = $mainMod+SHIFT, t, movetoworkspacesilent, 5
-bind = $mainMod+SHIFT, y, movetoworkspacesilent, 6
-bind = $mainMod+SHIFT, u, movetoworkspacesilent, 7
-bind = $mainMod+SHIFT, i, movetoworkspacesilent, 8
-bind = $mainMod+SHIFT, o, movetoworkspacesilent, 9
-bind = $mainMod+SHIFT, p, movetoworkspacesilent, 10

pc-files/.config/hypr/local.conf

@@ -1,8 +0,0 @@
-# Main modifier
-$mainMod = super # super / meta / windows key
-$submod = super
-
-#cool decorations
-exec-once = kitten panel --edge=background -o background_opacity=0 --output-name HDMI-A-1 sh -c "cmatrix -b -C magenta -a -u 10"
-exec-once = kitten panel --edge=background -o background_opacity=0 --output-name DP-2 sh -c "cava"
-# exec-once = kitten panel --edge=background -o background_opacity=0 --output-name DP-1 sh -c "fastfetch && tail -f /dev/null"

pc-files/.config/hypr/windows.conf

@@ -1,16 +0,0 @@
-monitor = DP-1, 1920x1080@60, 0x0, 1
-monitor = DP-2, 1920x1080@60, 1920x0, 1
-monitor = HDMI-A-1, 1920x1080@60, -1920x0, 1
-
-workspace = 2, monitor:HDMI-A-1, default:true
-workspace = 3, monitor:DP-2, default:true
-workspace = 1, monitor:DP-1, default:true
-
-exec-once = wpaperd
-
-decoration {
-		blur {
-				vibrancy_darkness = 0.3
-        vibrancy = 1
-		}
-}

pc-files/.config/wpaperd/config.toml

@@ -1,8 +0,0 @@
-[HDMI-A-1]
-path = "~/.config/wallpapers/topo1.png"
-
-[DP-1]
-path = "~/.config/wallpapers/topo2.png"
-
-[DP-2]
-path = "~/.config/wallpapers/topo3.png"