diff --git a/bin/.bin/randwall b/bin/.bin/randwall
index e50779e..f8f1269 100755
--- a/bin/.bin/randwall
+++ b/bin/.bin/randwall
@@ -6,7 +6,11 @@ pkill feh
# Function to set wallpaper using swaybg on Sway
set_wallpaper_sway() {
- swaymsg -t get_outputs -r | jq -r ".[].name" | parallel 'swaybg -o {} -i $(find ~/Pictures/* -type f | shuf -n 1) &'
+ if [ "$(hostname)" == "main" ]; then
+ swaymsg -t get_outputs -r | jq -r ".[].name" | parallel 'swaybg -o {} -i $(find ~/Pictures/* -type f | shuf -n 1) &'
+ elif [ "$(hostname)" == "fw" ]; then
+ swaybg -m fill -i "/home/forbi/Pictures/nord-balloons.png"
+ fi
}
# Function to set wallpaper using swaybg on Hyprland
diff --git a/mise/.config/mise/config.toml b/mise/.config/mise/config.toml
index 095429f..348e3a3 100644
--- a/mise/.config/mise/config.toml
+++ b/mise/.config/mise/config.toml
@@ -4,7 +4,6 @@ nodejs = "16.14.0"
golang = "1.23.0"
flyctl = "0.1.64"
sops = "3.6.1"
-dotnet = "system"
java = "openjdk-17"
node = "20"
dotnet-core = "8.0.401"
@@ -41,13 +40,10 @@ not_found_auto_install = true # see MISE_NOT_FOUND_AUTO_INSTALL
task_output = "prefix" # see Tasks Runner for more information
paranoid = false # see MISE_PARANOID
-shorthands_file = '~/.config/mise/shorthands.toml' # path to the shorthands file, see `MISE_SHORTHANDS_FILE`
-disable_default_shorthands = false # disable the default shorthands, see `MISE_DISABLE_DEFAULT_SHORTHANDS`
-# disable_tools = ['node'] # disable specific tools, generally used to turn off core tools
-
env_file = '.env' # load env vars from a dotenv file, see `MISE_ENV_FILE`
experimental = true # enable experimental features
# configure messages displayed when entering directories with config files
status = { missing_tools = "if_other_versions_installed", show_env = false, show_tools = false }
+idiomatic_version_file_enable_tools = ["node"]
diff --git a/ssh/.ssh/config b/ssh/.ssh/config
index 0f41ec3..f64859b 100644
Binary files a/ssh/.ssh/config and b/ssh/.ssh/config differ
diff --git a/waybar/.config/waybar/common.jsonc b/waybar/.config/waybar/common.jsonc
index 2ea00a6..39dc9ee 100644
--- a/waybar/.config/waybar/common.jsonc
+++ b/waybar/.config/waybar/common.jsonc
@@ -6,7 +6,7 @@
"exclusive": true,
"passthrough": false,
"gtk-layer-shell": true,
- "height": 30,
+ "height": 5,
"margin-bottom": 0,
"margin-top": 5,
"margin-left": 10,
@@ -73,8 +73,9 @@
"",
""
],
- "on-scroll-up": "brightnessctl set 10%+",
- "on-scroll-down": "brightnessctl set 10%-",
+ "on-scroll-up": "brightnessctl set 1%+",
+ "on-scroll-down": "brightnessctl set 1%-",
+ "scroll-step": 0.2,
"min-length": 6
},
"battery": {
@@ -107,9 +108,7 @@
"format-muted": " Muted",
"on-click": "wpctl set-mute @DEFAULT_SINK@ toggle",
"on-click-right": "pavucontrol",
- "on-scroll-up": "wpctl set-volume -l 1 @DEFAULT_SINK@ 5%+",
- "on-scroll-down": "wpctl set-volume @DEFAULT_SINK@ 5%-",
- "scroll-step": 5,
+ "scroll-step": 0.5,
"format-icons": {
"headphone": "",
"hands-free": "",
diff --git a/waybar/.config/waybar/config.jsonc b/waybar/.config/waybar/config.jsonc
index b37f276..eac0854 100644
--- a/waybar/.config/waybar/config.jsonc
+++ b/waybar/.config/waybar/config.jsonc
@@ -1,66 +1,4 @@
[
- {
- "include": [
- "~/.config/waybar/common.jsonc"
- ],
- "modules-left": [
- "sway/workspaces"
- ],
- "modules-right": [
- "disk",
- "cpu",
- "memory"
- ],
- "output": [
- "DP-1"
- ],
- "cpu": {
- "interval": 10,
- "format": " {}%",
- "max-length": 10
- },
- "memory": {
- "interval": 30,
- "format": " {used:0.1f}/{total:0.1f} GiB"
- },
- "disk": {
- "interval": 30,
- "format": " {used}/{total}",
- "unit": "GiB",
- "path": "/home"
- }
- },
- {
- "include": [
- "~/.config/waybar/common.jsonc"
- ],
- "modules-left": [
- "sway/workspaces"
- ],
- "modules-center": [
- "custom/playerctl",
- "custom/playerlabel"
- ],
- "modules-right": [
- "custom/wf-recorder",
- "custom/randwall",
- "pulseaudio",
- "custom/vpn",
- "custom/notification",
- "tray",
- "clock"
- ],
- "output": [
- "HDMI-A-1"
- ],
- "custom/vpn": {
- "format": "{}",
- "return-type": "json",
- "interval": 1,
- "exec": "/home/forbi/.local/bin/vpn",
- "on-click": "/home/forbi/.local/bin/vpn toggle"
- }
- },
{
"include": [
"~/.config/waybar/common.jsonc"
diff --git a/waybar/.config/waybar/modules/common.jsonc b/waybar/.config/waybar/modules/common.jsonc
deleted file mode 100644
index c179f2c..0000000
--- a/waybar/.config/waybar/modules/common.jsonc
+++ /dev/null
@@ -1,167 +0,0 @@
-{
- "layer": "top",
- "position": "top",
- "margin": "5 0 0",
- "mod": "dock",
- "exclusive": true,
- "passthrough": false,
- "gtk-layer-shell": true,
- "height": 30,
- "margin-bottom": 0,
- "margin-top": 5,
- "margin-left": 10,
- "margin-right": 10,
- "battery": {
- "states": {
- "good": 95,
- "warning": 30,
- "critical": 15
- },
- "format": "{icon} {capacity}%",
- "format-charging": "{capacity}% ",
- "format-plugged": "{capacity}% ",
- "format-alt": "{icon} {time}",
- "format-icons": [
- "",
- "",
- "",
- "",
- ""
- ]
- },
- "memory": {
- "format": " {}%",
- "format-alt": " {used}/{total} GiB",
- "interval": 5
- },
- "cpu": {
- "format": " {usage}%",
- "format-alt": " {avg_frequency} GHz",
- "interval": 5
- },
- "disk": {
- "format": " {percentage_used}%",
- "format-alt": " {used}/{total} GiB",
- "interval": 5,
- "path": "/home"
- },
- "network": {
- "format-wifi": "",
- "format-ethernet": " {ifname}: Main",
- "format-linked": " {ifname} (No IP)",
- "format-disconnected": "",
- "format-alt": " {ifname}: {ipaddr}/{cidr}",
- "tooltip-format": "{essid}",
- "on-click-right": "nm-connection-editor"
- },
- "tray": {
- "icon-size": 16,
- "spacing": 5
- },
- "custom/randwall": {
- "format": "",
- "on-click": "$HOME/.bin/randwall",
- "on-click-right": "$HOME/.bin/randwall"
- },
- "custom/wf-recorder": {
- "format": "{}",
- "return-type": "json",
- "interval": 1,
- "exec": "$HOME/.bin/wlrecord.sh --status",
- "on-click": "$HOME/.bin/wlrecord.sh",
- "tooltip": true
- },
- "custom/notification": {
- "tooltip": false,
- "format": "{icon}",
- "format-icons": {
- "notification": "",
- "none": "",
- "dnd-notification": "",
- "dnd-none": "",
- "inhibited-notification": "",
- "inhibited-none": "",
- "dnd-inhibited-notification": "",
- "dnd-inhibited-none": ""
- },
- "return-type": "json",
- "exec-if": "which swaync-client",
- "exec": "swaync-client -swb",
- "on-click": "swaync-client -t -sw",
- "on-click-right": "swaync-client -d -sw",
- "escape": true
- },
- "hyprland/workspaces": {
- "disable-scroll": true,
- "format": "{icon}",
- "format-icons": {
- "1": "",
- "2": "",
- "3": "",
- "4": "",
- "7": "",
- "10": "",
- "urgent": "",
- "active": "",
- "default": ""
- }
- },
- "hyprland/window": {
- "format": "{}",
- "max-length": 50,
- "rewrite": {
- "(.*) - Mozilla Firefox": "🌎 $1",
- "(.*) - zsh": "> [$1]"
- }
- },
- "custom/playerctl": {
- "format": "{icon}",
- "return-type": "json",
- "max-length": 64,
- "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
- "on-click-middle": "playerctl play-pause",
- "on-click": "playerctl play-pause",
- "on-click-right": "playerctl play-pause",
- "format-icons": {
- "Playing": "",
- "Paused": ""
- }
- },
- "custom/playerlabel": {
- "format": "{}",
- "return-type": "json",
- "max-length": 48,
- "exec": "playerctl -a metadata --format '{\"text\": \"{{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"alt\": \"{{status}}\", \"class\": \"{{status}}\"}' -F",
- "on-click-middle": "playerctl play-pause",
- "on-click": "playerctl previous",
- "on-click-right": "playerctl next",
- "format-icons": {
- "Playing": " ",
- "Paused": " "
- }
- },
- "pulseaudio": {
- "ignored-sinks": [
- "Easy Effects Sink"
- ],
- "format": "{icon} {volume}%",
- "format-muted": "",
- "format-icons": {
- "default": [
- "",
- "",
- ""
- ]
- },
- "on-click-right": "pavucontrol",
- // "on-scroll-up": "pamixer --sink 77 -ui 5",
- // "on-scroll-down": "pamixer --sink 77 -ud 5",
- "on-click": "pactl set-sink-mute @DEFAULT_SINK@ toggle"
- },
- "clock": {
- "format": " {:%H:%M %d/%m}",
- "tooltip": "true",
- "tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": " {:%d/%m}"
- }
-}
diff --git a/waybar/.config/waybar/modules/top-dp.jsonc b/waybar/.config/waybar/modules/top-dp.jsonc
deleted file mode 100644
index 5a1abc6..0000000
--- a/waybar/.config/waybar/modules/top-dp.jsonc
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "output": [
- "DP-1"
- ],
- "position": "top",
- "layer": "top",
- "height": 18,
- "margin-top": 0,
- "margin-bottom": 0,
- "margin-left": 0,
- "margin-right": 0,
- "modules-left": [
- "hyprland/workspaces",
- "hyprland/window"
- ],
- "modules-right": [
- "cpu",
- "memory",
- "disk"
- ]
-}
diff --git a/waybar/.config/waybar/modules/top-edp.jsonc b/waybar/.config/waybar/modules/top-edp.jsonc
deleted file mode 100644
index b123f45..0000000
--- a/waybar/.config/waybar/modules/top-edp.jsonc
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "output": [
- "eDP-1"
- ],
- "modules-left": [
- "hyprland/workspaces",
- "hyprland/window"
- ],
- "modules-center": [
- "custom/playerctl",
- "custom/playerlabel"
- ],
- "modules-right": [
- "custom/wf-recorder",
- "custom/randwall",
- "backlight",
- "battery",
- "network",
- "pulseaudio",
- "tray",
- "clock",
- "custom/notification"
- ]
-}
diff --git a/waybar/.config/waybar/modules/top-hdmi.jsonc b/waybar/.config/waybar/modules/top-hdmi.jsonc
deleted file mode 100644
index 1546d81..0000000
--- a/waybar/.config/waybar/modules/top-hdmi.jsonc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
- "output": [
- "HDMI-A-1"
- ],
- "modules-left": [
- "hyprland/workspaces",
- "hyprland/window",
- "hyprland/mode"
- ],
- "modules-center": [
- "custom/playerctl",
- "custom/playerlabel"
- ],
- "modules-right": [
- "custom/wf-recorder",
- "custom/randwall",
- "pulseaudio",
- "tray",
- "clock",
- "custom/notification"
- ]
-}
diff --git a/waybar/.config/waybar/style.css b/waybar/.config/waybar/style.css
index 6c046b6..773798d 100644
--- a/waybar/.config/waybar/style.css
+++ b/waybar/.config/waybar/style.css
@@ -22,16 +22,14 @@ tooltip {
/* Workspace Styles */
#workspaces {
- margin-left: -10px;
padding: 0 0 0 5px;
}
#workspaces button {
color: #fff;
- padding: 0;
border-radius: 10px;
- margin-left: 3px;
- transition: all 0.1s ease-in-out;
+ padding: 3px;
+ margin: 0 4px;
}
#workspaces button.urgent {
@@ -43,8 +41,6 @@ tooltip {
#workspaces button.focused {
background: #f4d9e1;
color: #282828;
- transition: all 0.3s ease-in-out;
- margin: 5px;
}
/* Common Module Styles */
@@ -62,7 +58,7 @@ tooltip {
#custom-vpn,
#custom-notification,
#backlight {
- padding: 0px 10px;
+ padding: 0px 5;
}
#cpu {