updated some stuff

.gitignore

@@ -12,7 +12,6 @@
 !mimeapps.list
 !fuzzel/
 !fish/
-fish/fish_variables
 !packages
 !brave-flags.conf
 !chromium-flags.conf
@@ -21,3 +20,6 @@ fish/fish_variables
 !rice-2.png
 !rice-3.png
 !btop
+!wireplumber/
+!systemd/
+fish/fish_variables

btop/btop.conf

@@ -1,4 +1,4 @@
-#? Config file for btop v. 1.4.4
+#? Config file for btop v. 1.4.5
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
@@ -115,6 +115,9 @@ cpu_bottom = False
 #* Shows the system uptime in the CPU box.
 show_uptime = True
 
+#* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
+show_cpu_watts = True
+
 #* Show cpu temperature.
 check_temp = True
 

hypr/modules/autostart.conf

@@ -9,7 +9,7 @@ exec-once = uwsm app -- nm-applet --indicator
 exec-once = uwsm app -- protonvpn-app
 exec-once = uwsm app -- hyprpaper
 # exec-once = uwsm app -- /usr/bin/discord --enable-features=UseOzonePlatform --ozone-platform=wayland --start-minimized &> /dev/null
-exec-once = sleep 5 && ~/.config/hypr/scripts/replay-ctrl.sh start
+# exec-once = sleep 5 && ~/.config/hypr/scripts/replay-ctrl.sh start
 # exec-once = uwsm app -- /usr/lib/xdg-desktop-portal-hyprland
 exec-once = wl-paste --type text --watch cliphist store # Stores only text data
 exec-once = wl-paste --type image --watch cliphist store # Stores only image data

hypr/modules/env.conf

@@ -6,9 +6,9 @@ env = HYPRCURSOR_SIZE,24
 env = XCURSOR_SIZE,24
 env = XCURSOR_THEME,Bibata-Modern-Classic
 env = XDG_CURRENT_DESKTOP,Hyprland
-env = debug:full_cm_proto,true
+# env = debug:full_cm_proto,true
 env = QT_QPA_PLATFORMTHEME,qt6ct
-env = LIBVA_DRIVER_NAME,radeonsi
-env = VDPAU_DRIVER,radeonsi
+# env = LIBVA_DRIVER_NAME,radeonsi
+# env = VDPAU_DRIVER,radeonsi
 env = MOZ_ENABLE_WAYLAND,1
 env = ELECTRON_OZONE_PLATFORM_HINT,wayland

hypr/modules/input.conf

@@ -2,11 +2,12 @@
 # https://wiki.hyprland.org/Configuring/Variables/#input
 input {
     kb_layout = us
-    # kb_variant = dvorak-intl, intl
-    kb_variant = intl
+    kb_variant = dvorak-intl, intl
+    # kb_variant = intl
     kb_model =
     kb_options =
     kb_rules =
+	kb_options = ctrl:nocaps
 
     follow_mouse = 0
 

hypr/modules/keybinds.conf

@@ -60,8 +60,10 @@ bind = ALT, Tab, changegroupactive, next
 
 
 # Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
+bind = $mainMod, S, togglespecialworkspace, virtual
+bind = $mainMod SHIFT, S, movetoworkspace, special:virtual
+bind = $mainMod, D, togglespecialworkspace, discord
+bind = $mainMod SHIFT, D, movetoworkspace, special:discord
 
 # Scroll through existing workspaces with mainMod + scroll
 bind = $mainMod, mouse_down, workspace, e+1

hypr/modules/monitors.conf

@@ -1,10 +1,5 @@
 
-monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@240, 0x0, 1
-# monitorv2 {
-# 	desc = Samsung Electric Company LC27G7xT H4ZRA00734
-# 	mode = 2560x1440@240
-# 	position = 0x0
-# 	scale = 1
-# 	bitdepth = 10
-# 	cm = wide
-# }
+# monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 2560x1440@144, 0x0, 1
+monitor = desc:Samsung Electric Company LC27G7xT H4ZRA00734, 1920x1080@144, 0x-1080, 1
+monitor = eDP-1, 1920x1080@60, 0x0, 1
+monitor = desc:Ancor Communications Inc VN279 E6LMQS072137, 1920x1080@60, 0x-1080, 1

hypr/modules/window_rules.conf

@@ -17,6 +17,8 @@ windowrulev2=float,title:^(Open File)$
 windowrulev2=float,title:^(Select a File)$
 windowrulev2=float,title:^(Select Folder)$
 windowrulev2=float,title:^(Choose a file)$
+windowrulev2=float,title:^(Open Workspace)$
+windowrulev2=float,title:^(Choose Directory)$
 windowrulev2=float,title:^(Save As)$
 windowrulev2=float,title:^(Save File)$
 windowrulev2=float,title:^(branchdialog)$
@@ -29,6 +31,8 @@ windowrulev2=float,class:^(pavucontrol|blueman-manager|nm-connection-editor)$
 windowrulev2=size 800 600,title:^(Open File)$
 windowrulev2=size 800 600,title:^(Select a File)$
 windowrulev2=size 800 600,title:^(Choose a file)$
+windowrulev2=size 800 600,title:^(Open Workspace)$
+windowrulev2=size 800 600,title:^(Choose Directory)$
 windowrulev2=size 800 600,title:^(Save As)$
 windowrulev2=size 800 600,title:^(Save File)$
 windowrulev2=size 800 600,title:^(branchdialog)$
@@ -39,6 +43,8 @@ windowrulev2=size 800 600,class:^(pavucontrol|blueman-manager|nm-connection-edit
 windowrulev2=center,title:^(Open File)$
 windowrulev2=center,title:^(Select a File)$
 windowrulev2=center,title:^(Choose a file)$
+windowrulev2=center,title:^(Open Workspace)$
+windowrulev2=center,title:^(Choose Directory)$
 windowrulev2=center,title:^(Save As)$
 windowrulev2=center,title:^(Save File)$
 windowrulev2=center,title:^(branchdialog)$
@@ -49,6 +55,8 @@ windowrulev2=center,class:^(pavucontrol|blueman-manager|nm-connection-editor)$
 windowrulev2=noblur,title:^(Open File)$
 windowrulev2=noblur,title:^(Select a File)$
 windowrulev2=noblur,title:^(Choose a file)$
+windowrulev2=noblur,title:^(Open Workspace)$
+windowrulev2=noblur,title:^(Choose Directory)$
 windowrulev2=noblur,title:^(Save As)$
 windowrulev2=noblur,title:^(Save File)$
 windowrulev2=noblur,title:^(branchdialog)$
@@ -63,9 +71,9 @@ windowrulev2=noblur,class:^(pavucontrol|blueman-manager|nm-connection-editor)$
 # windowrule=workspace 3,class:^(Code)$
 
 
-windowrulev2=workspace special:magic silent,class:^(Spotify)$
-windowrulev2=workspace special:magic silent,class:^(spotify)$
-windowrulev2=workspace special:magic silent,class:^(discord|vesktop)$
+windowrulev2=workspace special:virtual ,class:^(Spotify)$
+windowrulev2=workspace special:virtual ,class:^(spotify)$
+windowrulev2=workspace special:discord ,class:^(discord|vesktop)$
 
 # steam rules
 

mimeapps.list

@@ -2,8 +2,24 @@
 application/pdf=org.pwmt.zathura-pdf-poppler.desktop
 image/jpeg=feh.desktop
 image/png=feh.desktop
+x-scheme-handler/http=zen.desktop
+x-scheme-handler/https=zen.desktop
+x-scheme-handler/chrome=zen.desktop
+text/html=zen.desktop
+application/x-extension-htm=zen.desktop
+application/x-extension-html=zen.desktop
+application/x-extension-shtml=zen.desktop
+application/xhtml+xml=zen.desktop
+application/x-extension-xhtml=zen.desktop
+application/x-extension-xht=zen.desktop
+x-scheme-handler/about=google-chrome.desktop
+x-scheme-handler/unknown=google-chrome.desktop
 
 [Added Associations]
 application/pdf=org.pwmt.zathura-pdf-poppler.desktop;
 image/jpeg=feh.desktop;
 image/png=feh.desktop;
+x-scheme-handler/http=zen.desktop;
+x-scheme-handler/https=zen.desktop;
+text/html=zen.desktop;
+x-scheme-handler/chrome=zen.desktop;

systemd/user/default.target.wants/gcr-ssh-agent.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/gcr-ssh-agent.service

systemd/user/default.target.wants/gdrive-mount.service

@@ -0,0 +1 @@
+/home/narl/.config/systemd/user/gdrive-mount.service

systemd/user/default.target.wants/pipewire-pulse.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/pipewire-pulse.service

systemd/user/default.target.wants/pipewire.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/pipewire.service

systemd/user/gdrive-mount.service

@@ -0,0 +1,24 @@
+# ~/.config/systemd/user/rclone-mount.service
+
+[Unit]
+Description=Rclone Mount for google drive
+# This ensures your network is ready before it tries to mount
+After=network-online.target
+
+[Service]
+# The command to start the mount.
+# Replace "my-remote:" and "/path/to/local/mount" accordingly.
+# The flags below are highly recommended for a good experience.
+ExecStart=rclone mount google_drive: %h/gdrive \
+  --vfs-cache-mode writes \
+  --log-file /tmp/rclone.log \
+  --log-level INFO
+
+# The command to unmount gracefully.
+ExecStop=fusermount -u %h/gdrive
+Restart=on-failure
+RestartSec=10
+
+[Install]
+# This tells systemd to start the service at user login.
+WantedBy=default.target

systemd/user/graphical-session.target.wants/hyprpaper.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/hyprpaper.service

systemd/user/graphical-session.target.wants/hyprpolkitagent.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/hyprpolkitagent.service

systemd/user/graphical-session.target.wants/waybar.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/waybar.service

systemd/user/multi-user.target.wants/wayvnc.service

@@ -0,0 +1 @@
+/usr/lib/systemd/user/wayvnc.service

systemd/user/sockets.target.wants/gcr-ssh-agent.socket

@@ -0,0 +1 @@
+/usr/lib/systemd/user/gcr-ssh-agent.socket

systemd/user/sockets.target.wants/pipewire-pulse.socket

@@ -0,0 +1 @@
+/usr/lib/systemd/user/pipewire-pulse.socket

systemd/user/sockets.target.wants/pipewire.socket

@@ -0,0 +1 @@
+/usr/lib/systemd/user/pipewire.socket

systemd/user/ssh-agent.service

@@ -0,0 +1,10 @@
+[Unit]
+Description=SSH key agent
+
+[Service]
+Type=forking
+Environment=SSH_AUTH_SOCK=%t/ssh-agent.socket
+ExecStart=/usr/bin/ssh-agent -a $SSH_AUTH_SOCK
+
+[Install]
+WantedBy=default.target

waybar/scripts/cpu_info.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 USAGE=$(mpstat 1 1 | awk '/Average:/ {print 100 - $12}')
-TEMP=$(cat /sys/class/hwmon/hwmon3/temp1_input)
+TEMP=$(cat /sys/class/hwmon/hwmon6/temp1_input)
 TEXT="$(printf "%.1f" $(echo "$USAGE"))% $(printf "%.1f" $(echo "scale=2; $TEMP"/1000 | bc -l))C"
 CPU=$(lscpu | grep 'Model name' | awk -F': ' '{print $2}' | sed 's/^[ \t]*//')
 # TOOLTIP=$(ps -eo %cpu,comm --sort=-%cpu | head -n 6 | sed '1d' | awk '{output = output sprintf("%.1f%%\t%s\\n", $1, $2)} END {printf "%s", output}')