control: update dotfiles to v0.1.0

alacritty/alacritty.toml

@@ -1,4 +1,3 @@
-import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-mocha.toml"]
 
 [cursor.style]
 shape = "Underline"
@@ -7,7 +6,7 @@ shape = "Underline"
 TERM = "xterm-256color"
 
 [font]
-size = 11
+size = 13
 
 [colors]
 footer_bar = { foreground = "#181818", background = "#d8d8d8" }
@@ -39,10 +38,16 @@ key = "End"
 mode = "~Alt"
 mods = "Shift"
 
-[shell]
+[terminal.shell]
 args = ["--login"]
 program = "/bin/zsh"
 
 [window]
 opacity = 0.5
+padding = {x = 25, y = 25}
+
+[general]
+import = ["/home/trianta/.config/alacritty/catppuccin/catppuccin-frappe.toml"]
+
+[terminal]
 

deploy.sh

@@ -4,12 +4,6 @@ echo "Syncing user with alacritty..."
 rsync --recursive $(dirname "$0")/alacritty/ ~/.config/alacritty 
 echo "Syncing user with hypr..."
 rsync --recursive $(dirname "$0")/hypr/ ~/.config/hypr 
-echo "Syncing user with nvim..."
-rsync --recursive $(dirname "$0")/nvim/ ~/.config/nvim 
-echo "Syncing user with tmux..."
-echo "  Note: prefix + I for tmux setup"
-mkdir -p ~/tmux
-rsync --recursive $(dirname "$0")/tmux/tmux.conf ~/.config/tmux/tmux.conf
 echo "Syncing user with waybar..."
 rsync --recursive $(dirname "$0")/waybar/ ~/.config/waybar 
 echo "Syncing complete!"

hypr/frappe.conf

@@ -0,0 +1,61 @@
+$rosewaterAlpha = f2d5cf
+$flamingoAlpha  = eebebe
+$pinkAlpha      = f4b8e4
+$mauveAlpha     = ca9ee6
+$redAlpha       = e78284
+$maroonAlpha    = ea999c
+$peachAlpha     = ef9f76
+$yellowAlpha    = e5c890
+$greenAlpha     = a6d189
+$tealAlpha      = 81c8be
+$skyAlpha       = 99d1db
+$sapphireAlpha  = 85c1dc
+$blueAlpha      = 8caaee
+$lavenderAlpha  = babbf1
+
+$textAlpha      = c6d0f5
+$subtext1Alpha  = b5bfe2
+$subtext0Alpha  = a5adce
+
+$overlay2Alpha  = 949cbb
+$overlay1Alpha  = 838ba7
+$overlay0Alpha  = 737994
+
+$surface2Alpha  = 626880
+$surface1Alpha  = 51576d
+$surface0Alpha  = 414559
+
+$baseAlpha      = 303446
+$mantleAlpha    = 292c3c
+$crustAlpha     = 232634
+
+$rosewater = 0xfff2d5cf
+$flamingo  = 0xffeebebe
+$pink      = 0xfff4b8e4
+$mauve     = 0xffca9ee6
+$red       = 0xffe78284
+$maroon    = 0xffea999c
+$peach     = 0xffef9f76
+$yellow    = 0xffe5c890
+$green     = 0xffa6d189
+$teal      = 0xff81c8be
+$sky       = 0xff99d1db
+$sapphire  = 0xff85c1dc
+$blue      = 0xff8caaee
+$lavender  = 0xffbabbf1
+
+$text      = 0xffc6d0f5
+$subtext1  = 0xffb5bfe2
+$subtext0  = 0xffa5adce
+
+$overlay2  = 0xff949cbb
+$overlay1  = 0xff838ba7
+$overlay0  = 0xff737994
+
+$surface2  = 0xff626880
+$surface1  = 0xff51576d
+$surface0  = 0xff414559
+
+$base      = 0xff303446
+$mantle    = 0xff292c3c
+$crust     = 0xff232634

hypr/hyprland.conf

@@ -1,98 +1,129 @@
-# Config home wiki: https://wiki.hyprland.org
-# See https://wiki.hyprland.org/Configuring/Monitors/
+source = ~/.config/hypr/frappe.conf # Catppuccin colorscheme
 
-# Day
-monitor=DP-2, highrr, 0x1080, 1, bitdepth, 10, vrr, 1
-monitor=DP-3, highrr, 760x0, 1, vrr, 1
-workspace = DP-3, 5
+# < Start Section >
+# monitors
 
-# Night
-#monitor=DP-2, highrr, 0x0, 1, bitdepth, 10, vrr, 0
-#monitor=DP-3, disable
+monitor = eDP-1, highrr, 0x0, 1.00
+monitor = , highrr, 1920x0, 1.00
 
-# Main workspace
-workspace = DP-2, 1
+# < End Section >
 
-# Color: Catppuccin Mocha
-source=~/.config/hypr/mocha.conf
 
-# Launch applications
-exec-once = hyprpaper
-exec-once = waybar -c ~/.config/waybar/config.json
+
+# < Start Section >
+# startup applications
+
+# environment launches
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP # for XDPH
+exec-once = dbus-update-activation-environment --systemd --all
+exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = /usr/lib/polkit-kde-authentication-agent-1 # authentication dialogue for GUI apps
+exec-once = gsettings set org.gnome.desktop.interface gtk-theme 'Catppuccin-Mocha'
+exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
+
+exec-once = waybar -c ~/.config/waybar/config
+exec-once = dunst
+exec-once = swww-daemon
 exec-once = syncthing --no-browser
