diff --git a/.config/albert/config b/.config/albert/config index 08f53c3..bb639a6 100644 --- a/.config/albert/config +++ b/.config/albert/config @@ -1,4 +1,5 @@ [General] +frontend=widgetsboxmodel hotkey=Alt+Space prioritizePerfectMatch=true showTray=false @@ -32,7 +33,6 @@ paths=@Invalid() [hash] enabled=true global_handler_enabled=true -trigger=# [mpris] enabled=true @@ -51,10 +51,29 @@ enabled=true enabled=true trigger=wiki +[python.color] +enabled=true + +[python.dice_roll] +enabled=false + +[python.docker] +enabled=false + [python.emoji] enabled=true +fuzzy=false global_handler_enabled=false +[python.pass] +enabled=false + +[python.pomodoro] +enabled=false + +[python.unit_converter] +enabled=false + [snippets] enabled=false @@ -71,6 +90,9 @@ trigger=sys [triggers] trigger=? +[vpn] +enabled=false + [widgetsboxmodel] alwaysOnTop=true clearOnHide=false diff --git a/.config/colors/hyprland.conf b/.config/colors/hyprland.conf new file mode 100644 index 0000000..e69de29 diff --git a/.config/colors/kitty.conf b/.config/colors/kitty.conf new file mode 100644 index 0000000..0d75685 --- /dev/null +++ b/.config/colors/kitty.conf @@ -0,0 +1,62 @@ +# vim:ft=kitty + +## name: 78 +## author: Gu://em_ (forked from Github Dark Dimmed) +## license: MIT + +#: The basic colors + +foreground #adbac7 +background #14171F +#background #111317 +selection_foreground #EE6C4D +selection_background #3D5A80 + + +#: Cursor colors + +cursor #adbac7 + + +#: Tab bar colors + +tab_bar_background #22272e +active_tab_foreground #adbac7 +active_tab_background #ec775c +inactive_tab_foreground #adbac7 +inactive_tab_background #1C2128 + + +#: The basic 16 colors + +#: black +color0 #545d68 +color8 #636e7b + +#: red +color1 #f47067 +color9 #ff938a + +#: green +color2 #57ab5a +color10 #6bc46d + +#: yellow +color3 #c69026 +color11 #daaa3f + +#: blue +color4 #539bf5 +color12 #6cb6ff + +#: magenta +color5 #b083f0 +color13 #dcbdfb + +#: cyan +color6 #39c5cf +color14 #56d4dd + +#: white +color7 #909dab +color15 #cdd9e5 diff --git a/.config/colors/swaync.css b/.config/colors/swaync.css new file mode 100644 index 0000000..d9bb2bd --- /dev/null +++ b/.config/colors/swaync.css @@ -0,0 +1,20 @@ +@define-color foreground #f5dbb0; +@define-color background #0C0D0F; +@define-color cursor #f5dbb0; + +@define-color color0 #0C0D0F; +@define-color color1 #9A6130; +@define-color color2 #95725E; +@define-color color3 #D68A38; +@define-color color4 #B48666; +@define-color color5 #D69B64; +@define-color color6 #F1B268; +@define-color color7 #f5dbb0; +@define-color color8 #ab997b; +@define-color color9 #FF0000; +@define-color color10 #95725E; +@define-color color11 #D68A38; +@define-color color12 #B48666; +@define-color color13 #D69B64; +@define-color color14 #F1B268; +@define-color color15 #f5dbb0; diff --git a/.config/colors/waybar.css b/.config/colors/waybar.css new file mode 100644 index 0000000..753ec3e --- /dev/null +++ b/.config/colors/waybar.css @@ -0,0 +1,7 @@ +@define-color foreground #e4e8ed; +@define-color background #18191c; + +/* @define-color accentColor #b6c8d3; */ +@define-color accentColor #ec775c; + +@define-color charging #6bc46d; \ No newline at end of file diff --git a/.config/hypr/config/appearance.conf b/.config/hypr/config/appearance.conf index a6eb319..1cde4b5 100644 --- a/.config/hypr/config/appearance.conf +++ b/.config/hypr/config/appearance.conf @@ -10,7 +10,7 @@ $inactive_color = rgba(595959aa) # https://wiki.hyprland.org/Configuring/Variables/#general general { gaps_in = 1 - gaps_out = 0 + gaps_out = 1 border_size = 1 @@ -46,7 +46,7 @@ decoration { blur { enabled = true size = 6 - passes = 3 + passes = 4 vibrancy = 0.1696 } @@ -170,5 +170,10 @@ windowrule=size 65% 70%, class:(org.prismlauncher.PrismLauncher), title:^(Prism # TODO Automatically fullscreen single apps # - Seems impossible for now (try mixing with workspace rules) +# Default size for floating windows +## TODO +#windowrulev2 = size 100 100,floating:1 + # Increase gaps for single apps -workspace=w[t1], gapsout:2 +## Usless since I changed the default gap but may be useful if you decide to reset it to 0 +#workspace=w[t1], gapsout:2 diff --git a/.config/hypr/config/environment.conf b/.config/hypr/config/environment.conf index 6dcda3d..13d0682 100644 --- a/.config/hypr/config/environment.conf +++ b/.config/hypr/config/environment.conf @@ -9,7 +9,7 @@ $terminal = kitty #$fileManager = cosmic-files $fileManager = nautilus $menu = albert toggle -$notificationsManager = swaync +$notificationManager = swaync-client -t ################# diff --git a/.config/hypr/config/input.conf b/.config/hypr/config/input.conf index 70cddc3..36248c9 100644 --- a/.config/hypr/config/input.conf +++ b/.config/hypr/config/input.conf @@ -54,6 +54,7 @@ bind = $mainMod, RETURN, exec, $terminal bind = $mainMod, X, exec, $terminal # Absolutely not because I dislocated my arm bind = $mainMod, SPACE, exec, $menu bind = $mainMod, E, exec, $fileManager +bind = $mainMod, A, exec, $notificationManager bindel = , XF86Launch1, exec, kitty vim ~/.config/hypr/config # Move focus with mainMod + arrow keys @@ -135,6 +136,10 @@ bindl = , XF86AudioPrev, exec, playerctl previous ## Screenshot bind = , Print, exec, ~/.config/hypr/scripts/screenshot.sh +bind = SHIFT, Print, exec, ~/.config/hypr/scripts/screenshot.sh --fullscreen + +# Color picker +bind = $mainMod SHIFT, C, exec, hyprpicker -a ## Touchpad toggle ### On galaxy books, pressing the disable touchpad key also triggers SUPER and @@ -147,4 +152,4 @@ bind = SUPER CONTROL, XF86TouchpadToggle, exec, ~/.config/hypr/scripts/toggle-to bind = $mainMod CONTROL, SPACE, exec, ~/.config/hypr/scripts/change-kb-layout.sh ## Testing -bind = $mainMod, TAB, overview:toggle, toggle +#bind = $mainMod, TAB, overview:toggle, toggle diff --git a/.config/hypr/config/monitors_default.conf b/.config/hypr/config/monitors/default.conf similarity index 100% rename from .config/hypr/config/monitors_default.conf rename to .config/hypr/config/monitors/default.conf diff --git a/.config/hypr/config/monitors/mirror.conf b/.config/hypr/config/monitors/mirror.conf new file mode 100644 index 0000000..66b3179 --- /dev/null +++ b/.config/hypr/config/monitors/mirror.conf @@ -0,0 +1,7 @@ +################ +### MONITORS ### +################ + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=eDP-1,preferred,0x0,1 # Laptop screen +monitor=,preferred,auto,1, mirror, eDP-1 diff --git a/.config/hypr/config/monitors/perso.conf b/.config/hypr/config/monitors/perso.conf new file mode 100644 index 0000000..bd5511c --- /dev/null +++ b/.config/hypr/config/monitors/perso.conf @@ -0,0 +1,10 @@ +################ +### MONITORS ### +################ + +# See https://wiki.hyprland.org/Configuring/Monitors/ +monitor=,preferred,auto,auto +monitor=eDP-1,preferred,0x0,1 # Laptop screen +monitor=DP-1, preferred, 0x-1080, 1 # HP Home monitor +monitor=DP-2, preferred, 0x-1080, 1 # HP Home monitor +monitor=HDMI-A-1, preferred, 0x-1440, 1 # Dell monitor diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index d3514d8..f697b0b 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -6,7 +6,7 @@ # For a full list, see the wiki #source = ~/.config/hypr/config/monitors_default.conf -source = ~/.config/hypr/config/monitors.conf +source = ~/.config/hypr/config/monitors/mirror.conf source = ~/.config/hypr/config/environment.conf source = ~/.config/hypr/config/input.conf source = ~/.config/hypr/config/kb_layouts/fr.conf diff --git a/.config/hypr/scripts/reload.sh b/.config/hypr/scripts/reload.sh index d323893..cf46ca4 100755 --- a/.config/hypr/scripts/reload.sh +++ b/.config/hypr/scripts/reload.sh @@ -1,6 +1,7 @@ killall albert killall hyprpaper killall waybar +killall swaync hyprctl reload diff --git a/.config/hypr/scripts/screenshot.sh b/.config/hypr/scripts/screenshot.sh index 741ecf2..50efb72 100755 --- a/.config/hypr/scripts/screenshot.sh +++ b/.config/hypr/scripts/screenshot.sh @@ -1 +1,13 @@ -grim -g "$(slurp)" $HOME/Pictures/Screenshots/$(date +'%F_%T.png') && hyprctl notify 1 2000 0 Screenshot saved! +save_path=$HOME/Pictures/Screenshots/$(date +'%F_%T.png') + +if [ $# -eq 0 ]; then + grim -g "$(slurp)" $save_path && hyprctl notify 1 2000 0 "Screenshot saved!" + +elif [ $# -eq 1 ]; then + + if [[ $1 == "--fullscreen" ]]; then + grim $save_path && hyprctl notify 1 2000 0 Screenshot saved! + fi +fi + +exit 0 diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index ab1a185..6f4dc79 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -10,7 +10,7 @@ bold_italic_font auto ## GitHub Dark # include github-dark.conf ## Seventy Eight -include seventy-eight.conf +include seventy-nine.conf ## Blurred background # background_opacity 0.6 diff --git a/.config/kitty/seventy-nine.conf b/.config/kitty/seventy-nine.conf new file mode 100644 index 0000000..0d75685 --- /dev/null +++ b/.config/kitty/seventy-nine.conf @@ -0,0 +1,62 @@ +# vim:ft=kitty + +## name: 78 +## author: Gu://em_ (forked from Github Dark Dimmed) +## license: MIT + +#: The basic colors + +foreground #adbac7 +background #14171F +#background #111317 +selection_foreground #EE6C4D +selection_background #3D5A80 + + +#: Cursor colors + +cursor #adbac7 + + +#: Tab bar colors + +tab_bar_background #22272e +active_tab_foreground #adbac7 +active_tab_background #ec775c +inactive_tab_foreground #adbac7 +inactive_tab_background #1C2128 + + +#: The basic 16 colors + +#: black +color0 #545d68 +color8 #636e7b + +#: red +color1 #f47067 +color9 #ff938a + +#: green +color2 #57ab5a +color10 #6bc46d + +#: yellow +color3 #c69026 +color11 #daaa3f + +#: blue +color4 #539bf5 +color12 #6cb6ff + +#: magenta +color5 #b083f0 +color13 #dcbdfb + +#: cyan +color6 #39c5cf +color14 #56d4dd + +#: white +color7 #909dab +color15 #cdd9e5 diff --git a/.config/swaync/colors.css b/.config/swaync/colors.css new file mode 100644 index 0000000..d9bb2bd --- /dev/null +++ b/.config/swaync/colors.css @@ -0,0 +1,20 @@ +@define-color foreground #f5dbb0; +@define-color background #0C0D0F; +@define-color cursor #f5dbb0; + +@define-color color0 #0C0D0F; +@define-color color1 #9A6130; +@define-color color2 #95725E; +@define-color color3 #D68A38; +@define-color color4 #B48666; +@define-color color5 #D69B64; +@define-color color6 #F1B268; +@define-color color7 #f5dbb0; +@define-color color8 #ab997b; +@define-color color9 #FF0000; +@define-color color10 #95725E; +@define-color color11 #D68A38; +@define-color color12 #B48666; +@define-color color13 #D69B64; +@define-color color14 #F1B268; +@define-color color15 #f5dbb0; diff --git a/.config/swaync/config.json b/.config/swaync/config.json new file mode 100644 index 0000000..f6e5463 --- /dev/null +++ b/.config/swaync/config.json @@ -0,0 +1,113 @@ +{ + "$schema": "/etc/xdg/swaync/configSchema.json", + "positionX": "right", + "positionY": "top", + "layer": "overlay", + "control-center-layer": "top", + "layer-shell": true, + "cssPriority": "application", + "control-center-width": 350, + "control-center-margin-top": 2, + "control-center-margin-bottom": 2, + "control-center-margin-right": 2, + "control-center-margin-left": 2, + "notification-2fa-action": true, + "notification-inline-replies": true, + "notification-window-width": 350, + "notification-icon-size": 60, + "notification-body-image-height": 180, + "notification-body-image-width": 180, + "timeout": 4, + "timeout-low": 2, + "timeout-critical": 0, + "fit-to-screen": true, + "keyboard-shortcuts": true, + "image-visibility": "when available", + "transition-time": 200, + "hide-on-clear": false, + "hide-on-action": true, + "script-fail-notify": true, + "widgets": [ + "title", + "notifications", + "mpris", + "volume", + "backlight", + "buttons-grid" + ], + "widget-config": { + "title": { + "text": "Notification Center", + "clear-all-button": true, + "button-text": "󰆴" + }, + "label": { + "max-lines":1, + "text": "Notification Center!" + }, + + "mpris": { + "image-size": 80, + "image-radius": 0 + }, + "volume": { + "label": "󰕾 " + }, + "backlight": { + "label": "󰃟 " + }, + "buttons-grid": { + "actions": [ + { + "label": "󰝟", + "command": "pactl set-sink-mute @DEFAULT_SINK@ toggle", + "type": "toggle" + }, + { + "label": "󰍭", + "command": "pactl set-source-mute @DEFAULT_SOURCE@ toggle", + "type": "toggle" + }, + + { + "label": "", + "command": "kitty nmtui" + }, + { + "label": "", + "command": "blueman-manager" + }, + { + "label":"󰤄", + "command": "swaync-client -d", + "type":"toggle" + }, + + { + "label": "", + "command": "kitty vim ~/.config/hypr" + + }, + { + "label": "", + "command": "kitty btop" + + }, + { + "label": "", + "command": "hyprlock" + }, + { + "label":"", + "command": "reboot" + }, + { + "label":"", + "command": "shutdown now" + } + + ] + } + } +} + diff --git a/.config/swaync/seventy-nine.css b/.config/swaync/seventy-nine.css new file mode 100644 index 0000000..b146ea4 --- /dev/null +++ b/.config/swaync/seventy-nine.css @@ -0,0 +1,7 @@ +@define-color active #ec775c; +@define-color background_dark #1c2128; +@define-color background_light #22272e; +@define-color background_transparent alpha(#18191c, 0.7); +@define-color foreground #e4e8ed; +@define-color border #444C56; +@define-color alert #ea4545; diff --git a/.config/swaync/style.css b/.config/swaync/style.css new file mode 100644 index 0000000..9cb80f3 --- /dev/null +++ b/.config/swaync/style.css @@ -0,0 +1,486 @@ +@import url('seventy-nine.css'); +@define-color control-background alpha(@background_dark, 0.7); + + +* { + all: unset; + font-family: JetBrainsMono Nerd Font; + transition: 0.1s; + font-size: 1.3rem; +} + + +/*--------------- Notifications ---------------*/ + + +.floating-notifications.background .notification-row { + padding: 0.5rem; +} + +.floating-notifications.background .notification-row .notification-background { + border-radius: 0.3rem; + background-color: @background_light; + color: @foreground; + border: 1px solid @border; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification { + padding: 0.6rem; + border-radius: 0.2rem; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification.critical { + border: 1px solid @alert; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification + .notification-content + .summary { + margin: 0.2rem; + color: @foreground; + font-weight: bold; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification + .notification-content + .body { + margin: 0.2rem; + color: @foreground; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification + > *:last-child + > * { + min-height: 3rem; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification + > *:last-child + > * + .notification-action { + border-radius: 0.2rem; + color: @foreground; + background-color: @background_dark; + border: 1px solid @border; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification + > *:last-child + > * + .notification-action:hover { + background-color: #26233a; +} + +.floating-notifications.background + .notification-row + .notification-background + .notification + > *:last-child + > * + .notification-action:active { + background-color: @border; +} + +.floating-notifications.background + .notification-row + .notification-background + .close-button { + margin: 0.2rem; + padding: 0.25rem; + border-radius: 0.2rem; + color: @foreground; + background-color: alpha(@alert, 0); +} + +.floating-notifications.background + .notification-row + .notification-background + .close-button:hover { + /* color: #191724; */ + background-color: @alert; +} + +.floating-notifications.background + .notification-row + .notification-background + .close-button:active { + background-color: @foreground; +} + + +/*--------------- Control center ---------------*/ + +.control-center { + border-radius: .4rem; + background-color: @background_transparent; + color: @foreground; + padding: 1.2rem; + border: 1px solid @border; +} + +.control-center .widget-title { + color: @foreground; + font-weight: bold; +} + +.control-center .widget-title button { + border-radius: 2rem; + color: @foreground; + background-color: @border; + border: 1px solid @border; + padding: .2rem 1.5rem; +} + +.control-center .widget-title button:hover { + background-color: @alert; +} + +.control-center .widget-title button:active { + background-color: @border; +} + +.control-center .notification-row .notification-background { + border-radius: 0.5rem; + margin: 0.5rem; + background-color: @background_light; + color: @foreground; + border: 1px solid @border; +} + +.control-center .notification-row .notification-background .notification { + padding: 0.7rem; + border-radius: 0.2rem; +} + +.control-center + .notification-row + .notification-background + .notification.critical { + border: 1px solid @alert; +} + +.control-center + .notification-row + .notification-background + .notification + .notification-content { + color: @foreground; +} + +.control-center + .notification-row + .notification-background + .notification + .notification-content + .summary { + margin: 0.2rem; + color: @foreground; + font-weight: bold; +} + +.control-center + .notification-row + .notification-background + .notification + .notification-content + .body { + margin: 0.2rem; + color: @foreground; +} + +.control-center + .notification-row + .notification-background + .notification + > *:last-child + > * { + min-height: 3rem; +} + +.control-center + .notification-row + .notification-background + .notification + > *:last-child + > * + .notification-action { + border-radius: 0.2rem; + color: @foreground; + background-color: #1f1d2e; + border: 1px solid @border; +} + +.control-center + .notification-row + .notification-background + .notification + > *:last-child + > * + .notification-action:hover { + background-color: @background_light; +} + +.control-center + .notification-row + .notification-background + .notification + > *:last-child + > * + .notification-action:active { + background-color: @border; +} + +.control-center .notification-row .notification-background .close-button { + margin: 0.5rem; + padding: 0.25rem; + border-radius: 0.2rem; + color: @foreground; + background-color: alpha(@alert, 0); +} + +.control-center .notification-row .notification-background .close-button:hover { + background-color: @alert; +} + +.control-center + .notification-row + .notification-background + .close-button:active { + background-color: @foreground; +} + +progressbar, +progress, +trough { + border-radius: 0.2rem; +} + +.notification.critical progress { + background-color: @alert; +} + + + + +.notification.low progress, +.notification.normal progress { + background-color: #9ccfd8; +} + +trough { + background-color: #1f1d2e; +} + +.control-center trough { + background-color: @border; +} + +.control-center-dnd { + margin: 1rem 0; + border-radius: 0.2rem; +} + +.control-center-dnd slider { + background: #26233a; + border-radius: 0.2rem; +} + +.widget-dnd { + color: #908caa; +} + +.widget-dnd > switch { + border-radius: 0.2rem; + background: #26233a; + border: 1px solid @border; +} + +.widget-dnd > switch:checked slider { + background: #31748f; +} + +.widget-dnd > switch slider { + background: @border; + border-radius: 0.2rem; + margin: 0.25rem; +} + + + + + +/*--------------- Media player ---------------*/ + + +.widget-mpris { +} + +.widget-mpris .widget-mpris-player { + padding: 16px; + margin: 0.5rem; + background-color: @mpris-album-art-overlay; + border-radius: 0.7rem; +} + +.widget-mpris .widget-mpris-player button:hover { + all: unset; + background: @bg-hover; + text-shadow: none; + border-radius: 0.5rem; + border: none; + padding: 5px; + margin: 5px; + transition: all 0.2s ease; +} + +.widget-mpris .widget-mpris-player button { + color:@text; + text-shadow: none; + border-radius: 2rem; + border: none; + padding: 5px; + margin: 5px; + transition: all 0.2s ease; +} + +.widget-mpris .widget-mpris-player button:not(.selected) { + background: transparent; + border: 2px solid transparent; +} + +.widget-mpris .widget-mpris-player button:hover { + border: 2px solid transparent; +} + +.widget-mpris .widget-mpris-player .widget-mpris-album-art { + border-radius: 0.5rem; + box-shadow: 0px 0px 20px rgba(0, 0, 0, 0.5); +} + +.widget-mpris .widget-mpris-player .widget-mpris-title { + font-weight: bold; + font-size: 1.25rem; +} + +.widget-mpris .widget-mpris-player .widget-mpris-subtitle { + font-size: 1.1rem; +} + +.widget-mpris .widget-mpris-player > box > button:hover { + background-color: @mpris-button-hover; +} + + + + + +/*--------------- Sliders ---------------*/ + +.widget-volume { + background-color: transparent; + padding: 8px; + /* margin: 8px; */ + margin-bottom: 0.5rem; + border-radius: 12px; +} +.widget-backlight { + background-color: transparent; + padding: 8px; + /* margin: 8px; */ + margin-bottom: 1.5rem; + border-radius: 12px; +} + +trough { + border-radius: 20px; + background: transparent; +} + +trough highlight { + padding: 5px; + background: @active; + border-radius: 20px; + transition: all .2s ease; +} +trough highlight:hover { + padding: 5px; + background: @active; + border-radius: 20px; + transition: all .2s ease; +} + +trough slider { + background: transparent; +} +trough slider:hover { + background: transparent; +} + + + +/*--------------- Buttons grid ---------------*/ + +.widget-buttons-grid { + padding-left: 0.2rem; + padding-right: 0.2rem; + padding-bottom: 0.2rem; + /* margin: 1rem; */ + border-radius: 0.2rem; + background:transparent; +} + +.widget-buttons-grid>flowbox>flowboxchild>button label { + font-size: 20px; + color: @foreground; + transition: all .2s ease; +} +.widget-buttons-grid>flowbox>flowboxchild>button:hover label { + font-size: 20px; + color: @text; + transition: all .2s ease; +} +.widget-buttons-grid > flowbox > flowboxchild > button { + + background: alpha(@border, 0.5); + border-radius: 0.2rem; + padding: 0.7rem 2rem; + margin: 0.2rem; + text-shadow:none; + transition: all .2s ease; +} +.widget-buttons-grid > flowbox > flowboxchild > button:hover { + background: @border; + box-shadow: 0px 0px 2px rgba(0, 0, 0, .2); + transition: all .2s ease; + +} + +.widget-buttons-grid > flowbox > flowboxchild > button.toggle:checked { + background: @active; +} +.widget-buttons-grid > flowbox > flowboxchild > button.toggle:checked label { + color: @background; +} + + diff --git a/.config/style.css b/.config/swaync/style.css.old similarity index 98% rename from .config/style.css rename to .config/swaync/style.css.old index 2698083..609cbac 100644 --- a/.config/style.css +++ b/.config/swaync/style.css.old @@ -1,4 +1,5 @@ -@import url('./colors.css'); +@import url('colors.css'); +/*@import url('../../.cache/wal/colors-waybar.css');*/ @define-color mpris-album-art-overlay alpha(@background, 0.55); @define-color mpris-button-hover alpha(@background, 0.50); @define-color text @color15; @@ -7,11 +8,11 @@ @define-color mycolor @color9; @define-color border-color alpha(@mycolor, 0.15); -@keyframes fadeIn{ +@keyframes notif_anim{ 0% { padding-left:20; - margin-left:50; - margin-right:50; + /*margin-left:50; + margin-right:50;*/ } 100% { padding:0; @@ -41,7 +42,7 @@ } .floating-notifications .notification{ - animation: fadeIn .5s ease-in-out; + animation: notif_anim .2s ease-out; } .control-center .notification-row .notification-background .notification box, diff --git a/.config/waybar/colors.css b/.config/waybar/colors.css index 07910df..753ec3e 100644 --- a/.config/waybar/colors.css +++ b/.config/waybar/colors.css @@ -1,4 +1,7 @@ -@define-color foreground #c5c5c5; +@define-color foreground #e4e8ed; @define-color background #18191c; -@define-color accentColor #b6c8d3; \ No newline at end of file +/* @define-color accentColor #b6c8d3; */ +@define-color accentColor #ec775c; + +@define-color charging #6bc46d; \ No newline at end of file diff --git a/.config/waybar/config.jsonc b/.config/waybar/config.jsonc index 530e323..e76e37a 100644 --- a/.config/waybar/config.jsonc +++ b/.config/waybar/config.jsonc @@ -1,8 +1,11 @@ { "layer": "top", "position": "right", - "margin": "1 1 1 1", + "margin": "1 1 1 2", "reload_style_on_change": true, + + // Modules display + "modules-left": [ //"custom/updates", "hyprland/workspaces", @@ -10,6 +13,24 @@ //"group/info", //"hyprland/window" ], + + "modules-right": [ + "custom/recorder", + "privacy", + "group/brightness", + "group/sound", + "group/connection", + "tray", + "group/together", + //"group/cnoti", + "group/power" + ], + + + // Modules definition + + // Up + "hyprland/workspaces": { "format": "{icon}", "on-click": "activate", @@ -27,12 +48,6 @@ "10": "10" } }, - "hyprland/window": { - "format":"", - "spearate-outputs": true, - "icon": true - - }, "hyprland/submap": { "format": "󰇘", "max-length": 8, @@ -48,9 +63,16 @@ "custom/dmark", "group/gcpu", "memory", - "disk" + "disk", + "hyprland/window" ] }, + "hyprland/window": { + "orientation": "vertical", + "format":"{class}", + "spearate-outputs": true, + "icon": false + }, "custom/dmark": { "format": "", "tooltip": false @@ -85,17 +107,9 @@ "format": " 󰋊 \n{percentage_used}󱉸", "path": "/" }, - "modules-right": [ - "custom/recorder", - "privacy", - "group/brightness", - "group/sound", - "group/connection", - "tray", - "group/together", - //"group/cnoti", - "group/power" - ], + + // Bottom + "custom/recorder": { "format": "{}", "interval": "once", @@ -239,6 +253,13 @@ "bluetooth#status" ] }, + "group/battery": { + "orientation":"vertical", + "modules": [ + "battery", + "custom/battery_percentage", + ] + }, "group/power": { "orientation": "inherit", "drawer": { @@ -246,8 +267,8 @@ "transition-left-to-right": false }, "modules": [ - "battery", - "power-profiles-daemon" + "group/battery", + "power-profiles-daemon", ] }, "tray": { @@ -357,7 +378,7 @@ }, "format": "{icon}", "interval": 1, - "format-charging": "{icon} ", + "format-charging": "󰂄", "format-full": "{icon}", "format-icons": [ "󰁻", @@ -369,6 +390,12 @@ ], "tooltip-format": "{timeTo} {capacity} % | {power} W" }, + "custom/battery_percentage": { + "format": "{}", + "exec": "cat /sys/class/power_supply/BAT*/capacity", + "interval": 10, + "tooltip": false + }, "clock": { "format": "{:%H\n%M}", "tooltip-format": "{calendar}", @@ -378,6 +405,7 @@ "weeks-pos": "right", "on-scroll": 1, "on-click-right": "mode", + "on-click": "swaync-client -t", "format": { "today": "{}" } diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 8946cf2..1bed452 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -1,8 +1,8 @@ @import "colors.css"; -@define-color active @accentColor; +@define-color active @foreground; * { - font-size: 16px; + font-size: 17px; font-family: "JetBrainsMono Nerd Font,JetBrainsMono NF"; min-width: 8px; min-height: 0px; @@ -21,7 +21,7 @@ window#waybar { border: 1px solid alpha(@active, 0.2); background: @background; background: alpha(@background, 0.7); - color: lighter(@active); + color: @foreground; } menu, @@ -31,13 +31,13 @@ tooltip { border: 1px solid @active; background: @background; - color: lighter(@active); + color: @foreground; } menu label, tooltip label { font-size: 14px; - color: lighter(@active); + color: @foreground; } #submap, @@ -53,7 +53,7 @@ tooltip label { margin: 0px 6px 4px 6px; border-radius: 4px; background: alpha(@background, 0); - color: lighter(@active); + color: @foreground; } .modules-left { @@ -62,7 +62,7 @@ tooltip label { margin: 6px 5px 6px 5px; /* Testing with 5 pixels on left/right */ border-radius: 4px; background: alpha(@background, 0.5); - color: lighter(@active); + color: @foreground; border: 1px solid alpha(@active, 0.1); } @@ -172,7 +172,7 @@ tooltip label { #workspaces button.active { padding: 2px 0px; background: alpha(@active, 0.4); - color: lighter(@active); + color: @foreground; border-radius: 2px; } @@ -205,26 +205,47 @@ tooltip label { padding-top: 2px; } -#battery { - border-radius: 8px; - padding: 4px 0px; +#group-battery { + /* border-radius: 8px; */ + /* padding: 4px 0px; */ margin: 4px 2px 4px 2px; } +#battery { + font-size: 1.5rem; + border-radius: 3px; + padding: 4px 0px; + margin: 0 0px; +} + +#battery.charging { + color: @charging; +} + #battery.discharging.warning { - animation-name: blink-yellow; + background-color: #cf9022; + /*animation-name: blink-yellow; animation-duration: 1s; animation-timing-function: linear; animation-iteration-count: infinite; - animation-direction: alternate; + animation-direction: alternate; */ } #battery.discharging.critical { - animation-name: blink-red; + background-color: #c64d4f; + /*animation-name: blink-red; animation-duration: 1s; animation-timing-function: linear; animation-iteration-count: infinite; - animation-direction: alternate; + animation-direction: alternate;*/ +} + +#custom-battery_percentage { + font-size: 1.1rem; + border-radius: 100px; + /* padding: 0 2px; */ + margin: 1px 0; + /* margin: 4px 2px 4px 2px; */ } #clock { @@ -234,7 +255,7 @@ tooltip label { #pulseaudio.mic { border-radius: 4px; - color: lighter(@active); + color: @foreground; padding-left: 2px; } @@ -256,7 +277,7 @@ tooltip label { #backlight-slider highlight, #pulseaudio-slider highlight { border-radius: 8px; - background-color: lighter(@active); + background-color: @foreground; } #bluetooth.discoverable, diff --git a/.local/bin/afs.sh b/.local/bin/afs.sh new file mode 100755 index 0000000..a20bf59 --- /dev/null +++ b/.local/bin/afs.sh @@ -0,0 +1,50 @@ +#!/bin/sh + +# Variables +student_id='guillem.george' +server_url='cri.epita.fr' +afs_path="/afs/${server_url}/user/g/gu/${student_id}/u/" +mount_path="$HOME/Drives/afs" + + +# Functions + +connect() { + kinit -f $student_id@CRI.EPITA.FR + sshfs -o reconnect $student_id@ssh.$server_url:$afs_path $mount_path + cd $mount_path +} + +reconnect() { + kinit -f $student_id@CRI.EPITA.FR +} + +print_help() { + echo "Usage: $0 (connect|reconnect)" + echo + echo " connect Mounts the AFS on the specified folder" + echo " reconnect Fix filesystem not responding problem" +} + + +# Handle arguments +if [ $# -eq 0 ]; then + connect +elif [ $# -eq 1 ]; then + if [ $1 == "connect" ]; then + connect + elif [ $1 == "reconnect" ]; then + reconnect + fi +else + print_help +fi + +## Warning you need to adjust your ssh config file correctly to make +## it work. Just add the following lines: + +# Host ssh.cri.epita.fr +# GSSAPIAuthentication yes +# GSSAPIDelegateCredentials yes + +## You'll also need to configure your keys properly in your CRI profile diff --git a/.local/bin/avahi-patch.sh b/.local/bin/avahi-patch.sh new file mode 100755 index 0000000..48d31f9 --- /dev/null +++ b/.local/bin/avahi-patch.sh @@ -0,0 +1,18 @@ +#!/bin/sh + +if [ $(whoami) != root ]; then + echo "Please run this script as root" + echo "-> sudo $0" + echo + sudo $0 + exit $? +fi + +apps_path=/usr/share/applications + +rm $apps_path/avahi-discover.desktop +rm $apps_path/bvnc.desktop +rm $apps_path/bssh.desktop + +echo "- Done" +exit 0 diff --git a/.p10k.zsh b/.p10k.zsh index fc78971..49db449 100644 --- a/.p10k.zsh +++ b/.p10k.zsh @@ -194,8 +194,12 @@ # typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐' ################################[ prompt_char: prompt symbol ]################################ + + ##### MODIFIED MANUALLY ##### # Green prompt symbol if the last command succeeded. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76 + typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=2 + ############################# + # Red prompt symbol if the last command failed. typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196 # Default prompt symbol. @@ -213,18 +217,26 @@ typeset -g POWERLEVEL9K_PROMPT_CHAR_LEFT_PROMPT_FIRST_SEGMENT_START_SYMBOL= ##################################[ dir: current directory ]################################## + + ##### MODIFIED MANUALLY ##### # Default current directory color. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=31 + typeset -g POWERLEVEL9K_DIR_FOREGROUND=12 + ############################# + # If directory is too long, shorten some of its segments to the shortest possible unique # prefix. The shortened directory can be tab-completed to the original. typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_unique # Replace removed segment suffixes with this symbol. typeset -g POWERLEVEL9K_SHORTEN_DELIMITER= + + ##### MODIFIED MANUALLY ##### # Color of the shortened directory segments. typeset -g POWERLEVEL9K_DIR_SHORTENED_FOREGROUND=103 + ############################# + # Color of the anchor directory segments. Anchor segments are never shortened. The first # segment is always an anchor. - typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=39 + typeset -g POWERLEVEL9K_DIR_ANCHOR_FOREGROUND=4 # Display anchor directory segments in bold. typeset -g POWERLEVEL9K_DIR_ANCHOR_BOLD=true # Don't shorten directories that contain any of these files. They are anchors. diff --git a/.zshrc b/.zshrc index 8d23c95..0b9096b 100644 --- a/.zshrc +++ b/.zshrc @@ -77,11 +77,12 @@ setopt correct # 'Did you mean' # Environment variables export PATH=$PATH:~/.local/bin export PATH=$PATH:~/.local/share/Xilinx/Vivado/2024.2/bin +export EDITOR=nvim # Aliases alias cl='clear' alias hyprcfg='vim ~/.config/hypr/' -alias zcfg='vim ~/.zshrc' +alias zcfg='$EDITOR ~/.zshrc' alias icat='kitten icat' alias nv='nvim' alias cg='cargo' @@ -94,12 +95,13 @@ alias power-draw="cat /sys/class/power_supply/BAT1/current_now /sys/class/power_ alias battery='cat /sys/class/power_supply/BAT1/capacity' # Override some default commands with more practical alternatives # Note: default ls command is still accessible with '\ls' -alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes' +alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes ' alias lsa='ls -a' alias lsl='eza --icons=automatic --long --header --group -M' alias tree='ls --level=3' # Random stuff alias rot13="tr 'A-Za-z' 'N-ZA-Mn-za-m'" +alias sshfs="sshfs -o follow_symlinks" # Shell integrations eval "$(fzf --zsh)"