31 changed files with 81 additions and 223 deletions
--- a/electron-flags.conf
+++ b/electron-flags.conf
@ -1,2 +0,0 @@
--ozone-platform-hint=auto
--disable-lcd-text
--- a/electron18-flags.conf
+++ b/electron18-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron19-flags.conf
+++ b/electron19-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron20-flags.conf
+++ b/electron20-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron21-flags.conf
+++ b/electron21-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron22-flags.conf
+++ b/electron22-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron23-flags.conf
+++ b/electron23-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron24-flags.conf
+++ b/electron24-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron25-flags.conf
+++ b/electron25-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron26-flags.conf
+++ b/electron26-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron27-flags.conf
+++ b/electron27-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron28-flags.conf
+++ b/electron28-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron29-flags.conf
+++ b/electron29-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/electron30-flags.conf
+++ b/electron30-flags.conf
@ -1 +0,0 @@
-electron-flags.conf
--- a/gtk-2.0/gtkfilechooser.ini
+++ b/gtk-2.0/gtkfilechooser.ini
@ -2,7 +2,7 @@
 LocationMode=path-bar
 ShowHidden=false
 ShowSizeColumn=true
-GeometryX=4016
+GeometryX=5936
 GeometryY=763
 GeometryWidth=926
 GeometryHeight=657
--- a/gtk-3.0/bookmarks
+++ b/gtk-3.0/bookmarks
@ -1,9 +1,10 @@
-file:///home/moonleay/src
 file:///home/moonleay/Downloads
+file:///home/moonleay/IdeaProjects
+file:///home/moonleay/RiderProjects
+file:///home/moonleay/RustroverProjects
+file:///home/moonleay/CLionProjects
 file:///home/moonleay/Documents
 file:///home/moonleay/Pictures
 file:///home/moonleay/Pictures/Screenshots
 file:///home/moonleay/Music
 file:///home/moonleay/Videos
-file:///home/moonleay/.gradle
-file:///home/moonleay/.ssh
--- a/gtk-3.0/settings.ini
+++ b/gtk-3.0/settings.ini
@ -1,6 +1,6 @@
 [Settings]
-gtk-theme-name=adw-gtk3-dark
-gtk-icon-theme-name=Adwaita
+gtk-theme-name=Catppuccin-Mocha-Standard-Blue-Dark
+gtk-icon-theme-name=breeze-dark
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=24
@ -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
--- a/hypr/autorun.conf
+++ b/hypr/autorun.conf
@ -1,15 +1,10 @@
 # Autorun apps
-exec-once = dunst & waybar & hypridle & hyprpaper
+exec-once = dunst & hyprpaper & waybar
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = hyprctl setcursor Adwaita 24
-exec-once = gsettings set org.gnome.desktop.interface cursor-theme 'adwaita'
-exec-once = gsettings set org.gnome.desktop.interface cursor-size '24'
-exec-once = bash /home/moonleay/.config/hypr/hyprland/scripts/fixXwaylandVideoBridge.sh
+exec-once = zsh /home/moonleay/.config/hypr/hyprland/scripts/fixXwaylandVideoBridge.sh
 exec-once = solaar -w hide
 exec-once = setxkbmap -model 'pc105angle' -layout 'us' -variant 'cmk_ed_us' -option'' -option 'misc:extend,lv5:caps_switch_lock,grp:shifts_toggle,compose:menu,misc:cmk_curl_dh'
-exec-once = xwaylandvideobridge
-# exec-once = discord & librewolf
-# exec-once = flatpak run org.kde.xwaylandvideobridge
+exec-once = flatpak run org.kde.xwaylandvideobridge
 # exec-once = gBar bar 0 & gBar bar 1 & gBar bar 2
 # exec-once = /usr/lib/polkit-kde-authentication-agent-1
