diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index 839cf0d..07e0389 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -48,10 +48,8 @@ $menu = wofi --show drun
# exec-once = nm-applet &
# exec-once = waybar & hyprpaper & firefox
exec-once = /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
-exec-once = ulauncher --no-window
-exec-once = discord
exec-once = flatpak run com.core447.StreamController
-exec-once = waybar
+exec-once = waybar & discord & ulauncher-toggle & openfortigui
# Source a file (multi-file configs)
@@ -199,11 +197,11 @@ device {
# See https://wiki.hyprland.org/Configuring/Keywords/
$mainMod = SUPER # Sets "Windows" key as main modifier
-bind = CTRL ALT, T, exec, gnome-terminal
+bind = CTRL ALT, T, exec, kitty
bind = , XF86Calculator, exec, gnome-calculator
-bind = SUPER, space, exec, ulauncher-toggle
-bind =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bind =, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bind = SUPER, space, exec, ~/.config/rofi/launchers/type-2/launcher.sh
+binde =, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+binde =, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
bind =, XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
# Screenshots
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
index 1a20dfc..4a51c8c 100644
--- a/.config/hypr/hyprlock.conf
+++ b/.config/hypr/hyprlock.conf
@@ -14,6 +14,7 @@ general {
background {
monitor =
path = ~/.config/background
+ color: $base
blur_passes = 0
color = $base
}
diff --git a/.config/rofi/applets/bin/volume.sh b/.config/rofi/applets/bin/volume.sh
index a194592..e006377 100755
--- a/.config/rofi/applets/bin/volume.sh
+++ b/.config/rofi/applets/bin/volume.sh
@@ -10,7 +10,7 @@ source "$HOME"/.config/rofi/applets/shared/theme.bash
theme="$type/$style"
# Volume Info
-mixer="`amixer info Master | grep 'Mixer name' | cut -d':' -f2 | tr -d \',' '`"
+mixer="`pamixer --get-volume`"
speaker="`amixer get Master | tail -n1 | awk -F ' ' '{print $5}' | tr -d '[]'`"
mic="`amixer get Capture | tail -n1 | awk -F ' ' '{print $5}' | tr -d '[]'`"
@@ -18,7 +18,7 @@ active=""
urgent=""
# Speaker Info
-amixer get Master | grep '\[on\]' &>/dev/null
+pamixer --get-mute | grep 'false' &>/dev/null
if [[ "$?" == 0 ]]; then
active="-a 1"
stext='Unmute'
@@ -30,7 +30,7 @@ else
fi
# Microphone Info
-amixer get Capture | grep '\[on\]' &>/dev/null
+pamixer --source 70 --get-mute | grep 'false' &>/dev/null
if [[ "$?" == 0 ]]; then
[ -n "$active" ] && active+=",3" || active="-a 3"
mtext='Unmute'
@@ -100,15 +100,15 @@ run_rofi() {
# Execute Command
run_cmd() {
if [[ "$1" == '--opt1' ]]; then
- amixer -Mq set Master,0 5%+ unmute
+ pamixer --increase 5
elif [[ "$1" == '--opt2' ]]; then
- amixer set Master toggle
+ pamixer --toggle-mute
elif [[ "$1" == '--opt3' ]]; then
- amixer -Mq set Master,0 5%- unmute
+ pamixer --decrease 5
elif [[ "$1" == '--opt4' ]]; then
- amixer set Capture toggle
+ pamixer --source 70 --toggle-mute
elif [[ "$1" == '--opt5' ]]; then
- pavucontrol
+ pavucontrol-qt
fi
}
diff --git a/.config/rofi/applets/shared/colors.rasi b/.config/rofi/applets/shared/colors.rasi
index 103ad63..8dc3385 100644
--- a/.config/rofi/applets/shared/colors.rasi
+++ b/.config/rofi/applets/shared/colors.rasi
@@ -15,4 +15,4 @@
/* Import color-scheme from `colors` directory */
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "~/.config/rofi/colors/catppuccin.rasi"
diff --git a/.config/rofi/applets/shared/theme.bash b/.config/rofi/applets/shared/theme.bash
index 4807020..bb31ed9 100755
--- a/.config/rofi/applets/shared/theme.bash
+++ b/.config/rofi/applets/shared/theme.bash
@@ -1,4 +1,4 @@
## Current Theme
-type="$HOME/.config/rofi/applets/type-1"
-style='style-1.rasi'
+type="$HOME/.config/rofi/applets/type-3"
+style='style-3.rasi'
diff --git a/.config/rofi/applets/type-3/style-3.rasi b/.config/rofi/applets/type-3/style-3.rasi
index 06f365f..3e96b43 100644
--- a/.config/rofi/applets/type-3/style-3.rasi
+++ b/.config/rofi/applets/type-3/style-3.rasi
@@ -23,16 +23,16 @@ USE_ICON=YES
/*****----- Main Window -----*****/
window {
transparency: "real";
- location: east;
- anchor: east;
+ location: north East;
+ anchor: North East;
fullscreen: false;
width: 120px;
- x-offset: -20px;
- y-offset: 0px;
+ x-offset: -240px;
+ y-offset: 10px;
margin: 0px;
padding: 0px;
- border: 0px solid;
- border-radius: 100%;
+ border: 2px;
+ border-radius: 20px;
border-color: @selected;
cursor: "default";
background-color: @background;
diff --git a/.config/rofi/colors/catppuccin.rasi b/.config/rofi/colors/catppuccin.rasi
index 62c5945..f2e45d6 100644
--- a/.config/rofi/colors/catppuccin.rasi
+++ b/.config/rofi/colors/catppuccin.rasi
@@ -7,10 +7,10 @@
**/
* {
- background: #1E1D2FFF;
- background-alt: #282839FF;
- foreground: #D9E0EEFF;
- selected: #7AA2F7FF;
- active: #ABE9B3FF;
- urgent: #F28FADFF;
+ background: #24273a;
+ background-alt: #1e2030;
+ foreground: #6c7086;
+ selected: #8aadf4;
+ active: #a6da95;
+ urgent: #ed8796;
}
diff --git a/.config/rofi/launchers/type-2/launcher.sh b/.config/rofi/launchers/type-2/launcher.sh
index 3422cd7..2e6411f 100755
--- a/.config/rofi/launchers/type-2/launcher.sh
+++ b/.config/rofi/launchers/type-2/launcher.sh
@@ -12,7 +12,7 @@
## style-11 style-12 style-13 style-14 style-15
dir="$HOME/.config/rofi/launchers/type-2"
-theme='style-1'
+theme='style-2'
## Run
rofi \
diff --git a/.config/rofi/launchers/type-2/shared/colors.rasi b/.config/rofi/launchers/type-2/shared/colors.rasi
index 103ad63..8dc3385 100644
--- a/.config/rofi/launchers/type-2/shared/colors.rasi
+++ b/.config/rofi/launchers/type-2/shared/colors.rasi
@@ -15,4 +15,4 @@
/* Import color-scheme from `colors` directory */
-@import "~/.config/rofi/colors/onedark.rasi"
+@import "~/.config/rofi/colors/catppuccin.rasi"
diff --git a/.config/rofi/launchers/type-2/style-2.rasi b/.config/rofi/launchers/type-2/style-2.rasi
index 49502a0..f4ef0e0 100644
--- a/.config/rofi/launchers/type-2/style-2.rasi
+++ b/.config/rofi/launchers/type-2/style-2.rasi
@@ -32,7 +32,7 @@ window {
enabled: true;
margin: 0px;
padding: 0px;
- border: 0px solid;
+ border: 2px;
border-radius: 12px;
border-color: @selected;
background-color: @background;
diff --git a/.config/rofi/launchers/type-2/style-6.rasi b/.config/rofi/launchers/type-2/style-6.rasi
index 2f0ab2b..5554a8e 100644
--- a/.config/rofi/launchers/type-2/style-6.rasi
+++ b/.config/rofi/launchers/type-2/style-6.rasi
@@ -33,8 +33,8 @@ window {
enabled: true;
margin: 0px;
padding: 0px;
- border: 0px solid;
- border-radius: 0px;
+ border: 2px;
+ border-radius: 10px;
border-color: @selected;
background-color: @background;
cursor: "default";
diff --git a/.config/rofi/powermenu/type-2/powermenu.sh b/.config/rofi/powermenu/type-2/powermenu.sh
index b71961a..5d9c1fd 100755
--- a/.config/rofi/powermenu/type-2/powermenu.sh
+++ b/.config/rofi/powermenu/type-2/powermenu.sh
@@ -12,7 +12,7 @@
# Current Theme
dir="$HOME/.config/rofi/powermenu/type-2"
-theme='style-2'
+theme='style-5'
# CMDs
uptime="`uptime -p | sed -e 's/up //g'`"
@@ -79,6 +79,8 @@ run_cmd() {
i3-msg exit
elif [[ "$DESKTOP_SESSION" == 'plasma' ]]; then
qdbus org.kde.ksmserver /KSMServer logout 0 0 0
+ elif [[ "$DESKTOP_SESSION" == 'hyprland' ]] then
+ hyprctl dispatch exit
fi
fi
else
@@ -100,6 +102,8 @@ case ${chosen} in
betterlockscreen -l
elif [[ -x '/usr/bin/i3lock' ]]; then
i3lock
+ elif [[ -x 'usr/bin/hyprlock' ]]; then
+ hyprlock
fi
;;
$suspend)
diff --git a/.config/rofi/powermenu/type-2/style-2.rasi b/.config/rofi/powermenu/type-2/style-2.rasi
index f64703e..b5932e7 100644
--- a/.config/rofi/powermenu/type-2/style-2.rasi
+++ b/.config/rofi/powermenu/type-2/style-2.rasi
@@ -35,7 +35,7 @@ window {
enabled: true;
margin: 0px;
padding: 0px;
- border: 0px solid;
+ border: 2px;
border-radius: 20px;
border-color: @selected;
cursor: "default";
diff --git a/.config/rofi/powermenu/type-2/style-5.rasi b/.config/rofi/powermenu/type-2/style-5.rasi
index 6caffaa..9060661 100644
--- a/.config/rofi/powermenu/type-2/style-5.rasi
+++ b/.config/rofi/powermenu/type-2/style-5.rasi
@@ -24,18 +24,18 @@ USE_BUTTONS=YES
window {
/* properties for window widget */
transparency: "real";
- location: west;
- anchor: west;
+ location: North East;
+ anchor: North East;
fullscreen: false;
width: 115px;
- x-offset: 15px;
- y-offset: 0px;
+ x-offset: -20px;
+ y-offset: 20px;
/* properties for all widgets */
enabled: true;
margin: 0px;
padding: 0px;
- border: 0px solid;
+ border: 2px;
border-radius: 12px;
border-color: @selected;
cursor: "default";
diff --git a/.config/ulauncher/icons/github.svg b/.config/ulauncher/icons/github.svg
deleted file mode 100644
index 79b6dd4..0000000
--- a/.config/ulauncher/icons/github.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-
diff --git a/.config/ulauncher/icons/gitlab.png b/.config/ulauncher/icons/gitlab.png
deleted file mode 100644
index 51ed9c5..0000000
Binary files a/.config/ulauncher/icons/gitlab.png and /dev/null differ
diff --git a/.config/ulauncher/icons/jwt.png b/.config/ulauncher/icons/jwt.png
deleted file mode 100644
index 743bcae..0000000
Binary files a/.config/ulauncher/icons/jwt.png and /dev/null differ
diff --git a/.config/ulauncher/icons/maps.png b/.config/ulauncher/icons/maps.png
deleted file mode 100644
index b42a2b8..0000000
Binary files a/.config/ulauncher/icons/maps.png and /dev/null differ
diff --git a/.config/ulauncher/icons/stack-overflow.png b/.config/ulauncher/icons/stack-overflow.png
deleted file mode 100644
index af11628..0000000
Binary files a/.config/ulauncher/icons/stack-overflow.png and /dev/null differ
diff --git a/.config/ulauncher/icons/trad.png b/.config/ulauncher/icons/trad.png
deleted file mode 100644
index 3e1f336..0000000
Binary files a/.config/ulauncher/icons/trad.png and /dev/null differ
diff --git a/.config/ulauncher/icons/vuetify.png b/.config/ulauncher/icons/vuetify.png
deleted file mode 100644
index 45c85b6..0000000
Binary files a/.config/ulauncher/icons/vuetify.png and /dev/null differ
diff --git a/.config/ulauncher/shortcuts.json b/.config/ulauncher/shortcuts.json
deleted file mode 100644
index 1115eb1..0000000
--- a/.config/ulauncher/shortcuts.json
+++ /dev/null
@@ -1,92 +0,0 @@
-{
- "9b80b7e5-47eb-49a7-8bac-c6fd3142a56f": {
- "id": "9b80b7e5-47eb-49a7-8bac-c6fd3142a56f",
- "name": "Google Search",
- "keyword": "g",
- "cmd": "https://google.com/search?q=%s",
- "icon": "/usr/share/ulauncher/media/google-search-icon.png",
- "is_default_search": true,
- "run_without_argument": false,
- "added": 1715682015.259564
- },
- "c8850e61-36dd-4a75-a8a9-dd8dceb8816b": {
- "id": "c8850e61-36dd-4a75-a8a9-dd8dceb8816b",
- "name": "Stack Overflow",
- "keyword": "so",
- "cmd": "http://stackoverflow.com/search?q=%s",
- "icon": "/usr/share/ulauncher/media/stackoverflow-icon.svg",
- "is_default_search": true,
- "run_without_argument": false,
- "added": 1715682015.2595758
- },
- "3bb97c5d-c7e3-4634-b85b-e319a31509c2": {
- "id": "3bb97c5d-c7e3-4634-b85b-e319a31509c2",
- "name": "Wikipedia",
- "keyword": "wiki",
- "cmd": "https://en.wikipedia.org/wiki/%s",
- "icon": "/usr/share/ulauncher/media/wikipedia-icon.png",
- "is_default_search": true,
- "run_without_argument": false,
- "added": 1715682015.2595844
- },
- "b8e8c706-9baa-4edd-90c3-48ab6944af9a": {
- "id": "b8e8c706-9baa-4edd-90c3-48ab6944af9a",
- "name": "JWT",
- "keyword": "jwt",
- "cmd": "https://jwt.io/?value=%s",
- "icon": "~/.config/ulauncher/icons/jwt.png",
- "is_default_search": false,
- "run_without_argument": false,
- "added": 1716898874.1727827
- },
- "1b357b06-bb9a-4c05-b4dc-06233bfe2fb9": {
- "id": "1b357b06-bb9a-4c05-b4dc-06233bfe2fb9",
- "name": "Google Traduction",
- "keyword": "trad",
- "cmd": "https://translate.google.com/?source=osdd&sl=auto&tl=auto&text=%s&op=translate",
- "icon": "~/.config/ulauncher/icons/trad.png",
- "is_default_search": false,
- "run_without_argument": false,
- "added": 1716899083.7887938
- },
- "371c5245-1024-4ffc-b73d-aba9aa344301": {
- "id": "371c5245-1024-4ffc-b73d-aba9aa344301",
- "name": "Github",
- "keyword": "gh",
- "cmd": "https://github.com/search?q=%s&type=repositories",
- "icon": "~/.config/ulauncher/icons/github.svg",
- "is_default_search": false,
- "run_without_argument": false,
- "added": 1716899164.2462764
- },
- "b1230a2c-f5e8-45e3-b483-5e01998b5b48": {
- "id": "b1230a2c-f5e8-45e3-b483-5e01998b5b48",
- "name": "GitLab",
- "keyword": "gitlab",
- "cmd": "https://gitlab.com/search?search=%s",
- "icon": "~/.config/ulauncher/icons/gitlab.png",
- "is_default_search": false,
- "run_without_argument": false,
- "added": 1716899189.6742277
- },
- "a075f00d-f362-48b0-bf4d-3e9415ae9638": {
- "id": "a075f00d-f362-48b0-bf4d-3e9415ae9638",
- "name": "Maps",
- "keyword": "maps",
- "cmd": "https://www.google.com/maps/search/%s/",
- "icon": "~/.config/ulauncher/icons/maps.png",
- "is_default_search": false,
- "run_without_argument": false,
- "added": 1716899213.7532995
- },
- "a92332f1-9fe5-4dc9-9ba0-e33a9b6581f9": {
- "id": "a92332f1-9fe5-4dc9-9ba0-e33a9b6581f9",
- "name": "Vuetify",
- "keyword": "vue",
- "cmd": "https://v2.vuetifyjs.com/?search=%s",
- "icon": "~/.config/ulauncher/icons/vuetify.png",
- "is_default_search": false,
- "run_without_argument": false,
- "added": 1716899258.0429287
- }
-}
\ No newline at end of file
diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc
index 408a6be..6fad802 100644
--- a/.config/waybar/config.jsonc
+++ b/.config/waybar/config.jsonc
@@ -30,8 +30,8 @@
"clock": {
"timezone": "Europe/Paris",
"tooltip-format": "{:%Y %B}\n{calendar}",
- "format-alt": " {:%d/%m/%Y}",
- "format": " {:%H:%M}"
+ "format-alt": " {:%d/%m/%Y}",
+ "format": " {:%H:%M}"
},
"pulseaudio": {
// "scroll-step": 1, // %, can be a float
@@ -40,7 +40,7 @@
"format-icons": {
"default": ["", "", " "]
},
- "on-click": "pavucontrol-qt"
+ "on-click": "~/.config/rofi/applets/bin/volume.sh"
},
"custom/tomato": {
"format": "{}",
@@ -52,7 +52,7 @@
},
"custom/lock": {
"tooltip": false,
- "on-click": "sh -c '(sleep 0.5s; swaylock --grace 0)' & disown",
+ "on-click": "hyprlock",
"format": "",
},
"custom/power": {
diff --git a/.config/waybar/style.css b/.config/waybar/style.css
index 0b8db26..b2d419d 100644
--- a/.config/waybar/style.css
+++ b/.config/waybar/style.css
@@ -1,8 +1,8 @@
@import "macchiato.css";
* {
- font-family: FantasqueSansM Nerd Font;
- font-size: 17px;
+ font-family: JetBrainsMono Nerd Font;
+ font-size: 16px;
min-height: 0;
}
@@ -17,6 +17,7 @@
margin: 5px;
background-color: @surface0;
margin-left: 1rem;
+ padding-right: 0.2rem;
}
#workspaces button {
@@ -74,12 +75,21 @@
color: @lavender;
}
+#custom-lock:hover {
+ color: @sapphire;
+}
+
#custom-power {
margin-right: 1rem;
+ padding-right: 1.2rem;
border-radius: 0px 1rem 1rem 0px;
color: @red;
}
+#custom-power:hover {
+ color: @peach;
+}
+
#tray {
margin-right: 1rem;
border-radius: 1rem;
diff --git a/.zshrc b/.zshrc
index 5b29935..755e78f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -117,6 +117,7 @@ alias vim=nvim
alias devbox_db="cd /home/thomas/workspace/mylab-dev-docker && make importDB"
alias devbox_bash="cd /home/thomas/workspace/mylab-dev-docker && make bash"
alias devbox_boot="cd /home/thomas/workspace/mylab-dev-docker && make up"
+alias ssh="kitty +kitten ssh"
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh