diff --git a/.config/gtk-3.0/bookmarks b/.config/gtk-3.0/bookmarks deleted file mode 100644 index 5b55063..0000000 --- a/.config/gtk-3.0/bookmarks +++ /dev/null @@ -1,4 +0,0 @@ -file:///home/guillm/Pictures Pictures -file:///home/guillm/Downloads Downloads -file:///home/guillm/shared/Workplan/EPITA/2024-2025 -file:///home/guillm/shared/Workplan diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini index 8b1f915..2ee3c57 100644 --- a/.config/gtk-3.0/settings.ini +++ b/.config/gtk-3.0/settings.ini @@ -1,7 +1,7 @@ [Settings] -gtk-theme-name=Breeze-Dark -gtk-icon-theme-name=Adwaita -gtk-font-name=Cantarell 11 +gtk-theme-name=adw-gtk3-dark +gtk-icon-theme-name=Papirus-Dark +gtk-font-name=DejaVu Sans 10 gtk-cursor-theme-name=VolantesCursors gtk-cursor-theme-size=24 gtk-toolbar-style=GTK_TOOLBAR_ICONS @@ -14,4 +14,4 @@ gtk-xft-antialias=1 gtk-xft-hinting=1 gtk-xft-hintstyle=hintslight gtk-xft-rgba=rgb -gtk-application-prefer-dark-theme=0 +gtk-application-prefer-dark-theme=1 diff --git a/.config/hypr/application-style.conf b/.config/hypr/application-style.conf new file mode 100644 index 0000000..e69de29 diff --git a/.config/hypr/config/appearance.conf b/.config/hypr/config/appearance.conf index 924eb6c..5534445 100644 --- a/.config/hypr/config/appearance.conf +++ b/.config/hypr/config/appearance.conf @@ -142,22 +142,22 @@ misc { # windowrulev2 = float,class:^(kitty)$,title:^(kitty)$ # Ignore maximize requests from apps. You'll probably like this. -windowrulev2 = suppressevent maximize, class:.* +windowrule = suppressevent maximize, class:.* # Fix some dragging issues with XWayland -windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 +windowrule = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0 # Albert -windowrule=noborder,^(albert)$ -windowrule=noblur,^(albert)$ -windowrule=noshadow,^(albert)$ -windowrule=float,^(albert)$ -windowrule=stayfocused,^(albert)$ -windowrule=nodim,^(albert)$ +windowrule=noborder,class:^(albert)$ +windowrule=noblur,class:^(albert)$ +windowrule=noshadow,class:^(albert)$ +windowrule=float,class:^(albert)$ +windowrule=stayfocused,class:^(albert)$ +windowrule=nodim,class:^(albert)$ # Prism Launcher -windowrulev2=pseudo, class:(org.prismlauncher.PrismLauncher) -windowrulev2=size 65% 70%, class:(org.prismlauncher.PrismLauncher), title:^(Prism Launcher .*)$ +windowrule=pseudo, class:(org.prismlauncher.PrismLauncher) +windowrule=size 65% 70%, class:(org.prismlauncher.PrismLauncher), title:^(Prism Launcher .*)$ # TODO Automatically fullscreen single apps # - Seems impossible for now (try mixing with workspace rules) diff --git a/.config/hypr/config/environment.conf b/.config/hypr/config/environment.conf index 089d13a..1889195 100644 --- a/.config/hypr/config/environment.conf +++ b/.config/hypr/config/environment.conf @@ -6,7 +6,8 @@ # Set programs that you use $terminal = kitty -$fileManager = dolphin +#$fileManager = cosmic-files +$fileManager = nautilus $menu = albert toggle $notificationsManager = fnott diff --git a/.config/hypr/config/input-en.conf b/.config/hypr/config/input-en.conf new file mode 100644 index 0000000..9669207 --- /dev/null +++ b/.config/hypr/config/input-en.conf @@ -0,0 +1,150 @@ +############# +### INPUT ### +############# + +### English configuration (not finished yet) + +# https://wiki.hyprland.org/Configuring/Variables/#input +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + numlock_by_default = true + + follow_mouse = 1 + + sensitivity = 0.1 # -1.0 - 1.0, 0 means no modification. + + touchpad { + natural_scroll = true + disable_while_typing = false + } +} + +# https://wiki.hyprland.org/Configuring/Variables/#gestures +gestures { + workspace_swipe = true +} + +# Example per-device config +# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more +device { + name = epic-mouse-v1 + sensitivity = -0.5 +} + + +################### +### KEYBINDINGS ### +################### + +# See https://wiki.hyprland.org/Configuring/Keywords/ +$mainMod = SUPER # Sets "Windows" key as main modifier + +# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + +# Main desktop controls +bind = $mainMod, Q, killactive, +bind = $mainMod, R, exec, $menu # Omnibar +bind = $mainMod, D, exec, $menu # Legacy menu shortcut +bind = $mainMod, L, exec, hyprlock # Lockscreen +bind = $mainMod, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh # Toggle sidebar +bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh # Reload desktop +bind = $mainMod, F11, exec, ~/.config/hypr/scripts/gamemode.sh # Gamemode +bind = $mainMod SHIFT, M, exit, # Exit desktop session + +# Shortcuts +bind = $mainMod, RETURN, exec, $terminal +bind = $mainMod, SPACE, exec, $terminal +bind = $mainMod, E, exec, $fileManager +bindel = , XF86Launch1, exec, kitty vim ~/.config/hypr/config + +# Move focus with mainMod + arrow keys +bind = $mainMod, left, movefocus, l +bind = $mainMod, right, movefocus, r +bind = $mainMod, up, movefocus, u +bind = $mainMod, down, movefocus, d + +# Layout +bind = $mainMod, F, fullscreen, +bind = $mainMod, V, togglesplit, # Horizontal/vertical split +bind = $mainMod, T, togglefloating, +bind = $mainMod, H, pseudo, # Toggle pseudo-tiling + +# Switch workspaces with mainMod + [0-9] +bind = $mainMod, ampersand, workspace, 1 +bind = $mainMod, eacute, workspace, 2 +bind = $mainMod, quotedbl, workspace, 3 +bind = $mainMod, apostrophe, workspace, 4 +bind = $mainMod, parenleft, workspace, 5 +bind = $mainMod, minus, workspace, 6 +bind = $mainMod, egrave, workspace, 7 +bind = $mainMod, underscore, workspace, 8 +bind = $mainMod, ccedilla, workspace, 9 +bind = $mainMod, agrave, workspace, 10 + +# Move active window to a workspace with mainMod + SHIFT + [0-9] +bind = $mainMod SHIFT, ampersand, movetoworkspace, 1 +bind = $mainMod SHIFT, eacute, movetoworkspace, 2 +bind = $mainMod SHIFT, quotedbl, movetoworkspace, 3 +bind = $mainMod SHIFT, apostrophe, movetoworkspace, 4 +bind = $mainMod SHIFT, parenleft, movetoworkspace, 5 +bind = $mainMod SHIFT, minus, movetoworkspace, 6 +bind = $mainMod SHIFT, egrave, movetoworkspace, 7 +bind = $mainMod SHIFT, underscore, movetoworkspace, 8 +bind = $mainMod SHIFT, ccedilla, movetoworkspace, 9 +bind = $mainMod SHIFT, agrave, movetoworkspace, 10 + +# Example special workspace (scratchpad) +bind = $mainMod, S, togglespecialworkspace, magic +bind = $mainMod SHIFT, S, movetoworkspace, special:magic + +# Minimize function (uses scratchpad) +# For testing, may be removed in future releases +bind = $mainMod, N, togglespecialworkspace, magic +bind = $mainMod, N, movetoworkspace, +0 +bind = $mainMod, N, togglespecialworkspace, magic +bind = $mainMod, N, movetoworkspace, special:magic +bind = $mainMod, N, togglespecialworkspace, magic + +# Scroll through existing workspaces with mainMod + scroll +bind = $mainMod, mouse_down, workspace, e+1 +bind = $mainMod, mouse_up, workspace, e-1 + +# Move/resize windows with mainMod + LMB/RMB and dragging +bindm = $mainMod, mouse:272, movewindow +bindm = $mainMod, mouse:273, resizewindow + + +# Function keys + +## Volume +bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ +bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- +bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle +bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle + +## Brightness +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 5%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 5%- +bindel = SHIFT, XF86MonBrightnessUp, exec, brightnessctl s 1%+ +bindel = SHIFT, XF86MonBrightnessDown, exec, brightnessctl s 1%- + +## Player controls +bindl = , XF86AudioNext, exec, playerctl next +bindl = , XF86AudioPause, exec, playerctl play-pause +bindl = , XF86AudioPlay, exec, playerctl play-pause +bindl = , XF86AudioPrev, exec, playerctl previous + +## Screenshot +bind = , Print, exec, ~/.config/hypr/scripts/screenshot.sh + +## Touchpad toggle +### On galaxy books, pressing the disable touchpad key also triggers SUPER and +### CONTROL keys, this is why there are present here +bind = SUPER CONTROL, XF86TouchpadToggle, exec, ~/.config/hypr/scripts/toggle-touchpad.sh + +## Testing +#bind = $mainMod, TAB, overview:toggle, toggle diff --git a/.config/hypr/config/input.conf b/.config/hypr/config/input.conf index f73804f..72d48d9 100644 --- a/.config/hypr/config/input.conf +++ b/.config/hypr/config/input.conf @@ -42,18 +42,22 @@ device { $mainMod = SUPER # Sets "Windows" key as main modifier # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more + +# Main desktop controls +bind = $mainMod, Q, killactive, +bind = $mainMod, R, exec, $menu # Omnibar +bind = $mainMod, D, exec, $menu # Legacy menu shortcut +bind = $mainMod, L, exec, hyprlock # Lockscreen +bind = $mainMod, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh # Toggle sidebar +bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh # Reload desktop +bind = $mainMod, F11, exec, ~/.config/hypr/scripts/gamemode.sh # Gamemode +bind = $mainMod SHIFT, M, exit, # Exit desktop session + +# Shortcuts bind = $mainMod, RETURN, exec, $terminal bind = $mainMod, SPACE, exec, $terminal -bind = $mainMod, Q, killactive, -bind = $mainMod SHIFT, M, exit, bind = $mainMod, E, exec, $fileManager -bind = $mainMod, T, togglefloating, -bind = $mainMod, D, exec, $menu -bind = $mainMod, R, exec, $menu -bind = $mainMod, H, pseudo, # dwindle -bind = $mainMod, V, togglesplit, # dwindle -bind = $mainMod, F, fullscreen, -bind = $mainMod, L, exec, hyprlock +bindel = , XF86Launch1, exec, kitty vim ~/.config/hypr/config # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l @@ -61,6 +65,12 @@ bind = $mainMod, right, movefocus, r bind = $mainMod, up, movefocus, u bind = $mainMod, down, movefocus, d +# Layout +bind = $mainMod, F, fullscreen, +bind = $mainMod, V, togglesplit, # Horizontal/vertical split +bind = $mainMod, T, togglefloating, +bind = $mainMod, H, pseudo, # Toggle pseudo-tiling + # Switch workspaces with mainMod + [0-9] bind = $mainMod, ampersand, workspace, 1 bind = $mainMod, eacute, workspace, 2 @@ -105,40 +115,34 @@ bind = $mainMod, mouse_up, workspace, e-1 bindm = $mainMod, mouse:272, movewindow bindm = $mainMod, mouse:273, resizewindow -# Laptop multimedia keys for volume and LCD brightness + +# Function keys + +## Volume bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+ bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%- bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle -bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 6%+ -bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 6%- -bindel = SHIFT, XF86MonBrightnessUp, exec, brightnessctl s 2%+ -bindel = SHIFT, XF86MonBrightnessDown, exec, brightnessctl s 2%- +## Brightness +bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 5%+ +bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 5%- +bindel = SHIFT, XF86MonBrightnessUp, exec, brightnessctl s 1%+ +bindel = SHIFT, XF86MonBrightnessDown, exec, brightnessctl s 1%- -# (Requires playerctl) +## Player controls bindl = , XF86AudioNext, exec, playerctl next bindl = , XF86AudioPause, exec, playerctl play-pause bindl = , XF86AudioPlay, exec, playerctl play-pause bindl = , XF86AudioPrev, exec, playerctl previous -# Function keys - -# Settings -bindel = , XF86Launch1, exec, kitty vim ~/.config/hypr/config -# Screenshot +## Screenshot bind = , Print, exec, ~/.config/hypr/scripts/screenshot.sh -# Touchpad toggle -# (On galaxy books, pressing the disable touchpad key also triggers SUPER and CONTROL keys, this is why there are present here) + +## Touchpad toggle +### On galaxy books, pressing the disable touchpad key also triggers SUPER and +### CONTROL keys, this is why there are present here bind = SUPER CONTROL, XF86TouchpadToggle, exec, ~/.config/hypr/scripts/toggle-touchpad.sh -# Desktop related shortcuts - -# Toggle waybar -bind = $mainMod, B, exec, ~/.config/hypr/scripts/toggle-waybar.sh - -# Reload desktop -bind = $mainMod SHIFT, R, exec, ~/.config/hypr/scripts/reload.sh - -# Gamemode -bind = $mainMod, F11, exec, ~/.config/hypr/scripts/gamemode.sh +## Testing +#bind = $mainMod, TAB, overview:toggle, toggle diff --git a/.config/hypr/config/minimalist-mod.conf b/.config/hypr/config/minimalist-mod.conf new file mode 100644 index 0000000..0b75108 --- /dev/null +++ b/.config/hypr/config/minimalist-mod.conf @@ -0,0 +1,20 @@ +# Mod config file to make the desktop more minimalist + +general { + gaps_in = 0 + gaps_out = 0 +} + +decoration { + rounding = 0 + + shadow { + enabled = false + } + +} + +animations { + enabled = false + +} diff --git a/.config/hypr/config/plugins.conf b/.config/hypr/config/plugins.conf new file mode 100644 index 0000000..c2d7b9f --- /dev/null +++ b/.config/hypr/config/plugins.conf @@ -0,0 +1,12 @@ +# Plugins settings + +plugin { + overview { +# disableGestures = true + reverseSwipe = true + + overrideGaps = true + gapsIn = 10 + gapsOut = 20 + } +} diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf index 17e9c0e..82cde83 100644 --- a/.config/hypr/hyprland.conf +++ b/.config/hypr/hyprland.conf @@ -10,3 +10,5 @@ source = ~/.config/hypr/config/monitors.conf source = ~/.config/hypr/config/environment.conf source = ~/.config/hypr/config/input.conf source = ~/.config/hypr/config/appearance.conf +source = ~/.config/hypr/config/plugins.conf +#source = ~/.config/hypr/config/minimalist-mod.conf diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf index 51bf3ef..52de529 100644 --- a/.config/hypr/hyprpaper.conf +++ b/.config/hypr/hyprpaper.conf @@ -1,2 +1,2 @@ -preload = ~/.config/hypr/images/wallpaper.JPG -wallpaper = , ~/.config/hypr/images/wallpaper.JPG +preload = ~/.config/hypr/images/wallpaper.png +wallpaper = , ~/.config/hypr/images/wallpaper.png diff --git a/.config/hypr/images/lockscreen.jpg b/.config/hypr/images/lockscreen.jpg index 4e71633..097599e 100644 Binary files a/.config/hypr/images/lockscreen.jpg and b/.config/hypr/images/lockscreen.jpg differ diff --git a/.config/hypr/images/wallpaper.JPG b/.config/hypr/images/wallpaper.JPG deleted file mode 100755 index 85a35e2..0000000 Binary files a/.config/hypr/images/wallpaper.JPG and /dev/null differ diff --git a/.config/hypr/images/wallpaper.png b/.config/hypr/images/wallpaper.png new file mode 100755 index 0000000..7b13daf Binary files /dev/null and b/.config/hypr/images/wallpaper.png differ diff --git a/.config/hypr/scripts/autostart.sh b/.config/hypr/scripts/autostart.sh index 66741da..9c5e18a 100755 --- a/.config/hypr/scripts/autostart.sh +++ b/.config/hypr/scripts/autostart.sh @@ -5,7 +5,8 @@ # If you want to add your own applications you may rather want to use exec-once in the environment.conf file hyprpaper & +hyprpm reload -nn & albert & # mako & systemctl --user start hyprpolkitagent & -~/.config/hypr/scripts/restore-waybar.sh \ No newline at end of file +~/.config/hypr/scripts/restore-waybar.sh diff --git a/.config/hypr/scripts/toggle-touchpad.sh b/.config/hypr/scripts/toggle-touchpad.sh index b5ecda8..12a8553 100755 --- a/.config/hypr/scripts/toggle-touchpad.sh +++ b/.config/hypr/scripts/toggle-touchpad.sh @@ -5,10 +5,10 @@ toggle_variable="device[${device}]:enabled" hyprctl keyword "${toggle_variable}" true -status_file="$XDG_RUNTIME_DIR/touchpad.status" +status_file="$HOME/.config/hypr/status/touchpad" enable_touchpad() { - printf "true" > "${status_file}" + printf "on" > "${status_file}" hyprctl notify 1 2000 0 "Enabled touchpad" @@ -16,7 +16,7 @@ enable_touchpad() { } disable_touchpad() { - printf "false" > "${status_file}" + printf "off" > "${status_file}" hyprctl notify 0 2000 0 "Disabled Touchpad" @@ -24,11 +24,12 @@ disable_touchpad() { } if ! [ -f "${status_file}" ]; then + hyprctl notify 3 3000 0 "Status file missing" enable_touchpad else - if [ $(cat "${status_file}") = "true" ]; then + if [ $(cat "${status_file}") = "on" ]; then disable_touchpad - elif [ $(cat "${status_file}") = "false" ]; then + elif [ $(cat "${status_file}") = "off" ]; then enable_touchpad fi fi diff --git a/.config/kitty/current-theme.conf b/.config/kitty/github-dark.conf similarity index 100% rename from .config/kitty/current-theme.conf rename to .config/kitty/github-dark.conf diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf index 334f880..ab1a185 100644 --- a/.config/kitty/kitty.conf +++ b/.config/kitty/kitty.conf @@ -1,18 +1,21 @@ -# BEGIN_KITTY_FONTS +## Fonts font_family family="JetBrainsMonoNL Nerd Font Mono" font_size 13.0 bold_font auto italic_font auto bold_italic_font auto -# END_KITTY_FONTS -# BEGIN_KITTY_THEME -# GitHub Dark -include current-theme.conf +## Theme + +## GitHub Dark +# include github-dark.conf +## Seventy Eight +include seventy-eight.conf +## Blurred background # background_opacity 0.6 -# END_KITTY_THEME -# Decent scrolling speed +## Decent scrolling speed touch_scroll_multiplier 5.0 +## Annoying bell sound enable_audio_bell no diff --git a/.config/kitty/seventy-eight.conf b/.config/kitty/seventy-eight.conf new file mode 100644 index 0000000..9a1c73c --- /dev/null +++ b/.config/kitty/seventy-eight.conf @@ -0,0 +1,61 @@ +# vim:ft=kitty + +## name: 78 +## author: Gu://em_ (forked from Github Dark) +## license: MIT + +#: The basic colors + +foreground #c9d1d9 +background #0f131a +selection_foreground #EE6C4D +selection_background #3D5A80 + + +#: Cursor colors + +cursor #E0FBFC + + +#: Tab bar colors + +tab_bar_background #010409 +active_tab_foreground #c9d1d9 +active_tab_background #0d1117 +inactive_tab_foreground #8b949e +inactive_tab_background #010409 + + +#: The basic 16 colors + +#: black +color0 #484f58 +color8 #6e7681 + +#: red +color1 #EE6C4D +color9 #F5877A + +#: green +color2 #3fb950 +color10 #56d364 + +#: yellow +color3 #d29922 +color11 #e3b341 + +#: blue +color4 #58a6ff +color12 #79c0ff + +#: magenta +color5 #bc8cff +color13 #d2a8ff + +#: cyan +color6 #39c5cf +color14 #56d4dd + +#: white +color7 #b1bac4 +color15 #ffffff diff --git a/.config/waybar/colors.css b/.config/waybar/colors.css index 14ae962..07910df 100644 --- a/.config/waybar/colors.css +++ b/.config/waybar/colors.css @@ -1,4 +1,4 @@ @define-color foreground #c5c5c5; -@define-color background #242424; +@define-color background #18191c; @define-color accentColor #b6c8d3; \ No newline at end of file diff --git a/.config/waybar/style.css b/.config/waybar/style.css index 9513ff0..08aa44c 100644 --- a/.config/waybar/style.css +++ b/.config/waybar/style.css @@ -18,7 +18,7 @@ window#waybar { transition-property: background-color; transition-duration: 0.5s; border-radius: 4px; - border: 1px solid alpha(@active, 0.3); + border: 1px solid alpha(@active, 0.2); background: @background; background: alpha(@background, 0.7); color: lighter(@active); @@ -63,7 +63,7 @@ tooltip label { border-radius: 4px; background: alpha(@background, 0.5); color: lighter(@active); - border: 1px solid alpha(@active, 0.2); + border: 1px solid alpha(@active, 0.1); } #gcpu, @@ -86,7 +86,7 @@ tooltip label { border-radius: 2px; margin: 2px 1px 3px 1px; background: alpha(darker(@active), 0.3); - border: 1px solid alpha(darker(@active), 0.3); + border: 1px solid alpha(darker(@active), 0.2); } /* Override specific parameters*/ diff --git a/.zshrc b/.zshrc index fbbdc68..c44c690 100644 --- a/.zshrc +++ b/.zshrc @@ -90,6 +90,7 @@ alias vm='quickemu --vm *.conf' alias pprof='cat /sys/firmware/acpi/platform_profile' # Get current performance profile alias pprof-list='cat /sys/firmware/acpi/platform_profile_choices' # Lists the available performance profiles alias power-draw="cat /sys/class/power_supply/BAT1/current_now /sys/class/power_supply/BAT1/voltage_now | xargs | awk '{print \$1*\$2/1e12 \" W\"}\'" +alias battery='cat /sys/class/power_supply/BAT1/capacity' # Override some default commands with more practical alternatives alias ls='eza --icons=automatic --tree --level=1 --follow-symlinks --no-quotes' alias lsa='ls -a'