From 122697fb42591a3e4f30d4bb5fd0eb956bd81cc6 Mon Sep 17 00:00:00 2001 From: "Matthieu Fortin (CPC/CCP)" Date: Fri, 6 Dec 2024 14:02:58 -0500 Subject: [PATCH] Refactored configuration. --- geany/.config/geany/geany.conf | 2 +- .../geany_socket_dell7770-linux_wayland-1 | 1 - geany/.config/geany/session.conf | 12 ++++------ hypr/.config/hypr/hyprland.conf | 5 ++++ hypr/.config/hypr/keybinds.conf | 2 ++ hypr/.config/hypr/pyprland.d/one | 12 ++++++++++ hypr/.config/hypr/pyprland.toml | 9 ++++++++ hypr/.config/waybar/config.jsonc | 23 +++++++++++-------- 8 files changed, 46 insertions(+), 20 deletions(-) delete mode 120000 geany/.config/geany/geany_socket_dell7770-linux_wayland-1 create mode 100644 hypr/.config/hypr/pyprland.d/one diff --git a/geany/.config/geany/geany.conf b/geany/.config/geany/geany.conf index 890166c..708db74 100644 --- a/geany/.config/geany/geany.conf +++ b/geany/.config/geany/geany.conf @@ -71,7 +71,7 @@ pref_template_datetime=%d.%m.%Y %H:%M:%S %Z context_action_cmd= sidebar_visible=true statusbar_visible=true -msgwindow_visible=true +msgwindow_visible=false fullscreen=false symbols_group_by_type=true color_picker_palette= diff --git a/geany/.config/geany/geany_socket_dell7770-linux_wayland-1 b/geany/.config/geany/geany_socket_dell7770-linux_wayland-1 deleted file mode 120000 index 3a859c8..0000000 --- a/geany/.config/geany/geany_socket_dell7770-linux_wayland-1 +++ /dev/null @@ -1 +0,0 @@ -/run/user/1000/geany/geany_socket.cac00570 \ No newline at end of file diff --git a/geany/.config/geany/session.conf b/geany/.config/geany/session.conf index 1028778..2999d10 100644 --- a/geany/.config/geany/session.conf +++ b/geany/.config/geany/session.conf @@ -1,11 +1,7 @@ [files] -recent_files=/mnt/2024_Formation SANS/SANS FOR498/498.23.3 ISO/sans-integrity.yml;/mnt/2024_Formation SANS/SANS FOR498/498.23.3 ISO/license.txt;/mnt/Jupiter/matt/backup/oldnashome/.dotfiles/bash/.bash_prompt;/mnt/Jupiter/matt/backup/oldnashome/.bash_prompt;/mnt/Jupiter/home-dir-backup.sh;/home/matt/Downloads/OPNsense-24.7-checksums-amd64.sha256;/home/matt/.config/rofi/screen.rasi;/home/matt/Downloads/archcraft-2024.10.22-x86_64.iso.sha256sum;/home/matt/.config/waybar/style.css;/home/matt/.config/waybar/config.jsonc; +recent_files=/home/matt/.config/hypr/hyprland.conf;/home/matt/.config/waybar/config.jsonc;/home/matt/.config/hypr/pyprland.toml;/home/matt/.config/hypr/keybinds.conf;/home/matt/.config/hypr/pyprland.d/scratchpads.toml;/home/matt/.config/waybar/style.css;/mnt/Jupiter/home-dir-backup.sh;/mnt/2024_Formation SANS/SANS FOR498/498.23.3 ISO/license.txt;/mnt/2024_Formation SANS/SANS FOR498/498.23.3 ISO/sans-integrity.yml;/mnt/Jupiter/matt/backup/oldnashome/.dotfiles/bash/.bash_prompt; recent_projects= -current_page=3 -FILE_NAME_0=4796;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fmatt%2F.config%2Fhypr%2Fhyprland.conf;0;4 -FILE_NAME_1=0;Conf;0;EUTF-8;1;1;0;%2Fhome%2Fmatt%2F.config%2Fhypr%2Fkeybinds.conf;0;4 -FILE_NAME_2=160;None;0;EUTF-8;1;1;0;%2Fhome%2Fmatt%2F.config%2Fhypr%2Fpyprland.d%2Fscratchpads.toml;0;4 -FILE_NAME_3=11;None;0;EUTF-8;1;1;0;%2Fhome%2Fmatt%2F.config%2Fhypr%2Fpyprland.toml;0;4 +current_page=-1 [project] session_file= @@ -13,8 +9,8 @@ project_file_path=/home/matt/Projects [geany] treeview_position=0 -msgwindow_position=283 -geometry=0;0;946;506;1; +msgwindow_position=805 +geometry=0;0;737;1028;1; sidebar_page=2 [VTE] diff --git a/hypr/.config/hypr/hyprland.conf b/hypr/.config/hypr/hyprland.conf index c422a1c..7a1af8a 100644 --- a/hypr/.config/hypr/hyprland.conf +++ b/hypr/.config/hypr/hyprland.conf @@ -217,6 +217,10 @@ windowrulev2 = move 100%-w-20 50, title:(Picture-in-Picture) windowrulev2 = size 320 180, title:(Picture-in-Picture) windowrulev2 = pin, title:(Picture-in-Picture) +windowrulev2 = float, class:update +windowrulev2 = center, class:update +windowrulev2 = size 75% 75%, class:update + windowrule = float, ^(org.gnome.Calculator)$ windowrule = float, ^(pavucontrol)$ windowrule = center, ^(pavucontrol)$ @@ -228,6 +232,7 @@ windowrule = dimaround, ^(org.kde.kiod6)$ windowrule = float,^(jome)$ windowrulev2 = float,class:^(org.remmina.Remmina)$ +windowrulev2 = fullscreen,class:^(org.remmina.Remmina)$ windowrule = fullscreen,^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$ # Fix Bitwarden Window windowrulev2 = suppressevent maximize, class:^(firefox)$ diff --git a/hypr/.config/hypr/keybinds.conf b/hypr/.config/hypr/keybinds.conf index 0c54139..f6b3634 100644 --- a/hypr/.config/hypr/keybinds.conf +++ b/hypr/.config/hypr/keybinds.conf @@ -27,6 +27,8 @@ bind = $mainMod ALT, F, exec, hyprctl dispatch workspace allfloat bind = $mainMod, space, exec, $menu # Launch menu bind = $mainMod, F, fullscreen # Toggle fullscreen bind = $mainMod ALT, L, exec, $HOME/.config/hypr/scripts/ChangeLayout.sh # Toggle Master of Dwindle Layout + +# Pypr bind = $mainMod SHIFT, return, exec, pypr toggle term # Dwindle Layout diff --git a/hypr/.config/hypr/pyprland.d/one b/hypr/.config/hypr/pyprland.d/one new file mode 100644 index 0000000..0db67e5 --- /dev/null +++ b/hypr/.config/hypr/pyprland.d/one @@ -0,0 +1,12 @@ +one +two +pyprland.plugins = ["wallpapers"] + +[wallpapers] +path = "~/Pictures/wallpapers/" +interval = 60 +#unique = true +recurse = true +extensions = ["jpg", "jpeg", "png"] +command = 'swww img --transition-type any "[file]"' +clear_command = "swww clear" diff --git a/hypr/.config/hypr/pyprland.toml b/hypr/.config/hypr/pyprland.toml index 28e473a..1c275a8 100644 --- a/hypr/.config/hypr/pyprland.toml +++ b/hypr/.config/hypr/pyprland.toml @@ -1,6 +1,7 @@ [pyprland] plugins = [ "scratchpads", + "wallpapers", ] [scratchpads.term] @@ -11,3 +12,11 @@ size = "75% 60%" max_size = "1920px 100%" margin = 50 +[wallpapers] +path = "~/Pictures/wallpapers/" +interval = 60 +unique = true +recurse = true +extensions = ["jpg", "jpeg", "png"] +command = 'swww img --transition-type any "[file]"' +clear_command = "swww clear" diff --git a/hypr/.config/waybar/config.jsonc b/hypr/.config/waybar/config.jsonc index 7df2981..3ed1fb1 100644 --- a/hypr/.config/waybar/config.jsonc +++ b/hypr/.config/waybar/config.jsonc @@ -36,16 +36,19 @@ "exec": "hostnamectl hostname" }, - "custom/updates": { - "format": "{} {icon}", - "return-type": "json", - "format-icons": { - "has-updates": "󱍷", - "updated": "󰂪" - }, - "exec-if": "which waybar-module-pacman-updates", - "exec": "waybar-module-pacman-updates --interval-seconds 5 --network-interval-seconds 300" - }, + "custom/updates": { + "format": "{} {icon}", + "return-type": "json", + "format-icons": { + "has-updates": "󱍷", + "updated": "󰂪", + "updated": "󰂪", + "interval": 3600, + }, + "exec-if": "which waybar-module-pacman-updates", + "exec": "waybar-module-pacman-updates", + "on-click": "kitty --class update paru" + }, "hyprland/workspaces": { "disable-scroll": true,