conflict resolution

328p1aa/home/.config/sway-profiles/config.d/328p1aa

@@ -1 +1 @@
-lock_monitor='DP-2'
+lock_monitor='DP-1'

328p1aa/home/.config/sway/config.d/display.d/328p1aa

@@ -1,4 +1,4 @@
-output DP-2 {
+output 'LG Electronics LG ULTRAWIDE 206NTGYBG503' {
   #ultrawide
   scale 1
   mode 3440x1440@60Hz
@@ -7,7 +7,7 @@ output DP-2 {
 #exec_always 'sleep 1;eww open --screen "LG ULTRAWIDE" bar'
 
 #output HDMI-A-1 {
-output DP-1 {
+output 'Philips Consumer Electronics Company PHL 278E1 0x0000EB29' {
   #Vertical 4k
   scale 1
   mode 3840x2160@75Hz
@@ -15,7 +15,7 @@ output DP-1 {
   pos 0 0
 }
 
-output HDMI-A-1 {
+output 'OOO CR270CU 0x00000001' {
 #output DP-3 {
   #1080p
   scale 1
@@ -25,12 +25,12 @@ output HDMI-A-1 {
 #exec_always 'sleep 1;eww open --screen "CR270CU" home'
 
 set {
-  $primary_display DP-2
-  $overview_display DP-2
+  $primary_display DP-1
+  $overview_display DP-1
 }
 
 workspace {
-  1:$profile_icon output DP-2
-  2:$profile_icon output DP-1
+  1:$profile_icon output DP-1
+  2:$profile_icon output DP-2
   3:$profile_icon output HDMI-A-1
 }

de/home/.config/environment.d/wayland.conf

@@ -15,5 +15,6 @@ COIN_GL_NO_CURRENT_CONTEXT_CHECK=1
 # QT theme
 SAL_USE_VCLPLUGIN="qt6"
 QT_QPA_PLATFORMTHEME=qt6ct
+QT_QPA_PLATFORMTHEME_QT6=qt6ct
 GTK_THEME=pogmom-gtk
 DIALOG=kdialog

de/home/.config/eww/modules/bar/profile.yuck

@@ -3,5 +3,5 @@
 (defwidget profile []
   (button :onclick "sp-profiles next"
           :tooltip "${active_profile_name}"
-          :class "profile ${((active_profile_name == 'Work') ? 'profile-work' : ((active_profile_name == 'Housing') ? 'profile-housing' : ((active_profile_name == 'Development') ? 'profile-development' : ((active_profile_name == 'Personal') ? 'profile-personal' : ''))))}"
+          :class "profile ${((active_profile_name == 'Work') ? 'profile-work' : ((active_profile_name == 'Housing') ? 'profile-school' : ((active_profile_name == 'Development') ? 'profile-development' : ((active_profile_name == 'Personal') ? 'profile-personal' : ''))))}"
     {active_profile}))

de/home/.config/eww/modules/bar/workspaces.yuck

@@ -8,7 +8,7 @@
   (eventbox
     :onhover "${EWW_CMD} update wsreveal=true"
     :onhoverlost "${EWW_CMD} update wsreveal=false"
-    (box :class "workspaces ${((activeWorkspace > '30') ? 'profile-work' : ((activeWorkspace > '20') ? 'profile-housing' : ((activeWorkspace > '10') ? 'profile-development' : ((activeWorkspace > '0') ? 'profile-personal' : ''))))}"
+    (box :class "workspaces ${((activeWorkspace > '30') ? 'profile-work' : ((activeWorkspace > '20') ? 'profile-school' : ((activeWorkspace > '10') ? 'profile-development' : ((activeWorkspace > '0') ? 'profile-personal' : ''))))}"
          :orientation "h"
          :space-evenly false
          :halign "start"
@@ -42,7 +42,7 @@
 
 (defwidget workspace [ws side ?lastws ?firstws]
   (button :onclick `swaymsg workspace "${ws.name}"`
-    :class '${side} ${ws.num == lastws ? "last-workspace" : (ws.num == firstws ? "first-workspace" : "middle-workspace")} ${((ws.num > '30') ? 'profile-work' : ((ws.num > '20') ? 'profile-housing' : ((ws.num > '10') ? 'profile-development' : ((ws.num > '0') ? 'profile-personal' : ''))))}'
+    :class '${side} ${ws.num == lastws ? "last-workspace" : (ws.num == firstws ? "first-workspace" : "middle-workspace")} ${((ws.num > '30') ? 'profile-work' : ((ws.num > '20') ? 'profile-school' : ((ws.num > '10') ? 'profile-development' : ((ws.num > '0') ? 'profile-personal' : ''))))}'
     (box
       '${replace(ws.name,".*:","")}'
       (label

de/home/.config/eww/style/bar/workspaces.scss

@@ -1,6 +1,6 @@
 $personal-color: $bar-bg-color;
 $development-color: mix($color9, $color12);
-$housing-color: mix($color5, $color3);
+$school-color: mix($color5, $color3);
 $work-color: mix($color5, $color4, 30%);
 
 .profile,
@@ -13,8 +13,8 @@ $work-color: mix($color5, $color4, 30%);
   &.profile-development {
     border-color: $development-color;
   }
-  &.profile-housing {
-    border-color: $housing-color;
+  &.profile-school {
+    border-color: $school-color;
   }
   &.profile-work {
     border-color: $work-color;
@@ -28,7 +28,7 @@ $work-color: mix($color5, $color4, 30%);
   padding: 0px 10px;
   transition: 0.3s all;
   &.profile-development,
-  &.profile-housing,
+  &.profile-school,
   &.profile-work {
     color: $bar-module-fg-color;
   }
@@ -38,8 +38,8 @@ $work-color: mix($color5, $color4, 30%);
   &.profile-development {
     background-color: $development-color;
   }
-  &.profile-housing {
-    background-color: $housing-color;
+  &.profile-school {
+    background-color: $school-color;
   }
   &.profile-work {
     background-color: $work-color;
@@ -60,9 +60,9 @@ $work-color: mix($color5, $color4, 30%);
         background-color: $development-color;
         border-color: $development-color;
       }
-      &.profile-housing {
-        background-color: $housing-color;
-        border-color: $housing-color;
+      &.profile-school {
+        background-color: $school-color;
+        border-color: $school-color;
       }
       &.profile-work {
         background-color: $work-color;
@@ -108,9 +108,9 @@ $work-color: mix($color5, $color4, 30%);
         color: $development-color;
         border-color: $development-color;
       }
-      &.profile-housing {
-        color: $housing-color;
-        border-color: $housing-color;
+      &.profile-school {
+        color: $school-color;
+        border-color: $school-color;
       }
       &.profile-work {
         color: $work-color;
@@ -124,8 +124,8 @@ $work-color: mix($color5, $color4, 30%);
         &.profile-development {
           background-color: rgba($development-color,0.5);
         }
-        &.profile-housing {
-          background-color: rgba($housing-color,0.5);
+        &.profile-school {
+          background-color: rgba($school-color,0.5);
         }
         &.profile-work {
           background-color: rgba($work-color,0.5);

de/home/.config/katerc

@@ -172,10 +172,10 @@ SetEditor=false
 1920x1200 screen: Width=922
 2 screens: Height=1119
 2 screens: Width=490
-2048x1280 screen: Height=592
-2048x1280 screen: Width=574
-3 screens: Height=815
-3 screens: Width=1296
+2048x1280 screen: Height=1199
+2048x1280 screen: Width=433
+3 screens: Height=672
+3 screens: Width=1056
 
 [filetree]
 editShade=183,220,246

de/home/.config/kdeglobals

@@ -1,6 +1,9 @@
 [$Version]
 update_info=filepicker.upd:filepicker-remove-old-previews-entry
 
+[UiSettings]
+ColorScheme=*
+
 [Colors:View]
 BackgroundNormal=215,175,175,0
 
@@ -12,6 +15,7 @@ Theme=breeze-dark
 
 [KDE]
 ShowDeleteCommand=false
+widgetStyle=qt6ct-style
 
 [KFileDialog Settings]
 Allow Expansion=false
@@ -36,6 +40,3 @@ Dialog Size=600,480
 [PreviewSettings]
 EnableRemoteFolderThumbnail=true
 MaximumRemoteSize=3221225472
-
-[UiSettings]
-ColorScheme=*

de/home/.config/qt6ct/qt6ct.conf

@@ -31,7 +31,7 @@ geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\xca\0\0\x2k\
 geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x2\x82\0\0\x1\xf2)
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xb1\0\0\x2'\0\0\0\0\0\0\0\0\0\0\x3\xb1\0\0\x2'\0\0\0\0\0\0\0\0\a\x80\0\0\0\0\0\0\0\0\0\0\x3\xb1\0\0\x2')
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\x3\xec\0\0\x4u\0\0\0\0\0\0\0\0\0\0\x3\xec\0\0\x4u\0\0\0\0\0\0\0\0\b\0\0\0\0\0\0\0\0\0\0\0\x3\xec\0\0\x4u)
 
 [Troubleshooting]
 force_raster_widgets=1

de/home/.config/sway-profiles/profile_list

@@ -1,4 +1,4 @@
  Personal
  Development
-󰻺 Housing
+ School
  Work

de/home/.config/sway/config.d/autostart

@@ -12,8 +12,8 @@ exec {
   udiskie -at
   'sleep 5;nextcloud --background'
   'sleep 5;flatpak run com.hunterwittenborn.Celeste --background'
-  'sleep 5;rssguard'
-  'sleep 5;tokodon'
+#  'sleep 5;rssguard'
+#  'sleep 5;tokodon'
   'sleep 5;gtk-launch org.signal.Signal'
   'diskspace-check'
   'uptime-check'

de/home/.config/sway/config.d/keys.d/launch

@@ -4,7 +4,7 @@ bindsym {
 #terminal
   $mod+Return exec $term
 #floating terminal
-  $mod+Shift+Return exec $HOME/.config/sway/scripts/exec-float $term floating toggle
+  $mod+Shift+Return exec $HOME/.config/sway/scripts/exec-float $term
 #launcher
   $mod+d exec $menu
 #launcher reload

de/home/.config/sway/config.d/window_rules

@@ -46,7 +46,7 @@ for_window {
 
 #float - float
   [app_id="xdg-desktop-portal-gtk"] $float
-#  [app_id="Alacritty_Float"] $float
+  [class="^feh$"] $float
   [app_id="org.kde.dolphin" title="^Extracting Files"] $float
   [app_id="gurk-rs"] $float
 
@@ -61,18 +61,15 @@ for_window {
 
 #scratch
   [app_id="vesktop"] $scratch
+  [class="^Signal$"] $scratch
   [app_id="^org.signal.Signal$"] $scratch
   [app_id="^signal$"] $scratch
-#  [app_id="org.keepassxc.KeePassXC" title="^(?!.*(Unlock Database|Browser Access Request|\[Locked\])).*$"] $scratch
-#  [app_id="org.keepassxc.KeePassXC" title="^(?!.*(Unlock Database|Browser Access Request|\[Locked\])).* - KeePassXC$"] $scratch
 }
 
 assign {
 #home workspace assignment
   [app_id="org.kde.tokodon"] $home_ws
   [app_id="io.github.martinrotter.rssguard"] $home_ws
-#browser profile assignment
-#  [app_id="LibreWolf_Work"] $work_ws
 }
 
 no_focus [title="^Picture-in-Picture$"]

de/home/.config/sway/config.d/workspaces

@@ -6,7 +6,7 @@ bindsym {
 #profile keybinds
   $mod+p exec "sp-profiles Personal"
   $mod+Bracketleft exec "sp-profiles Development"
-  $mod+Bracketright exec "sp-profiles Housing"
+  $mod+Bracketright exec "sp-profiles School"
   $mod+Backslash exec "sp-profiles Work"
 #workspace cycle keybinds
   $mod+Tab workspace next

de/home/.config/sway/scripts/exec-float

@@ -1,8 +1,24 @@
-#!/bin/sh
+#!/bin/bash
 eval "$1 &"
-saved=$!
-echo $saved; shift
-swaymsg for_window [pid=$saved] "$@"
+pid=$!
+echo $pid
+
+active_screen_dim="$(swaymsg -t get_outputs | jq -r '.. | select(.type?) | select(.focused==true).rect')"
+active_screen_width="$(jq '.width' <<<${active_screen_dim})"
+active_screen_height="$(jq '.height' <<<${active_screen_dim})"
+if [[ "${active_screen_width}" -gt "${active_screen_height}" ]];then
+  win_height=$(( active_screen_height * 60 / 100 ))
+  win_width=$(( win_height * 175 / 100 ))
+else
+  win_width=$(( active_screen_width * 60 / 100 ))
+  win_height=$(( win_width * 57 / 100 ))
+fi
+swaymsg "[pid=$pid]" "floating enable, resize set ${win_width}px ${win_height}px"
 while [ "$?" = "2" ];do
-  swaymsg for_window [pid=$saved] "$@"
+  swaymsg "[pid=$pid]" "floating enable, resize set ${win_width}px ${win_height}px"
 done
+swaymsg -t get_tree | jq ".. | select(.type?) | select((.pid==${pid}) and (.rect.height==${win_height} | not)).id" | grep ''
+while [ "$?" = "1" ];do
+  swaymsg -t get_tree | jq ".. | select(.type?) | select((.pid==${pid}) and (.rect.height==${win_height} | not)).id" | grep ''
+done
+swaymsg "[pid=$pid]" "resize set ${win_width}px ${win_height}px, move position center"

de/home/.config/sway/scripts/exec-float.bak

@@ -0,0 +1,8 @@
+#!/bin/sh
+eval "$1 &"
+pid=$!
+echo $pid; shift
+swaymsg "[pid=$pid]" "$@"
+while [ "$?" = "2" ];do
+  swaymsg "[pid=$pid]" "$@"
+done

de/home/.config/sway/scripts/floating_toggle.sh

@@ -1,14 +1,19 @@
 #!/bin/bash
 
+active_window_type="$(swaymsg -t get_tree | jq -r '.. | select(.type?) | select(.focused==true).type')"
 swaymsg floating toggle
-active_window_scratchstate="$(swaymsg -t get_tree | jq -r '.. | select(.type?) | select(.focused==true).type')"
-if [[ "${active_window_type}" == "floating_con" ]];then
+if [[ "${active_window_type}" == "con" ]];then
   active_screen_dim="$(swaymsg -t get_outputs | jq -r '.. | select(.type?) | select(.focused==true).rect')"
   active_screen_width="$(jq '.width' <<<${active_screen_dim})"
   active_screen_height="$(jq '.height' <<<${active_screen_dim})"
   if [[ "${active_screen_width}" -gt "${active_screen_height}" ]];then
-    swaymsg resize set 50ppt 50ppt
+    #landscape
+    win_height=$(( active_screen_height * 60 / 100 ))
+    win_width=$(( win_height * 175 / 100 ))
   else
-    swaymsg resize set 75ppt 25ppt
+    #portrait
+    win_width=$(( active_screen_width * 60 / 100 ))
+    win_height=$(( win_width * 57 / 100 ))
   fi
+  swaymsg "resize set ${win_width}px ${win_height}px, move position center"
 fi

de/home/.fonts/.uuid

@@ -1 +1 @@
-72299e7f-1873-4b33-b55f-ee2e0cdb6125
+de5df286-48ac-4c00-9da8-664782a2b35a

de/home/.fonts/Good Old DOS/.uuid

@@ -1 +1 @@
-791fc48c-6c74-4961-88bc-2ad08bbf072c
+b870f5eb-8431-4607-9b57-22a1460da3fa

de/home/.fonts/OverpassNerdFont_3.4.0/.uuid

@@ -1 +1 @@
-fc10d4fc-185a-41f5-a69a-14554e7d4985
+684021b7-f317-4fa3-9ee6-0df781f4f04b

de/home/.fonts/PcSeniorRegular/.uuid

@@ -1 +1 @@
-2a1d201b-fb0d-4228-8cad-9e2f4e41ca09
+77d4c8c3-94d6-4424-a7c1-c88acee7d0cc

de/home/.fonts/Univers-Font/.uuid

@@ -1 +1 @@
-c51bc637-5565-45d1-925a-6897d108daf7
+7050109e-f208-49b3-8c9f-e88a9fffd7f5

de/home/.fonts/overpass-mono/.uuid

@@ -1 +1 @@
-a39e85f1-be66-4e3e-ab2e-d1b9e1fdb45c
+6a80e01e-b6d0-43cf-bdaf-b95751a50a6f

de/home/.fonts/overpass/.uuid

@@ -1 +1 @@
-0fdb1bfc-88d2-43d1-98bc-24ec13994dc3
+5879041e-a22d-4581-bfc0-66691eb79874

de/home/.librewolf/profiles.ini

@@ -11,24 +11,21 @@ Locked=1
 Name=Development
 IsRelative=1
 Path=development
+StoreID=30267575
+ShowSelector=1
 
 [Profile0]
 Name=Penelope
 IsRelative=1
 Path=penelope
 Default=1
-StoreID=a61d59be
+StoreID=0585997e
 ShowSelector=0
 
 [General]
 StartWithLastProfile=1
 Version=2
 
-[Profile4]
-Name=testing
-IsRelative=1
-Path=4z689ygf.testing
-
 [Install6C4726F70D182CF7]
 Default=penelope
 Locked=1
@@ -38,3 +35,8 @@ Name=School
 IsRelative=1
 Path=school
 
+[Profile4]
+Name=testing
+IsRelative=1
+Path=4z689ygf.testing
+

de/home/.local/share/applications/feh.desktop

@@ -1,7 +1,7 @@
 [Desktop Entry]
 Comment[en_US]=
 Comment=
-Exec= feh -. %U
+Exec= feh -Z. %U
 GenericName[en_US]=
 GenericName=
 Icon=feh