diff --git a/Gentoo/gentooamd/home/user/.config/dconf/user b/Gentoo/gentooamd/home/user/.config/dconf/user index 89ee8792b..9643fd579 100644 Binary files a/Gentoo/gentooamd/home/user/.config/dconf/user and b/Gentoo/gentooamd/home/user/.config/dconf/user differ diff --git a/Gentoo/gentooamd/home/user/.config/geany/geany.conf b/Gentoo/gentooamd/home/user/.config/geany/geany.conf index 8faf20b8b..54b9602bc 100644 --- a/Gentoo/gentooamd/home/user/.config/geany/geany.conf +++ b/Gentoo/gentooamd/home/user/.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/Gentoo/gentooamd/home/user/.config/geany/session.conf b/Gentoo/gentooamd/home/user/.config/geany/session.conf index 1f8d35b53..18c40ec3d 100644 --- a/Gentoo/gentooamd/home/user/.config/geany/session.conf +++ b/Gentoo/gentooamd/home/user/.config/geany/session.conf @@ -1,13 +1,13 @@ [files] recent_files=/home/ganome/Nextcloud/MoreStorage/Ganome/files/SCAR-iT/HAM/QRM/Interference;/home/ganome/Documents/TODO;/home/ganome/Projects/ark-repo/ASA/mod-list.txt;/home/ganome/Projects/matrix/MAS-debug.txt;/home/ganome/Projects/matrix/404-video-error.txt;/home/ganome/Projects/matrix/31.conf;/home/ganome/Projects/minecraft/JustEnoughPaper/libs.versions.toml;/home/ganome/Projects/minecraft/JustEnoughPaper/build.gradle.kts;/home/ganome/Documents/GC-Notes;/home/ganome/Documents/Matrix-Synapse/AdminAPI; recent_projects= -current_page=6 +current_page=7 FILE_NAME_0=552;None;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FDocuments%2FMatrix-Synapse%2FAdminAPI;0;4 FILE_NAME_1=207;None;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FDocuments%2FGC-Notes;0;4 FILE_NAME_2=0;Kotlin;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FProjects%2Fminecraft%2FJustEnoughPaper%2Fbuild.gradle.kts;0;4 FILE_NAME_3=0;TOML;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FProjects%2Fminecraft%2FJustEnoughPaper%2Flibs.versions.toml;0;4 FILE_NAME_4=23;None;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FDocuments%2FTODO;0;4 -FILE_NAME_5=365;None;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FNextcloud%2FMoreStorage%2FGanome%2Ffiles%2FSCAR-iT%2FHAM%2FQRM%2FInterference;0;4 +FILE_NAME_5=366;None;0;EUTF-8;1;1;0;%2Fhome%2Fganome%2FNextcloud%2FMoreStorage%2FGanome%2Ffiles%2FSCAR-iT%2FHAM%2FQRM%2FInterference;0;4 [project] session_file= @@ -15,7 +15,7 @@ project_file_path=/home/ganome/projects [geany] treeview_position=156 -msgwindow_position=394 +msgwindow_position=358 geometry=0;0;1898;1058;1; sidebar_page=1 diff --git a/Gentoo/gentooamd/home/user/.config/hypr/hyprland.lua b/Gentoo/gentooamd/home/user/.config/hypr/hyprland.lua new file mode 100644 index 000000000..7732e6b10 --- /dev/null +++ b/Gentoo/gentooamd/home/user/.config/hypr/hyprland.lua @@ -0,0 +1,109 @@ +-- #source = ~/.config/hypr/hyprland/env.conf # This Isn't Needed because were using UWSM to mange the environment +require("hyprland/exec") +-- require("hyprland/plugin.lua") +require("hyprland/bind") +require("hyprland/windowrule") + +local home = os.getenv("HOME") +local terminal = "ghostty" +local menu = "rofi" +local mainMod = "SUPER" + +hl.monitor({ + output = "DP-1", + mode = "1920x1080@60", + position = "0x0", + scale = 1 -- 60hz refresh rate on DP-1 - "hyprctl monitors" +}) +hl.monitor({ + output = "HDMI-A-1", + mode = "1920x1080@60", + position = "1920x0", + scale = 1 -- #60hz on HDMI-A-1 +}) + +hl.config({ + general = { + gaps_in = 6, + gaps_out = 8, + border_size = 3, + col = { + active_border = { colors = {"rgba(398bc6ff)", "rgba(576ddbff)", "rgba(2a9292ff)", "rgba(955ae7ff)"}, angle = 45 }, + inactive_border = { colors = {"rgba(19171ccc)", "rgba(26232acc)"}, angle = 45 }, + }, + + layout = dwindle, + resize_on_border = true, + allow_tearing = true, + }, + +-- ABOVE HERE IS GOOD + input = { + -- # Keyboard Settings + kb_layout = "us", + numlock_by_default = true, + + -- # Mouse Settings + accel_profile = "flat", + force_no_accel = false, + follow_mouse = 1, + special_fallthrough = true, -- # This allows clicking windows behind a floating special window + sensitivity = 0, -- # -1.0 - 1.0, 0 means no modification. + }, + +-- MISC SETTINGS SHOULD BE GOOD + misc = { + force_default_wallpaper = 0, + animate_manual_resizes = false, --# If true makes resizing very slow! + animate_mouse_windowdragging = false, -- # Follows the custom bezier from animation{} windowsMove + mouse_move_enables_dpms = true, + key_press_enables_dpms = false, + enable_swallow = true, -- # Default is false + swallow_regex = "com.mitchellh.ghostty", -- # regex of class to be swallowed + focus_on_activate = false, -- # focus on an app that requests focus - default False + enable_anr_dialog = false, -- # Disables the App Not Responding Dialog + }, + + animations = { + enabled = true, + }, + + decoration = { + rounding = 7, + active_opacity = 1.0, + inactive_opacity = 0.53, + fullscreen_opacity = 1.0, + dim_inactive = false, + dim_special = 0.01, + + shadow = { + enabled = true, + }, + + blur = { + enabled = true, + size = 5, + passes = 3, + new_optimizations = on, + ignore_opacity = on, + special = false, + }, + }, + + dwindle = { + preserve_split = true, + }, + + master = { + new_status = "slave", + new_on_top = true, + }, + +-- # render { +-- # explicit_sync = 0 +-- # } + +-- cursor { +-- default_monitor = "DP-1", +-- }, +}) diff --git a/Gentoo/gentooamd/home/user/.config/hypr/hyprland/bind.lua b/Gentoo/gentooamd/home/user/.config/hypr/hyprland/bind.lua new file mode 100644 index 000000000..f9e47c8f6 --- /dev/null +++ b/Gentoo/gentooamd/home/user/.config/hypr/hyprland/bind.lua @@ -0,0 +1,79 @@ +-- local mainMod = "SUPER" +-- local home = os.getenv("HOME") + +hl.bind("SUPER + Return", hl.dsp.exec_cmd("ghostty")) +hl.bind("SUPER + ALT + Return", hl.dsp.exec_cmd("st")) +hl.bind("SUPER + SHIFT + Return", hl.dsp.exec_cmd("urxvt")) +hl.bind("SUPER + CTRL + SHIFT + Return", hl.dsp.exec_cmd("urxvt -bg 0 -fg 2 -cr blue -vb -sb -sr -st -bc -sl 5000 -fn 'xft:Bitstream Vera Sans Mono:size=14, xft:Hack Nerd Font Mono:size=12, xft:Font Awesome 6 Free:style=Solid'")) +-- hl.bind(" SUPER + SHIFT,Return,hl.dsp.exec_cmd("urxvt -bg 0 -fg 2 -cr blue -vb -sb -sr -st -bc -sl 5000 -fn "xft:Font Awesome:size=12" +-- hl.bind(" SUPER + SHIFT,Return,hl.dsp.exec_cmd("urxvt -bg 0 -fg 2 -cr blue -vb -sb -sr -st -bc -sl 5000 +-- hl.bind("SUPER + P), hl.dsp.exec_cmd("rofi '-show drun --with-images'")) +hl.bind("SUPER + SHIFT + W", hl.dsp.exec_cmd("librewolf")) +-- hl.bind(" SUPER + W,hl.dsp.exec_cmd("[workspace 3 silent] vivaldi + +hl.bind("SUPER + E", hl.dsp.exec_cmd("emopicker9000")) +hl.bind("SUPER + D", hl.dsp.exec_cmd("discord")) +hl.bind("SUPER + SHIFT +D", hl.dsp.exec_cmd("vesktop-bin")) +hl.bind("SUPER + M", hl.dsp.exec_cmd("[workspace 8 silent] spotify")) +hl.bind("SUPER + CTRL + N", hl.dsp.exec_cmd("/usr/bin/swaync-client -op")) +hl.bind("SUPER + SHIFT + Q", hl.dsp.window.close()) +-- #hl.bind(" SUPER + P,pseudo, +-- #hl.bind(" SUPER + SHIFT,I,togglesplit, +hl.bind("SUPER + F", hl.dsp.window.fullscreen()) +hl.bind(" SUPER + SHIFT + SPACE", hl.dsp.window.float()) +hl.bind(" SUPER + SHIFT + E", hl.dsp.exec_cmd("uwsm stop -r")) + +-- # Waybar +hl.bind("SUPER + B", hl.dsp.exec_cmd("pkill -10 waybar")) +hl.bind("SUPER + SHIFT + B", hl.dsp.exec_cmd("home" .. "/.local/bin/reset-waybar")) + +-- # Notification +hl.bind("SUPER + SHIFT + T", hl.dsp.exec_cmd("swaync-client -op")) + +-- # Screen Shots +hl.bind("SHIFT + PRINT", hl.dsp.exec_cmd("grimshot '--notify save area' ~/Pictures/Screenshots/$(date +%Y-%m-%d_%H-%M).png")) + +-- # Special Workspaces - like scrathpad, but named +hl.bind("SUPER + SHIFT + GRAVE", hl.dsp.window.move({ workspace = "special:term"})) +hl.bind("SUPER + GRAVE", hl.dsp.workspace.toggle_special("term")) + +-- # Background Selection +hl.bind(" SUPER + SHIFT + N", hl.dsp.exec_cmd("newbg")) + +-- # Navigation +for i = 1, 10 do + local key = i % 10 -- 10 maps to key 0 + hl.bind("SUPER + " .. key, hl.dsp.focus({ workspace = i})) + hl.bind("SUPER + " .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i })) +end +hl.bind("SUPER + SHIFT + right", hl.dsp.window.move({ monitor = "HDMI-A-1"})) -- Move active workspace to other monitor +hl.bind("SUPER + SHIFT + left", hl.dsp.window.move({ monitor = "DP-1"})) +-- hl.bind("SUPER + right", focusmonitor, +1) -- Switch monitor focus +-- hl.bind("SUPER + left, focusmonitor, -1) -- Switch monitor focus +hl.bind("SUPER + mouse_down", hl.dsp.focus({ workspace = "e+1"})) +hl.bind("SUPER + mouse_up", hl.dsp.focus({ workspace = "e-1"})) +hl.bind("SUPER + mouse:272", hl.dsp.window.drag(), { mouse = true }) +hl.bind("SUPER + mouse:273", hl.dsp.window.resize(), { mouse = true }) +-- hl.bind("ALT + Tab", cyclenext) +-- hl.bind("ALT + Tab", bringactivetotop) + +-- # Volume Control +hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+")) +hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-")) +hl.bind("XF86AudioMute", hl.dsp.exec_cmd(" wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")) +hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause")) +hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause")) +hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next")) +hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous")) +-- hl.bind(" SUPER + SHIFT + C", hl.dsp.exec_cmd("kitty -c '/home/ganome/.config/kitty/kittybg.conf' --class='kitty-bg' '/home/ganome/.local/bin/cava-float'")) + +-- # Clipboard Shortcuts +hl.bind("SUPER + V", hl.dsp.exec_cmd("cliphist list | wofi --dmenu | cliphist decode | wl-copy")) + +-- # Monitor Brightness +-- hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set 5%-")) +hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl set +5%")) + +-- # Keyboard Brightness +-- hl.bind("XF86KbdBrightnessUp", hl.dsp.exec_cmd("brightnessctl -d *::kbd_backlight set +20%")) +-- hl.bind(" ,XF86KbdBrightnessDown", hl.dsp.exec_cmd("brightnessctl -d *::kbd_backlight set 20%-")) diff --git a/Gentoo/gentooamd/home/user/.config/hypr/hyprland/exec.lua b/Gentoo/gentooamd/home/user/.config/hypr/hyprland/exec.lua new file mode 100644 index 000000000..94d0b6a98 --- /dev/null +++ b/Gentoo/gentooamd/home/user/.config/hypr/hyprland/exec.lua @@ -0,0 +1,17 @@ +hl.on("hyprland.start", function() + hl.exec_cmd("swaync") + -- exec-once = xrdb /home/ganome/.Xresources + -- exec-once = urxvtd --quiet --opendisplay --fork + hl.exec_cmd("swayidle -w timeout 720 'swaylock -f' timeout 800 'hyprctl dispatch dpms off' resume 'hyprctl dispatch dpms on' before-sleep 'swaylock -f -c 000000'") + -- exec-once = /home/ganome/.local/bin/reset-hyprpm + -- exec-once = dbus-update-activation-environment --systemd --all #This line os from hyprland wiki + -- exec-once = systemctl --user import-environment QT_QPA_PLATFORMTHEME WAYLAND_DISPLAY XDG_CURRENT_DESKTOP #This also comes from hyprland wiki and both involved themes for the share picker + -- exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP QT_QPA_PLATFORMTHEME #This is mirrored from two lines above - but the previous line does all the environment variables. + +-- REMOTE DESKTOP + -- exec-once = wayvnc -g -o DP-1 0.0.0.0 + +-- Clipboard history with Super+V + hl.exec_cmd("wl-paste --type text --watch cliphist store") + hl.exec_cmd("wl-paste --type image --watch cliphist store") +end) diff --git a/Gentoo/gentooamd/home/user/.config/hypr/hyprland/windowrule.lua b/Gentoo/gentooamd/home/user/.config/hypr/hyprland/windowrule.lua new file mode 100644 index 000000000..ed78fce27 --- /dev/null +++ b/Gentoo/gentooamd/home/user/.config/hypr/hyprland/windowrule.lua @@ -0,0 +1,135 @@ +-- # WINDOW RULES + +-- # XWayland Video Bridge +-- # windowrule = workspace 10 silent,class:^(xwaylandvideobridge)$ +-- # windowrule = opacity 0.0 override,class:^(xwaylandvideobridge)$ +-- # windowrule = noanim,class:^(xwaylandvideobridge)$ +-- # windowrule = noinitialfocus,class:^(xwaylandvideobridge)$ +-- # windowrule = maxsize 1 1,class:^(xwaylandvideobridge)$ +-- # windowrule = noblur,class:^(xwaylandvideobridge)$ +-- # windowrule = move 2000 1100,class:^(xwaylandvideobridge)$ + +-- #Blanket Rule to avoid screenlock if an app is fullscreen +-- #windowrule = idle_inhibit on, match:fullscreen 1 + +hl.window_rule ({ + name = "Cava_Rules", + match = { + class = "^(kitty-bg)$", + }, + opacity = "1.0", + float = true, + workspace = 10, + fullscreen = on +}) +hl.window_rule ({ + name = "Rofi_Rules", + match = { + class = "^(Rofi)$", + }, + float = true +}) + +hl.window_rule ({ + name = "POLKIT_Rules", + match = { + class = "^(org.kde.polkit-kde-authentication-agent-1)$" + }, + float = on, + opacity = 1 +}) + +hl.window_rule ({ + name = "Hyprland_Picker_Rules", + match = { + class = "^(hyprland-share-picker)$", + }, + float = on, + size = { 400, 250}, + center = on +}) + +hl.window_rule ({ + name = "Discord_Rules", + match = { + class = "^(vesktop||vesktop-bin|discord)$", + }, + opaque = true, + no_initial_focus = on, + workspace = 14, + fullscreen= on +}) + +hl.window_rule ({ + name = "Browser_Rules", + match = { + class = "^(LibreWolf)$", + }, + workspace = 3, + idle_inhibit = fullscreen, + fullscreen = on +}) + +hl.window_rule ({ + name = "Special_Rules", + match = { + class= "^(URxvt|kitty|com.mitchellh.ghostty)$", + }, + workspace = special, + float = on, + size = { 1520, 800 }, + center = on +}) + +-- window_rule ({ +-- name = "FragPunk Game", +-- match = { +-- title = "^(FragPunk)$", +-- }, +-- allows_input = on, +-- no_max_size = on, +-- float = on, +-- center = on, +-- size = 1920, 1080, +-- stay_focused = on +-- }) + +hl.window_rule ({ + name = "Minecraft", + match = { + class = "^(Minecraft)$", + }, + allows_input = on, + stay_focused = on +}) + +hl.window_rule ({ + name = "Ark Ascended", + match = { + class = "^(steam_app_2399830)$", + }, + fullscreen = off, + workspace = 2, + stay_focused = on +}) + +hl.window_rule ({ + name = "Steam Window", + match = { + class = "^(steam)$", + }, + float = on, + center = on, + workspace = 1 +}) + +-- ### RULES FOR GAMES ### +-- #RULE VALE DEFINITION +-- #allows_input [on] Forces an XWayland window to receive input, even if it requests not to do so. (Might fix issues like Game Launchers not receiving focus for some reason) +-- ##### +-- # Special Workspace Rules +-- #windowrule = workspace special,class:^(com.mitchellh.ghostty)$ +-- #windowrule = float,class:^(com.mitchellh.ghostty)$ +-- #windowrule = workspace special,class:^(kitty)$ +-- #windowrule = float,class:^(kitty)$ +-- # windowrule = workspace 5,class:^(kitty)$ diff --git a/Gentoo/gentooamd/home/user/.config/shellconfig/DOT-Files b/Gentoo/gentooamd/home/user/.config/shellconfig/DOT-Files index c16dabeea..36efc6d15 100644 --- a/Gentoo/gentooamd/home/user/.config/shellconfig/DOT-Files +++ b/Gentoo/gentooamd/home/user/.config/shellconfig/DOT-Files @@ -31,9 +31,9 @@ rsync -r /usr/src/linux/.config $HOME/Projects/$company/repos/DOT-Files/Gentoo/g cd /home/ganome/Projects/$company/repos/DOT-Files ; git pull ; git add .; - git commit -am "Automated updated process of shell scripts and DOT Files ($HOSTNAME)" ; - git push; - cd - ; +# git commit -am "Automated updated process of shell scripts and DOT Files ($HOSTNAME)" ; +# git push; +# cd - ; } replace-DOTFile() { #This command takes the git repo configs and moves them onto the local machine - in case remote edits were done and local machine needs updating