-exec-once = hyprctl setcursor Catppuccin-Mocha-Lavender 24
-exec-once = xwaylandvideobridge
-exec-once = linux-discord-rich-presence -c ~/.config/linux-discord-rich-presencerc 
+
+# main applications
+#exec-once = discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+exec-once = spotify --disable-gpu
+exec-once = alacritty
+exec-once = firefox
+#exec-once = taskset -c 1-7 steam
+#exec-once = taskset -c 1-7 gamescope -W 3200 -H 1100 -b -- steam
+exec-once = bolt
+
+# < End Section >
 
 
-# Slow launch fix
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 
-# Default env vars.
-env = XCURSOR_SIZE,20
+# < Start Section >
+# workspace rules
 
-# Nvidia environment variables
-env = LIBVA_DRIVER_NAME,nvidia
-env = XDG_SESSION_TYPE,wayland
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = WLR_NO_HARDWARE_CURSORS,1
-#env = GBM_BACKEND,nvidia-drm
-#env = WLR_DRM_NO_ATOMIC,1
+workspace = 1, monitor:eDP-1, persistent:true, default:true
+workspace = 2, monitor:eDP-1, persistent:true
+workspace = 3, monitor:eDP-1, persistent:true
+workspace = 4, monitor:eDP-1, persistent:true
+workspace = 5, monitor:eDP-1, persistent:true
 
-# Nvidia G-Sync
-env = __GL_GSYNC_ALLOWED,1
-env = __GL_VRR_ALLOWED,1
+# last workspace for hdmi
+workspace = 6, monitor:HDMI-A-1
+
+# < End Section >
+
+
+
+# < Start Section >
+# variables
 
-input {
-    kb_layout = us
-    follow_mouse = 2
-    sensitivity = -.75 # -1.0 - 1.0, 0 means no modification.
-}
 
 general {
-    gaps_in = 5
-    gaps_out = 10
+	gaps_in = 0
+	gaps_out = 4
 	border_size = 0
-    col.active_border = 0xee$lavenderAlpha 45deg
-    col.inactive_border = 0xaa$overlay0Alpha
-    layout = dwindle
-    allow_tearing = false
+	col.active_border = 0x000000
+	col.inactive_border = 0x000000
+	layout = master
+	resize_on_border = false
 }
 
 decoration {
-    rounding = 10
+    drop_shadow = false
+	rounding = 0
+	dim_special = 0.3
+	fullscreen_opacity = 1.0
+	
 	blur {
-        enabled = yes
-        size = 12
-        passes = 1
+		enabled = true
+		special = true
+		size = 6
+		passes = 3
+		new_optimizations = true
+		ignore_opacity = true
+		xray = false
 	}
-
-    drop_shadow = yes
-    shadow_range = 4
-    shadow_render_power = 3
-    col.shadow = 0xee$baseAlpha
-
-    active_opacity = 1.0
-    inactive_opacity = 0.9
 }
 
 animations {
-    enabled = yes
-    animation = windows, 1, 8, default
-    animation = windowsOut, 1, 8, default
-    animation = border, 1, 8, default
-    animation = borderangle, 1, 8, default
-    animation = fade, 1, 8, default
-    animation = workspaces, 1, 8, default, slidefade 80%
+	enabled = true
+	bezier = wind, 0.05, 0.9, 0.1, 1.05
+	bezier = winIn, 0.1, 1.1, 0.1, 1.1
+	bezier = winOut, 0.3, -0.3, 0, 1
+	bezier = liner, 1, 1, 1, 1
+	animation = windows, 1, 6, wind, slide
+	animation = windowsIn, 1, 6, winIn, slide
+	animation = windowsOut, 1, 5, winOut, slide
+	animation = windowsMove, 1, 5, wind, slide
+	animation = border, 1, 1, liner
+	animation = borderangle, 1, 30, liner, loop
+	animation = fade, 1, 10, default
+	animation = workspaces, 1, 5, wind
 }
 