-exec-once = /usr/bin/arrpc
--- a/hypr/basics.conf
+++ b/hypr/basics.conf
@ -2,9 +2,8 @@
 general {
    gaps_in = 5
    gaps_out = 10 #20
-    border_size = 2 # 2
-    col.active_border = rgba(0168ceee) rgba(015ebaee) 45deg
-    # col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    border_size = 2
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
    col.inactive_border = rgba(595959aa)

    layout = dwindle
@ -13,26 +12,24 @@ general {

 # Window decorations
 decoration {
-    rounding = 2 #4 # 5
+    rounding = 5
    
    blur {
    	# Disable blur for battery saving
-        enabled = false # true
+        enabled = false
        size = 3
        passes = 1
    }

-    shadow {
-    	enabled = yes
-	range = 4
-	render_power = 3
-	color = rgba(1a1a1aee)
-    }
+    drop_shadow = yes
+    shadow_range = 4
+    shadow_render_power = 3
+    col.shadow = rgba(1a1a1aee)
 }

 # Window animations
 animations {
-    enabled = yes # yes
+    enabled = yes

    bezier = myBezier, 0.05, 0.9, 0.1, 1.05

@ -51,7 +48,7 @@ dwindle {
 }

 master {
-    new_status = master
+    new_is_master = true
 }

 gestures {
--- a/hypr/env_vars.conf
+++ b/hypr/env_vars.conf
@ -2,25 +2,11 @@
 env = MOZ_ENABLE_WAYLAND,1
 env = MOZ_DISABLE_RDD_SANDBOX,1
 env = WLR_DRM_NO_ATOMIC,1
-env = GDK_BACKEND,wayland,x11,*
-env = QT_QPA_PLATFORM,wayland;xcb
-env = SDL_VIDEODRIVER,wayland
-env = CLUTTER_BACKEND,wayland
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-env = QT_QPA_PLATFORMTHEME,qt5ct
-
-env = HYPRCURSOR_THEME,adwaita
-env = HYPRCURSOR_SIZE,24
-env = XCURSOR_THEME,adwaita
-env = XCURSOR_SIZE,24
+env = GDK_BACKEND=wayland,x11
+env = QT_QPA_PLATFORM="wayland;xcb"
+env = SDL_VIDEODRIVER=wayland
+env = CLUTTER_BACKEND=wayland
+env = XDG_CURRENT_DESKTOP=Hyprland
+env = XDG_SESSION_TYPE=wayland
+env = XDG_SESSION_DESKTOP=Hyprland
 # env = ENABLE_DEVICE_CHOOSER_LAYER=1 VULKAN_DEVICE_INDEX=0
-
-env = KITTY_DISABLE_WAYLAND,1
-
-#env=SDL_VIDEODRIVER,wayland osu-lazer
--- a/hypr/hypridle.conf
+++ b/hypr/hypridle.conf
@ -1,14 +0,0 @@
-general {
-    lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session)
-    unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = notify-send "Zzz"    # command ran before sleep
-    after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
-    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
-    ignore_systemd_inhibit = false          # whether to ignore systemd-inhibit --what=idle inhibitors
-}
-
-listener {
-    timeout = 10 # 500                            # in seconds
-    on-timeout = notify-send "You are idle!" # command to run when timeout has passed
-    on-resume = notify-send "Welcome back!"  # command to run when activity is detected after timeout has fired.
-}
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@ -23,9 +23,5 @@ misc {
    vfr = true
 }

-debug {
-    disable_logs = true
-}
-
 # Per device configs
 # <none>
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@ -1,15 +1,16 @@
-preload = ~/Pictures/Wallpaper/GOUKlfP.jpg
+preload = ~/Pictures/Wallpaper/cityx4.png

 #if more than one preload is desired then continue to preload other backgrounds
 #preload = /path/to/next_image.png
 # .. more preloads

 #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used
-# wallpaper = eDP-2,~/Pictures/Wallpaper/cityx4.png
-# wallpaper = eDP-1,~/Pictures/Wallpaper/somerndm.jpg
-# wallpaper = DP-2,~/Pictures/Wallpaper/somerndm.jpg
-wallpaper = desc:LG Electronics LG TV SSCR2 0x01010101,~/Pictures/Wallpaper/GOUKlfP.jpg
-wallpaper = desc:BOE 0x0BC9,~/Pictures/Wallpaper/GOUKlfP.jpg
+wallpaper = eDP-2,~/Pictures/Wallpaper/cityx4.png
+wallpaper = eDP-1,~/Pictures/Wallpaper/cityx4.png
+wallpaper = DP-1,~/Pictures/Wallpaper/cityx4.png
+wallpaper = HDMI-A-1,~/Pictures/Wallpaper/cityx4.png
+#if more than one monitor in use, can load a 2nd image
+# .. more monitors


 splash = true
--- a/hypr/input.conf
+++ b/hypr/input.conf
@ -2,13 +2,11 @@
 input {
    kb_layout = us
    kb_model = pc105angle
-
-    #kb_variant = colemak_dh
-
+    # kb_variant = colemak_dh
    kb_variant = cmk_ed_us
    kb_options = misc:extend, lv5:caps_switch_lock, grp:shifts_toggle, compose:menu, misc:cmk_curl_dh 

-    repeat_rate = 60
+    repeat_rate = 40
    repeat_delay = 200

    kb_file =
@ -22,6 +20,6 @@ input {
        natural_scroll = yes
    }

-    sensitivity = 0 # -0.2 #0 # -1.0 - 1.0, 0 means no modification.
+    sensitivity = -0.2 #0 # -1.0 - 1.0, 0 means no modification.
    accel_profile = flat
 }
--- a/hypr/keybindings.conf
+++ b/hypr/keybindings.conf
@ -1,56 +1,43 @@
 # Keymappings
 $mainMod = SUPER
-$secondaryMod = Alt_L

 # Custom mappings

 # Shutdown / Reboot
-bind = $secondaryMod, XF86Eject, exec, shutdown now
-bind = $secondaryMod SHIFT, XF86Eject, exec, reboot
-bind = $secondaryMod, XF86Launch1, exec, shutdown now
-bind = $secondaryMod SHIFT, XF86Launch1, exec, reboot
+bind = $mainMod, XF86Eject, exec, shutdown now
+bind = $mainMod SHIFT, XF86Eject, exec, reboot
+bind = $mainMod, XF86Launch1, exec, shutdown now
+bind = $mainMod SHIFT, XF86Launch1, exec, reboot

-# Music control
+# Music controll
 bind = , XF86Tools, exec, playerctl previous
 bind = , XF86Launch5, exec, playerctl play-pause
 bind = , XF86Launch6, exec, playerctl next

 # Run "overlay apps"
-bind = CTRL ALT_L, DELETE, exec, swaylock
-bind = $secondaryMod SHIFT, s, exec, grim -g "$(slurp)" -c "/home/moonleay/Pictures/Screenshots/$(date +'%s_grim.png')"
-bind = $secondaryMod Control_L, s, exec, grim -c "/home/moonleay/Pictures/Screenshots/$(date +'%s_grim_full.png')"
-
-# (Re)enable Colemak-dh
-bind = ALT_L, SPACE, exec, setxkbmap -model 'pc105angle' -layout 'us' -variant 'cmk_ed_us' -option'' -option 'misc:extend,lv5:caps_switch_lock,grp:shifts_toggle,compose:menu,misc:cmk_curl_dh'
+bind = CTRL ALT, DELETE, exec, swaylock
+bind = $mainMod SHIFT, s, exec, grim -g "$(slurp)" -c "/home/moonleay/Pictures/Screenshots/$(date +'%s_grim.png')"
+bind = ALT SHIFT, s, exec, grim -c "/home/moonleay/Pictures/Screenshots/$(date +'%s_grim_full.png')"

 # Run application
-bind = $secondaryMod, q, exec, librewolf
+bind = $mainMod SHIFT, q, exec, librewolf

 # Force app fullsceen
-bind = ALT_L, f, fullscreen, 0
-bind = ALT_L SHIFT, f, fullscreenstate, 0 2 # This is for a future version of hyprland, in case it does not fuck up cursors again!
-bind = ALT_L, p, fullscreenstate, 1 1
-# bind = ALT_L CONTROL_L, f, fullscreenstate, 1 1
-# bind = ALT_L SHIFT, f, fakefullscreen
+bind = ALT_L, f, fullscreen
+bind = ALT_L SHIFT, f, fakefullscreen

 # Custom rofi
-bind = $secondaryMod, TAB, exec, rofi -show window -show-icons
+bind = $mainMod, TAB, exec, rofi -show window -show-icons

-# Exit applications
+# Default Mappings
+bind = $mainMod, Q, exec, alacritty 
 bind = $mainMod, C, killactive, 
-bind = $secondaryMod, C, killactive, 
-bind = $secondaryMod, M, exit, 
-
-# Run applications
-bind = $secondaryMod, T, exec, alacritty 
-bind = $secondaryMod, E, exec, thunar
-
-# Control open applications
-bind = $secondaryMod, V, togglefloating, 
+bind = $mainMod, M, exit, 
+bind = $mainMod, E, exec, thunar
 bind = $mainMod, V, togglefloating, 
-bind = $secondaryMod, R, exec, rofi -show drun -show-icons
-bind = $secondaryMod, B, pseudo, # dwindle
-bind = $secondaryMod, J, togglesplit, # dwindle
+bind = $mainMod, R, exec, rofi -show drun -show-icons
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, togglesplit, # dwindle

 # Move the window focus
 bind = $mainMod, left, movefocus, l
@ -87,43 +74,24 @@ bind = $mainMod SHIFT, minus, movetoworkspace, 11
 bind = $mainMod SHIFT, equal, movetoworkspace, 12

 # Move window to other workspace, but silent
-bind = $mainMod Control, 1, movetoworkspacesilent, 1
-bind = $mainMod Control, 2, movetoworkspacesilent, 2
-bind = $mainMod Control, 3, movetoworkspacesilent, 3
-bind = $mainMod Control, 4, movetoworkspacesilent, 4
-bind = $mainMod Control, 5, movetoworkspacesilent, 5
-bind = $mainMod Control, 6, movetoworkspacesilent, 6
-bind = $mainMod Control, 7, movetoworkspacesilent, 7
-bind = $mainMod Control, 8, movetoworkspacesilent, 8
-bind = $mainMod Control, 9, movetoworkspacesilent, 9
-bind = $mainMod Control, 0, movetoworkspacesilent, 10
-bind = $mainMod Control, minus, movetoworkspacesilent, 11
-bind = $mainMod Control, equal, movetoworkspacesilent, 12
+bind = Alt_L, 1, movetoworkspacesilent, 1
+bind = Alt_L, 2, movetoworkspacesilent, 2
+bind = Alt_L, 3, movetoworkspacesilent, 3
+bind = Alt_L, 4, movetoworkspacesilent, 4
+bind = Alt_L, 5, movetoworkspacesilent, 5
+bind = Alt_L, 6, movetoworkspacesilent, 6
+bind = Alt_L, 7, movetoworkspacesilent, 7
+bind = Alt_L, 8, movetoworkspacesilent, 8
+bind = Alt_L, 9, movetoworkspacesilent, 9
+bind = Alt_L, 0, movetoworkspacesilent, 10
+bind = Alt_L, minus, movetoworkspacesilent, 11
+bind = Alt_L, equal, movetoworkspacesilent, 12

 # Scroll through workspaces
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1

-# extend specific
-bind = MOD3SUPER, n, movefocus, l
-bind = MOD3SUPER, i, movefocus, r
-bind = MOD3SUPER, u, movefocus, u
-bind = MOD3SUPER, e, movefocus, d
-
-bind = MOD3SUPERCTRL, l, togglespecialworkspace
-bind = MOD3SUPERCTRL, y, focuscurrentorlast
-bind = MOD3SUPERCTRL, i, workspace, r+1
-bind = MOD3SUPERCTRL, n, workspace, r-1
-
-bind = MOD3SUPERCTRLSHIFT, l, movetoworkspace, 1
-bind = MOD3SUPERCTRLSHIFt, y, movetoworkspace, e+1
-bind = MOD3SUPERCTRLSHIFT, i, movetoworkspace, +1
-bind = MOD3SUPERCTRLSHIFT, n, movetoworkspace, -1
-
 # Move and scale workspaces
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow

-
-bindm = $secondaryMod, mouse:272, movewindow
-bindm = $secondaryMod, mouse:273, resizewindow
--- a/hypr/monitors.conf
+++ b/hypr/monitors.conf
@ -1,8 +1,7 @@
 # Monitors
-monitor=,preferred,auto,auto
-# monitor=eDP-2,preferred,0x0,2
-monitor=desc:BOE 0x0BC9,2560x1600@165,0x0,1.6 # 1.6
-#monitor=desc:LG Electronics LG TV SSCR2 0x01010101,3840x2160@120,-3072x0,1.25 # 1.2
-monitor=desc:LG Electronics LG TV SSCR2 0x01010101,3840x2160@120,1600x0,1.25 # 1.2
-# monitor=HDMI-A-1,preferred,4480x0,1
+# monitor=,preferred,auto,auto
+monitor=eDP-2,preferred,0x0,2
+monitor=eDP-1,preferred,0x0,2
+monitor=DP-1,3840x2160@120,1280x0,1.2
+monitor=HDMI-A-1,preferred,4480x0,1
 # monitor=HDMI-A-1,3440x1440@100,1280x0,1
--- a/hypr/windowrules.conf
+++ b/hypr/windowrules.conf
@ -1,7 +1,5 @@
 # Windowrules
 windowrulev2 = immediate, class:^(minecraft)$
-#windowrulev2 = workspace 2, monitor 1, class:^(LibreWolf)$
-#windowrulev2 = workspace 1, monitor 1, class:^(discord)$

 # Screensharing
 windowrulev2 = opacity 0.0 override 0.0 override,class:^(xwaylandvideobridge)$
@ -11,7 +9,7 @@ windowrulev2 = noinitialfocus,class:^(xwaylandvideobridge)$

 # -- Fix odd behaviors in IntelliJ IDEs --
 #! Fix focus issues when dialogs are opened or closed
-# windowrulev2 = windowdance,class:^(jetbrains-.*)$,floating:1
+windowrulev2 = windowdance,class:^(jetbrains-.*)$,floating:1
 #! Fix splash screen showing in weird places and prevent annoying focus takeovers
 windowrulev2 = center,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
 windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(splash)$,floating:1
@ -23,5 +21,3 @@ windowrulev2 = stayfocused,class:^(jetbrains-.*)$,title:^( )$,floating:1
 windowrulev2 = noborder,class:^(jetbrains-.*)$,title:^( )$,floating:1
 #! Disable window flicker when autocomplete or tooltips appear
 windowrulev2 = nofocus,class:^(jetbrains-.*)$,title:^(win.*)$,floating:1
-
-# windowrulev2 = suppressevent maximize, class:.*
--- a/waybar/config
+++ b/waybar/config
@ -34,10 +34,10 @@
 	"format": "{:%I:%M %p}",
    },
    "cpu": {
-        "format": "  {usage}%",
+        "format": " {usage}%",
    },
    "memory": {
-        "format": "  {}%"
+        "format": " {}%"
    },
    "temperature": {
        "thermal-zone": 2,
@ -50,7 +50,7 @@
    "backlight": {
        // "device": "acpi_video1",
        "format": "{icon} {percent}%",
-        "format-icons": [" ", " ", " ", " ", " ", " ", " ", " ", " "]
+        "format-icons": ["", "", "", "", "", "", "", "", ""]
    },
    "battery": { 
        "states": {
@ -64,7 +64,7 @@
        "format-alt": "{icon} {time}",
        // "format-good": "", // An empty format will hide the module
        "format-full": "Full",
-        "format-icons": ["  ", "  ", "  ", "  ", "  "]
+        "format-icons": [" ", " ", " ", " ", " "]
    },
    "network": {
        // "interface": "wlp2*", // (Optional) To force the use of this interface
@ -90,7 +90,7 @@
 //            "phone": "",
 //            "portable": "",
 //            "car": "",
-            "default": [" ", " ", "  "]
+            "default": ["", "", " "]
        },
        "on-click": "pavucontrol"
    },
--- a/waybar/modules/spotify.sh
+++ b/waybar/modules/spotify.sh
@ -18,7 +18,7 @@ fi
 classa=$(playerctl metadata --player=spotify --format '{{lc(status)}}')

 if [[ $classa == "playing" ]]; then
-  icon=" "
+  icon=""  
  info=$(playerctl metadata --player=spotify --format '{{artist}} - {{title}}')
  if [[ ${#info} > 40 ]]; then
    info=$(echo $info | cut -c1-40)"..."
--- a/zed/keymap.json
+++ b/zed/keymap.json
@ -1,3 +0,0 @@
-[
-  
-]
--- a/zed/settings.json
+++ b/zed/settings.json
@ -1,47 +0,0 @@
-// Zed settings
-//
-// For information on how to configure Zed, see the Zed
-// documentation: https://zed.dev/docs/configuring-zed
-//
-// To see all of Zed's default settings without changing your
-// custom settings, run the `open default settings` command
-// from the command palette or from `Zed` application menu.
-{
-  "features": {
-    "inline_completion_provider": "none"
-  },
-  "project_panel": {
-    "dock": "right"
-  },
-  "theme": "Catppuccin Mocha",
-  "telemetry": {
-    "diagnostics": false,
-    "metrics": false
-  },
-  "vim_mode": true,
-  "vertical_scroll_margin": 5,
-  "ui_font_size": 16,
-  "buffer_font_size": 16,
-  // "ui_font_family": " Mono",
-  // "buffer_font_family": "LiberationMono",
-  "autosave": "on_focus_change",
-  "auto_update": false,
-  "tab_bar": {
-    "show_nav_history_buttons": false,
-    "show": true
-  },
-  "toolbar": {
-    "quick_actions": false
-  },
-  "chat_panel": {
-    "button": false
-  },
-  "collaboration_panel": {
-    "button": false
-  },
-  "assistant": {
-    "enabled": false,
-    "version": "1"
-  },
-  "relative_line_numbers": true
-}