-dwindle {
-    pseudotile = yes
-    preserve_split = yes 
+input {
+	kb_layout = us
+	kb_options = caps:escape
+	follow_mouse = 2
+	mouse_refocus = false;
+	
+	sensitivity = 0
+	force_no_accel = 1
+	touchpad {
+		natural_scroll = true
+	}
 }
 
-master {
-    new_is_master = true
+gestures {
+	workspace_swipe = false
+}
+
+group {
+	col.border_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
+	col.border_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
+	col.border_locked_active = rgba(ca9ee6ff) rgba(f2d5cfff) 45deg
+	col.border_locked_inactive = rgba(b4befecc) rgba(6c7086cc) 45deg
 }
 
 misc {
@@ -100,47 +131,132 @@ misc {
 	disable_splash_rendering = true
 	force_default_wallpaper = 0
 	vrr = 1
+	vfr = true
 }
 
-# General window rules
-windowrule = float, ^(SnakePlusPlus)$ 
-windowrule = center, ^(SnakePlusPlus)$ 
-windowrule = opacity 0.6, ^(SnakePlusPlus)$ 
-windowrule = float, ^(TetrisPlusPlus)$ 
-windowrule = center, ^(TetrisPlusPlus)$ 
-windowrulev2 = pseudo,class:^(firefox.*)$
-windowrulev2 = pseudo,class:^(Alacritty.*)$
-windowrulev2 = opacity 0.6 override 0.6 override,class:(Spotify)
+xwayland {
+	# latest configuration
+	# use_nearset_neighbor
+	# force_zero_scaling
+	# current configuration
+	use_nearest_neighbor = true
+	force_zero_scaling = false
+}
 
-# Game window rules
-windowrulev2 = pseudo, class:(Minecraft.*)
-windowrulev2 = size 2646 1108, class:(Minecraft.*)
-windowrulev2 = pseudo, title:(Warframe.*)
-windowrulev2 = size 2646 1108, title:(Warframe.*)
+cursor {
+	no_hardware_cursors = true
+	inactive_timeout = 2
+	no_warps = false
+	default_monitor = DP-1
+}
 
-# Super bind
+debug {
+	disable_logs = true
+	#disable_logs
+}
+
+# Disable touchscreen
+device {
+	name = gxtp7386:00-27c6:011a
+	enabled = false
+}
+
+
+# < End Section >
+
+
+
+# < Start Section >
+# dwindle layout
+
+dwindle {
+	pseudotile = true
+	preserve_split = true
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# master layout
+
+master {
+	new_status = master
+}
+
+# < End Section >
+
+
+
+# < Start Section >
+# window rules
+
+# core
+workspace = w[t1], gapsout:0, border:0, rounding:0
+windowrulev2 = suppressevent maximize, class:^(.*)$
+windowrulev2 = opacity 0.80 0.80,class:^(.*)$
+windowrulev2 = opacity 0.80 0.70,class:^(pavucontrol)$
+windowrulev2 = opacity 0.80 0.70,class:^(org.kde.polkit-kde-authentication-agent-1)$
+windowrulev2 = float, class:^(qt5ct)$
+windowrulev2 = float, class:^(nwg-look)$
+windowrulev2 = float, class:^(pavucontrol)$
+windowrulev2 = float, class:^(org.kde.polkit-kde-authentication-agent-1)$
+
+# main
+windowrulev2 = workspace 1 silent, class:^(discord)$
+windowrulev2 = workspace 1 silent, class:^(vesktop)$
+windowrulev2 = workspace 1 silent, class:^(thunderbird)$
+windowrulev2 = workspace 1 silent, class:^(Dopamine)$
+windowrulev2 = workspace 1 silent, class:^(spotify)$
+windowrulev2 = workspace 2 silent, class:^(Alacritty)$
+windowrulev2 = workspace 3 silent, class:^(firefox)$
+
+# development
+windowrulev2 = float, class:^(VirtualBox.*)$
+windowrulev2 = float, title:^(SnakePlusPlus)$
+windowrulev2 = center, title:^(SnakePlusPlus)$
+windowrulev2 = opacity 0.4, title:^(SnakePlusPlus)$
+windowrulev2 = float, title:^(TetrisPlusPlus)$
+windowrulev2 = center, title:^(TetrisPlusPlus)$
+windowrulev2 = workspace 5 silent, class:^(aquamarine)$
+windowrulev2 = fullscreen, class:^(aquamarine)$
+
+# layer rules
+layerrule = blur,waybar
+layerrule = ignorezero, waybar
+
+# < End Section >
+
+
+
+# < Start Section >
+# keybinds
+
+# main modifier
 $mainMod = SUPER
 
-# Passthrough
+# passthrough
 bind = , mouse:275, pass, ^(discord)$
+bind = SHIFT, mouse:275, pass, ^(discord)$
 
-# Tiling binds
+# core binds
 bind = $mainMod SHIFT, Q, killactive,
+bind = $mainMod SHIFT, M, exit
 bind = $mainMod, SPACE, togglefloating,
-bind = $mainMod SHIFT, M, exit, 
-bind = $mainMod SHIFT, J, togglesplit, # dwindle
-bind = $mainMod SHIFT, P, pseudo, # dwindle
 bind = $mainMod, F, fullscreen,
+bind = $mainMod SHIFT, L, exec, hyprlock
+bind = $mainMod $CONTROL, ESCAPE, exec, killall waybar || waybar # toggle waybar
+bind = $mainMod SHIFT, J, togglesplit, # dwindle
+bind = $mainMod SHIFT, SPACE, pseudo, # dwindle
 
-# Exec binds
-bind = $mainMod SHIFT, E, exec, dolphin
-bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
-bind = $mainMod SHIFT, L, exec, swaylock -e -c cba6f7 -i /home/trianta/pics/catppuccin/misc/Street.jpg
+# main application shortcuts
 bind = $mainMod, RETURN, exec, alacritty
-bind = $mainMod, S, exec, wofi --show drun
+bind = $mainMod SHIFT, S, exec, grim -g "$(slurp)" - | wl-copy
+bind = $mainMod SHIFT, 7, exec, taskset -c 1-7 prismlauncher
+bind = $mainMod, S, exec, pkill -x rofi || rofi -show drun
 
-
-# Audio binds
+# generic audio control
 binde = , XF86AudioPlay, exec, playerctl play-pause
 binde = , XF86AudioStop, exec, playerctl stop
 binde = , XF86AudioPrev, exec, playerctl previous
@@ -149,33 +265,61 @@ binde = , XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 binde = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
 binde = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
 
+# custom audio control
+binde = $mainMod, F1, exec, playerctl play-pause
+binde = $mainMod, F2, exec, playerctl previous
+binde = $mainMod, F3, exec, playerctl next
+
+# Laptop binds
+binde = , XF86MonBrightnessDown, exec, brightnessctl set 5%-
+binde = , XF86MonBrightnessUp, exec, brightnessctl set 5%+
+
+# move focus
 bind = $mainMod, h, movefocus, l
 bind = $mainMod, l, movefocus, r
 bind = $mainMod, k, movefocus, u
 bind = $mainMod, j, movefocus, d
 
+# 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 SHIFT, 1, movetoworkspace, 1
 bind = $mainMod SHIFT, 2, movetoworkspace, 2
 bind = $mainMod SHIFT, 3, movetoworkspace, 3
 bind = $mainMod SHIFT, 4, movetoworkspace, 4
 bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod ALT, 1, movetoworkspacesilent, 1
+bind = $mainMod ALT, 2, movetoworkspacesilent, 2
+bind = $mainMod ALT, 3, movetoworkspacesilent, 3
+bind = $mainMod ALT, 4, movetoworkspacesilent, 4
+bind = $mainMod ALT, 5, movetoworkspacesilent, 5
+bind = $mainMod ALT, 6, movetoworkspacesilent, 6
 
-# Custom resize bind
-# bindsym $mod+ctrl+0 resize set width 3440px height 1440px
-#binde = $mainMod SHIFT, ], setactivesize, 2646 1108
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
+# resizing windows
+binde = $mainMod, right, resizeactive, 5 0
+binde = $mainMod, left, resizeactive, -5 0
+binde = $mainMod, up, resizeactive, 0 -5
+binde = $mainMod, down, resizeactive, 0 5
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-# Resize windows with arrow keys
-binde = $mainMod, right, resizeactive, 10 0
-binde = $mainMod, left, resizeactive, -10 0
-binde = $mainMod, up, resizeactive, 0 10
-binde = $mainMod, down, resizeactive, 0 -10
+# < End Section >
+
+
+
+# < Start Section >
+# environment variables
+
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_DESKTOP,Hyprland
+env = MOZ_ENABLE_WAYLAND,1
+env = HYPRCURSOR_THEME, rose-pine-hyprcursor
+env = HYPRCURSOR_SIZE, 24
+
+# < End Section >
 

hypr/hyprlock.conf

@@ -0,0 +1,79 @@
+source = $HOME/.config/hypr/frappe.conf
+
+$accent = $mauve
+$accentAlpha = $mauveAlpha
+$font = JetBrainsMono Nerd Font
+
+# GENERAL
+general {
+    disable_loading_bar = true
+    hide_cursor = true
+}
+
+# BACKGROUND
+background {
+    monitor = eDP-1
+    path = ~/.profile/background-locked.png
+    blur_passes = 0
+    color = $base
+}
+
+# TIME
+label {
+    monitor = eDP-1
+    text = cmd[update:30000] echo "$(date +"%R")"
+    color = $text
+    font_size = 90
+    font_family = $font
+    position = -30, 0
+    halign = right
+    valign = top
+}
+
+# DATE 
+label {
+    monitor = eDP-1
+    text = cmd[update:43200000] echo "$(date +"%A, %d %B %Y")"
+    color = $text
+    font_size = 25
+    font_family = $font
+    position = -30, -150
+    halign = right
+    valign = top
+}
+
+# USER AVATAR
+
+image {
+    monitor = eDP-1
+    path = ~/.profile/pfp.png
+    size = 100
+    border_color = $accent
+
+    position = 0, 75
+    halign = center
+    valign = center
+}
+
+# INPUT FIELD
+input-field {
+    monitor = eDP-1
+    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, -35
+    halign = center
+    valign = center
+}

hypr/hyprpaper.conf

@@ -1,23 +0,0 @@
-splash = false
-# Preset 1 
-#preload = /home/trianta/pics/squirrel-coffee.png
-#preload = /home/trianta/pics/dbb7hcs-1f9e8f0a-c4c7-4fc9-baf6-9e075ce86e30.jpg
-#wallpaper = DP-2,/home/trianta/pics/squirrel-coffee.png
-#wallpaper = DP-3,/home/trianta/pics/dbb7hcs-1f9e8f0a-c4c7-4fc9-baf6-9e075ce86e30.jpg
-
-# Preset 2 (Cyberpunk bright)
-#preload = ~/pics/P7SL1tk.jpeg
-#preload = ~/pics/cyberpunk.jpg
-#wallpaper = DP-2, ~/pics/P7SL1tk.jpeg
-#wallpaper = DP-3, ~/pics/cyberpunk.jpg
-
-# Preset 3 (Cyberpunk minimalistic)
-preload = ~/pics/analog-shadowscape.png
-preload = ~/pics/monochrome-kanji-art.png
-wallpaper = DP-2, ~/pics/analog-shadowscape.png
-wallpaper = DP-3, ~/pics/monochrome-kanji-art.png
-
-
-# Single monitor
-#preload = ~/pics/P7SL1tk.jpeg
-#wallpaper = DP-2, ~/pics/P7SL1tk.jpeg

hypr/mocha.conf

@@ -1,61 +0,0 @@
-$rosewaterAlpha = fff5e0dc
-$flamingoAlpha  = fff2cdcd
-$pinkAlpha      = fff5c2e7
-$mauveAlpha     = ffcba6f7
-$redAlpha       = fff38ba8
-$maroonAlpha    = ffeba0ac
-$peachAlpha     = fffab387
-$yellowAlpha    = fff9e2af
-$greenAlpha     = ffa6e3a1
-$tealAlpha      = ff94e2d5
-$skyAlpha       = ff89dceb
-$sapphireAlpha  = ff74c7ec
-$blueAlpha      = ff89b4fa
-$lavenderAlpha  = ffb4befe
-
-$textAlpha      = ffcdd6f4
-$subtext1Alpha  = ffbac2de
-$subtext0Alpha  = ffa6adc8
-
-$overlay2Alpha  = ff9399b2
-$overlay1Alpha  = ff7f849c
-$overlay0Alpha  = ff6c7086
-
-$surface2Alpha  = ff585b70
-$surface1Alpha  = ff45475a
-$surface0Alpha  = ff313244
-
-$baseAlpha      = ff1e1e2e
-$mantleAlpha    = ff181825
-$crustAlpha     = ff11111b
-
-$rosewater = 0xfff5e0dc
-$flamingo  = 0xfff2cdcd
-$pink      = 0xfff5c2e7
-$mauve     = 0xffcba6f7
-$red       = 0xfff38ba8
-$maroon    = 0xffeba0ac
-$peach     = 0xfffab387
-$yellow    = 0xfff9e2af
-$green     = 0xffa6e3a1
-$teal      = 0xff94e2d5
-$sky       = 0xff89dceb
-$sapphire  = 0xff74c7ec
-$blue      = 0xff89b4fa
-$lavender  = 0xffb4befe
-
-$text      = 0xffcdd6f4
-$subtext1  = 0xffbac2de
-$subtext0  = 0xffa6adc8
-
-$overlay2  = 0xff9399b2
-$overlay1  = 0xff7f849c
-$overlay0  = 0xff6c7086
-
-$surface2  = 0xff585b70
-$surface1  = 0xff45475a
-$surface0  = 0xff313244
-
-$base      = 0xff1e1e2e
-$mantle    = 0xff181825
-$crust     = 0xff11111b

nvim/after/plugin/binds.lua

@@ -1,27 +0,0 @@
--- Telescope
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>pf', builtin.find_files, {})
-vim.keymap.set('n', '<C-p>', builtin.git_files, {})
-vim.keymap.set('n', '<leader>ps', function()
-    builtin.grep_string({ search = vim.fn.input("Grep > ") })
-end)
-
--- Harpoon
-local mark = require("harpoon.mark")
-local ui = require("harpoon.ui")
-vim.keymap.set("n", "<leader>a", mark.add_file)
-vim.keymap.set("n", "<C-t>", ui.toggle_quick_menu)
-
-vim.keymap.set("n", "<C-q>", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-w>", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-e>", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-r>", function() ui.nav_file(4) end)
-
--- Zenmode
-vim.keymap.set("n", "<leader>pz", function()
-  require("zen-mode").toggle({
-      window = {
-          width = 90,
-      }
-  })
-end)

nvim/after/plugin/settings.lua

@@ -1,46 +0,0 @@
--- lsp-zero
-local lsp = require('lsp-zero')
-
-lsp.preset('recommended')
-lsp.setup()
-
--- Treesitter
-vim.opt.runtimepath:append("~/.local/share/nvim/parsers")
-
-require'nvim-treesitter.configs'.setup {
-  -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "c", "cpp", "javascript", "lua", "vim" },
-
-  -- Install parsers synchronously (only applied to `ensure_installed`)
-  sync_install = false,
-
-  -- Automatically install missing parsers when entering buffer
-  -- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
-  auto_install = true,
-
-  parser_install_dir = "~/.local/share/nvim/parsers",
-
-  highlight = {
-    enable = true,
-
-    -- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-    -- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-    -- Using this option may slow down your editor, and you may see some duplicate highlights.
-    -- Instead of true it can also be a list of languages
-    additional_vim_regex_highlighting = false,
-  },
-}
-
--- Obsidian
-vim.opt.conceallevel = 1
-
--- Colors
-function ColorMyPencils(color)
-    color = color or "catppuccin-frappe"
-    vim.cmd.colorscheme(color)
-
-    vim.api.nvim_set_hl(0, "Normal", { bg = "none" })
-    vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
-end
-
-ColorMyPencils()

nvim/init.lua

@@ -1,2 +0,0 @@
-require('trianta')
-

nvim/lazy-lock.json

@@ -1,23 +0,0 @@
-{
-  "LuaSnip": { "branch": "master", "commit": "82108e7e31cc6fc223cc5df5cae6d89f70bb199f" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" },
-  "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" },
-  "lsp-zero.nvim": { "branch": "v1.x", "commit": "aa36afcf7a59fbd98008c9a434593c423d3d649a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" },
-  "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" },
-  "nvim": { "branch": "main", "commit": "5e36ca599f4aa41bdd87fbf2c5aae4397ac55074" },
-  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
-  "nvim-lspconfig": { "branch": "master", "commit": "7eed8b2150192e5ad05e1886fdf133493ddf2928" },
-  "nvim-treesitter": { "branch": "master", "commit": "97ba59c6f532072e456b3d1f2413560e689c132b" },
-  "obsidian.nvim": { "branch": "main", "commit": "a9ae6b20560d716a5f9b89252e4ea29c8e64617a" },
-  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "todo-comments.nvim": { "branch": "main", "commit": "4a6737a8d70fe1ac55c64dfa47fcb189ca431872" },
-  "twilight.nvim": { "branch": "main", "commit": "8b7b50c0cb2dc781b2f4262a5ddd57571556d1e4" }
-}

nvim/lua/trianta/init.lua

@@ -1,3 +0,0 @@
-require("trianta.remap")
-require("trianta.lazy")
-require("trianta.set")

nvim/lua/trianta/lazy.lua

@@ -1,144 +0,0 @@
--- This file can be loaded by calling `lua require('plugins')` from your init.vim
-
--- Only required if you have packer configured as `opt`
-vim.cmd [[packadd lazy.nvim]]
-
-return require('lazy').setup({
-    -- Packer can manage itself
-    "folke/lazy.nvim",
-    {
-        "folke/todo-comments.nvim",
-        dependencies = { "nvim-lua/plenary.nvim" },
-        opts = {
-            -- your configuration comes here
-            -- or leave it empty to use the default settings
-            -- refer to the configuration section below
-        }
-    },
-    { "catppuccin/nvim", as = "catppuccin" },
-    {
-        "nvim-telescope/telescope.nvim", branch = '0.1.x',
-        -- or                            , branch = '0.1.x',
-        dependencies = {"nvim-lua/plenary.nvim"},
-    },
-
-    {
-        "nvim-treesitter/nvim-treesitter",
-        build = ":TSUpdate",
-    },
-    "nvim-treesitter/playground",
-    "ThePrimeagen/harpoon",
-    {
-        'VonHeikemen/lsp-zero.nvim',
-        branch = 'v1.x',
-        dependencies = {
-            -- LSP Support
-            "neovim/nvim-lspconfig",             -- Required
-            'williamboman/mason.nvim',           -- Optional
-            'williamboman/mason-lspconfig.nvim', -- Optional
-
-            -- Autocompletion
-            'hrsh7th/nvim-cmp',         -- Required
-            'hrsh7th/cmp-nvim-lsp',     -- Required
-            'hrsh7th/cmp-buffer',       -- Optional
-            'hrsh7th/cmp-path',         -- Optional
-            'saadparwaiz1/cmp_luasnip', -- Optional
-            'hrsh7th/cmp-nvim-lua',     -- Optional
-
-            -- Snippets
-            'L3MON4D3/LuaSnip',             -- Required
-            'rafamadriz/friendly-snippets', -- Optional
-        },
-    },
-    {
-        "epwalsh/obsidian.nvim",
-        version = "*",  -- recommended, use latest release instead of latest commit
-        lazy = true,
-        ft = "markdown",
-        dependencies = {
-            "nvim-lua/plenary.nvim",
-        },
-        opts = {
-            workspaces = {
-                {
-                    name = "trinote",
-                    path = "~/sync/obsidian/Trinote/",
-                },
-            },
-        },
-        ui = {
-            enable = true
-        }
-    },
-    {
-        "folke/twilight.nvim",
-        opts = {
-            dimming = {
-                alpha = 0.25, -- amount of dimming
-                -- we try to get the foreground from the highlight groups or fallback color
-                color = { "Normal", "#ffffff" },
-                term_bg = "#000000", -- if guibg=NONE, this will be used to calculate text color
-                inactive = false, -- when true, other windows will be fully dimmed (unless they contain the same buffer)
-            },
-            context = 10, -- amount of lines we will try to show around the current line
-            treesitter = true, -- use treesitter when available for the filetype
-            -- treesitter is used to automatically expand the visible text,
-            -- but you can further control the types of nodes that should always be fully expanded
-            expand = { -- for treesitter, we we always try to expand to the top-most ancestor with these types
-            "function",
-            "method",
-            "table",
-            "if_statement",
-        },
-        exclude = {}, -- exclude these filetypes
-    },
-},
--- Lua
-{
-    "folke/zen-mode.nvim",
-    opts = {
-        -- your configuration comes here
-        -- or leave it empty to use the default settings
-        -- refer to the configuration section below
-        {
-            window = {
-                backdrop = 0.95, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal
-                -- height and width can be:
-                -- * an absolute number of cells when > 1
-                -- * a percentage of the width / height of the editor when <= 1
-                -- * a function that returns the width or the height
-                width = 120, -- width of the Zen window
-                height = 1, -- height of the Zen window
-                -- by default, no options are changed for the Zen window
-                -- uncomment any of the options below, or add other vim.wo options you want to apply
-                options = {
-                    -- signcolumn = "no", -- disable signcolumn
-                    -- number = false, -- disable number column
-                    -- relativenumber = false, -- disable relative numbers
-                    -- cursorline = false, -- disable cursorline
-                    -- cursorcolumn = false, -- disable cursor column
-                    -- foldcolumn = "0", -- disable fold column
-                    -- list = false, -- disable whitespace characters
-                },
-            },
-            plugins = {
-                options = {
-                    enabled = true,
-                    ruler = false, -- disables the ruler text in the cmd line area
-                    showcmd = false, -- disables the command in the last line of the screen
-                    -- you may turn on/off statusline in zen mode by setting 'laststatus' 
-                    -- statusline will be shown only if 'laststatus' == 3
-                    laststatus = 0, -- turn off the statusline in zen mode
-                },
-                twilight = { enabled = true }, -- enable to start Twilight when zen mode opens
-            },
-            -- callback where you can add custom code when the Zen window opens
-            on_open = function(win)
-            end,
-            -- callback where you can add custom code when the Zen window closes
-            on_close = function()
-            end,
-        }
-    }
-}
-})

nvim/lua/trianta/remap.lua

@@ -1,2 +0,0 @@
-vim.g.mapleader = " "
-vim.keymap.set("n", "<leader>pv", vim.cmd.Ex)

nvim/lua/trianta/set.lua

@@ -1,26 +0,0 @@
-vim.opt.nu = true
-
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-vim.opt.expandtab = true
-
-vim.opt.smartindent = true
-
-vim.opt.wrap = true
-
-vim.opt.hlsearch = false
-vim.opt.incsearch = true
-
-vim.opt.termguicolors = true
-
-vim.opt.scrolloff = 8
-vim.opt.signcolumn = "yes"
-
-vim.opt.updatetime = 50
-
-vim.opt.colorcolumn = "80"
-
-vim.g.mapleader = " "
-
-vim.opt.mouse = ""

tmux/tmux.conf

@@ -1,12 +0,0 @@
-# Start panels at 1
-set -g base-index 1
-set -g pane-base-index 1
-set-window-option -g pane-base-index 1
-set-option -g renumber-windows on
-
-# Plugins
-set -g @plugin 'catppuccin/tmux'
-set -g @catppuccin_flavour 'mocha' # or frappe, latte, mocha
-set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'tmux-plugins/tmux-sensible'
-run '/usr/share/tmux-plugin-manager/tpm'

update.sh

@@ -1,13 +1,12 @@
 #!/bin/bash
 
 echo "Syncing dotfiles with alacritty..."
-rsync --recursive ~/.config/alacritty $(dirname "$0")
+rsync --delete --recursive ~/.config/alacritty $(dirname "$0")
+
 echo "Syncing dotfiles with hypr..."
-rsync --recursive ~/.config/hypr $(dirname "$0")
-echo "Syncing dotfiles with nvim..."
-rsync --recursive ~/.config/nvim $(dirname "$0")
-echo "Syncing dotfiles with tmux..."
-rsync ~/.config/tmux/tmux.conf $(dirname "$0")/tmux/tmux.conf
+rsync --delete --recursive ~/.config/hypr $(dirname "$0")
+
 echo "Syncing dotfiles with waybar..."
-rsync --recursive ~/.config/waybar $(dirname "$0")
+rsync --delete --recursive ~/.config/waybar $(dirname "$0")
+
 echo "Syncing complete!"

waybar/config

@@ -1,41 +1,53 @@
 [
     {
         "name": "main",
-        "layer": "top",
+        "layer": "bottom",
         "position": "top",
-        "height": 34,
-        "spacing": 4,
-        "margin-top": 10,
-        "margin-bottom": 0,
-        "output": "DP-2",
+        "height": 40,
+        "spacing": 0,
+        "output": "eDP-1",
+        "reload_style_on_change": true,
         "modules-left": [
-            "wireplumber", 
+            "custom/appmenu",
             "disk", 
             "memory", 
             "cpu", 
+            "custom/gpu",
             "temperature"
         ],
-        "modules-center": ["wlr/taskbar"],
+        "modules-center": [
+            "hyprland/workspaces"
+        ],
         "modules-right": [
-            "hyprland/workspaces",
             "tray", 
-            "custom/weather", 
-            "network#ethernet", 
+            "wireplumber", 
+            "network#wifi", 
             "clock",
             "custom/poweroff"
         ],
+        "battery": {
+            "interval": 20,
+            "states": {
+                "warning": 30,
+                "critical": 15
+            },
+            "format": "{icon} {capacity}%",
+            "format-icons": [" ", " ", " ", " ", " "],
+            "max-length": 25
+        },
         "clock": {
             "interval": 1,
-            "format": "<b>{:%H:%M:%S}</b>",
+            "format": "<b>{:%I:%M:%S %p}</b>",
             "format-alt": "{:%Y-%m-%d}",
             "tooltip-format": "<big>{:%Y %B}</big>\n<tt><small>{calendar}</small></tt>"
         },
         "cpu": {
             "format": " {usage}%",
+            "interval": 5,
             "tooltip": false
         },
         "disk": {
-            "format": " {}%",
+            "format": " {percentage_used}%",
             "tooltip-format": "{used} / {total} used"
         },
         "idle_inhibitor": {
@@ -50,45 +62,46 @@
             "tooltip-format": "{used:0.1f}G / {total:0.1f}G used"
         },
         "temperature": {
-            "critical-threshold": 80,
-            "format": " {icon} {temperatureC}°C  ",
+            "format": "{icon} {temperatureC}°C ",
             "format-icons": ["", "", "", "", ""],
-            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp"
+            "hwmon-path": "/sys/class/thermal/thermal_zone2/temp",
+            "critical-threshold": 80,
+            "interval": 5
         },
-        "network#ethernet": {
-            "interface": "enp*",
-            "format-ethernet": "",
-            "format-wifi": "",
-            "format-linked": "",
-            "format-disconnected": "",
-            "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-            "on-click": "nm-connection-editor"
+        "temperature": {
+            "critical-threshold": 80,
+            "format": "{icon} {temperatureC}°C",
+            "format-icons": ["", "", "", "", ""],
+            "hwmon-path": "/sys/class/hwmon/hwmon4/temp1_input"
+        },
+        "network#wifi": {
+            "interface": "wlo1",
+            "format-wifi": "󰣺 {signalStrength}%",
+            "format-disconnected": "󰣽",
+            "tooltip-format": "{ifname}: {ipaddr}/{cidr}"
         },
         "sway/mode": {
             "format": "<span style=\"italic\">{}</span>"
         },
         "hyprland/workspaces": {
-            "format": "{name}",
+            "format": "{icon}",
             "sort-by-number": true,
-            "all-outputs": true
-        },
-        "wlr/taskbar": {
-            "format": "{name}",
-            "icon-size": 32,
-            "tooltip": false,
-            "on-click": "activate",
-            "on-click-right": "close",
             "all-outputs": true,
-            "ignore-list": [
-                "xwaylandvideobridge"
-            ],
-            "rewrite": {
-                "(.*)Firefox Web Browser": "",
-                "(.*)Discord": "",
-                "(.*)Alacritty": "",
-                "Steam(.*)": "",
-                "(.*)Spotify": ""
+            "disable-scroll": true,
+            "active-only": false,
+            "format-icons": {
+                "active": "",
+                "default": "",
+                "persistent": "",
+            },
+            "persistent-workspaces": {
+                "1": [ ],
+                "2": [ ],
+                "3": [ ],
+                "4": [ ],
+                "5": [ ]
             }
+
         },
         "wireplumber": {
             "format": " {volume}%",
@@ -102,24 +115,15 @@
             "icon-size": 21,
             "spacing": 10
         },
-        "custom/spotify": {
-            "interval": 1,
-            "return-type": "json",
-            "exec": "~/.config/waybar/scripts/spotify.sh",
-            "exec-if": "pgrep spotify",
-            "escape": true
+        "custom/appmenu": {
+            "format": "",
+            "on-click": "pkill -x rofi || rofi -show drun"
         },
         "custom/poweroff": {
             "tooltip": false,
             "format": " ",
-            "on-click": "bash $HOME/.config/waybar/scripts/poweroff.sh"
+            "on-click": "pgrep poweroff.sh || $HOME/.config/waybar/scripts/poweroff.sh"
         },
-        "custom/weather": {
-            "exec": "$HOME/.config/waybar/scripts/get_weather.sh Belleville+Illinois",
-            "return-type": "json",
-            "format": "{}",
-            "tooltip": true,
-            "interval": 3600
-        }
     }
 ]
+

waybar/frappe.css

@@ -0,0 +1,37 @@
+/*
+*
+* Catppuccin Frappe palette
+* Maintainer: rubyowo
+*
+*/
+
+@define-color base   #303446;
+@define-color mantle #292c3c;
+@define-color crust  #232634;
+
+@define-color text     #c6d0f5;
+@define-color subtext0 #a5adce;
+@define-color subtext1 #b5bfe2;
+
+@define-color surface0 #414559;
+@define-color surface1 #51576d;
+@define-color surface2 #626880;
+
+@define-color overlay0 #737994;
+@define-color overlay1 #838ba7;
+@define-color overlay2 #949cbb;
+
+@define-color blue      #8caaee;
+@define-color lavender  #babbf1;
+@define-color sapphire  #85c1dc;
+@define-color sky       #99d1db;
+@define-color teal      #81c8be;
+@define-color green     #a6d189;
+@define-color yellow    #e5c890;
+@define-color peach     #ef9f76;
+@define-color maroon    #ea999c;
+@define-color red       #e78284;
+@define-color mauve     #ca9ee6;
+@define-color pink      #f4b8e4;
+@define-color flamingo  #eebebe;
+@define-color rosewater #f2d5cf;

waybar/mocha.css

@@ -1,37 +0,0 @@
-/*
-*
-* Catppuccin Mocha palette
-* Maintainer: rubyowo
-*
-*/
-
-@define-color base   #1e1e2e;
-@define-color mantle #181825;
-@define-color crust  #11111b;
-
-@define-color text     #cdd6f4;
-@define-color subtext0 #a6adc8;
-@define-color subtext1 #bac2de;
-
-@define-color surface0 #313244;
-@define-color surface1 #45475a;
-@define-color surface2 #585b70;
-
-@define-color overlay0 #6c7086;
-@define-color overlay1 #7f849c;
-@define-color overlay2 #9399b2;
-
-@define-color blue      #89b4fa;
-@define-color lavender  #b4befe;
-@define-color sapphire  #74c7ec;
-@define-color sky       #89dceb;
-@define-color teal      #94e2d5;
-@define-color green     #a6e3a1;
-@define-color yellow    #f9e2af;
-@define-color peach     #fab387;
-@define-color maroon    #eba0ac;
-@define-color red       #f38ba8;
-@define-color mauve     #cba6f7;
-@define-color pink      #f5c2e7;
-@define-color flamingo  #f2cdcd;
-@define-color rosewater #f5e0dc;

waybar/style.css

@@ -1,92 +1,84 @@
-@import "mocha.css";
+@import "frappe.css";
 
 * {
     border: none;
     border-radius: 0px;
     min-height: 0;
-	font-size: 15px;
+    font-weight: bold;
+	font-size: 14px;
 	font-family: "Hack Nerd Font";
-    /*background: @base;*/
 }
 
 window#waybar {
-    background-color: transparent;
-	color: #ffffff;
-    transition-property: background-color;
-    transition-duration: .5s;
-}
-
-window#waybar.hidden {
-    opacity: 0.2;
+    background-color: alpha(@crust, 0.3);
+    border-radius: 0px;
+    border-bottom: 0px solid @overlay0;
 }
 
 #workspaces button {
-    border-radius: 20px;
+    color: @peach;
+    border-radius: 8px;
+    margin: 4px 2px;
+    padding: 0px 8px;
+    padding-right: 12px; /* why?? */
+    transition: all 0.4s ease;
 }
 
-#workspaces button:hover {
-    color: black;
-    border-bottom: 3px solid #ffffff;
+#workspaces button.active {
+    background-color: alpha(@peach, 0.2);
+    transition: all 0.4s ease;
 }
 
-#mode {
-    background-color: #64727D;
-    border-bottom: 3px solid #ffffff;
-}
-
-/* Sections */
-
 .modules-left,
 .modules-center,
 .modules-right {
-    border-radius: 20px;
-    border: 3px solid @crust;
-    padding: 0 10px;
+    padding-top: 0px;
+    padding-bottom: 0px;
+}
+
+.modules-left {
+    padding-left: 0px;
+}
+
+.modules-right {
+    padding-right: 0px;
 }
 
 #clock,
 #cpu,
 #disk,
 #memory,
-#network,
 #temperature,
-#taskbar,
 #tray,
-#workspaces,
 #wireplumber,
+#workspaces,
+#network,
+#custom-appmenu,
+#custom-gpu,
 #custom-poweroff,
-#custom-weather,
-#custom-spotify {
-	padding: 0 10px;
-}
-
-.modules-left {
-    background-image: linear-gradient(90deg, @base, @surface0, @surface2);
-}
-
-.modules-center {
-    background-image: linear-gradient(270deg, @base, @overlay2, @base);
-}
-
-.modules-right {
-    background-image: linear-gradient(270deg, @base, @surface0, @surface2);
-}
-
-#wireplumber{
-	color: @sapphire;
-}
-#disk {
+#custom-weather {
+    background-color: transparent;
+    border-radius: 10px;
+    border: ;
+    margin-left: 6px;
+    margin-right: 6px;
     color: @peach;
+    min-width: 45px;
 }
-#memory {
-	color: @teal;
+
+#network {
+    margin: 0px;
+    padding: 0px;
 }
-#cpu {
-	color: @lavender;
+
+#custom-appmenu,
+#workspaces label,
+#network {
+    font-size: 14px;
 }
-#temperature {
-    color: @sky;
-}
-#taskbar button {
-    color: @rosewater;
+
+
+#clock {
+    min-width: 80px;
 }
+