merge'

config/.bashrc

@@ -134,9 +134,7 @@ alias zf='z $(flirt)'
 # You may want to put all your additions into a separate file like
 # ~/.bash_aliases, instead of adding them here directly.
 # See /usr/share/doc/bash-doc/examples in the bash-doc package.
-if [ -z "$EDITOR" ]; then
+export EDITOR='helix'
-    export EDITOR='kak'
-fi
 
 if [ -f ~/.bash_aliases ]; then
     . ~/.bash_aliases
@@ -191,6 +189,9 @@ elif [ -n "$(command -v tmux)" ] && [ -n "$(command -v kak)" ]; then
     alias vipe='EDITOR="/usr/bin/kak -c $SESH 2>/dev/null || /usr/bin/kak -s $SESH" vipe'
 fi
 
+if [ -n "$(command -v tmux)" ] && [ -n "$(command -v helix || command -v hx)" ] && [ -z "$TMUX" ]; then
+    alias helix='tmux new-session -e "EDITOR=helix" helix > /dev/null'    
+fi
 # if [ -n "$(command -v tmux)" ] && [ -z "$TMUX" ]; then
 #     SESH="$( (tmux list-sessions 2>/dev/null || echo '-1') | cut -d' ' -f1 | tr -d ':-' | sort -r | head -n1 | xargs -I{} echo '{} + 1' | bc)"
 #     alias tmux="tmux new-session -s $SESH"

config/.config/KDE/UserFeedback.conf

@@ -0,0 +1,2 @@
+[UserFeedback]
+LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x87}\x4\n\x84\xab\0)

config/.config/KDE/UserFeedback.org.kde.plasma-welcome.conf

@@ -0,0 +1,2 @@
+[UserFeedback]
+ApplicationStartCount=2

config/.config/alacritty/alacritty.toml

@@ -1,5 +1,9 @@
 [general]
 import = ["rose-pine.toml"]
+
+[window]
+opacity = 1
+
 [font]
 size = 14
 

config/.config/dconf/user.txt

@@ -893,16 +893,16 @@ xkb-options=['lv3:ralt_switch']
 clock-format='12h'
 color-scheme='prefer-dark'
 cursor-size=24
-cursor-theme='Adwaita'
+cursor-theme='breeze_cursors'
 document-font-name='Cantarell 11'
 enable-animations=true
 enable-hot-corners=true
 font-antialiasing='rgba'
 font-hinting='slight'
-font-name='Ubuntu 10'
+font-name='Noto Sans,  10'
-monospace-font-name='Iosevka Term SS12 14'
+gtk-theme='Breeze'
-gtk-theme='Adwaita-dark'
+icon-theme='breeze-dark'
-icon-theme='Adwaita'
+monospace-font-name='BigBlueTermPlus Nerd Font 12'
 show-battery-percentage=true
 toolbar-style='text'
 clock-show-seconds=true
@@ -910,6 +910,9 @@ clock-show-weekday=true
 font-rgba-order='rgb'
 text-scaling-factor=1.0
 toolbar-icons-size='large'
+cursor-blink=true
+cursor-blink-time=1000
+scaling-factor=uint32 1
 
 [org/gnome/desktop/notifications]
 application-children=['org-gnome-shell-extensions', 'org-gnome-totem', 'org-gnome-nautilus', 'gnome-control-center', 'balena-etcher-electron', 'gnome-power-panel', 'org-gnome-chromegnomeshell', 'org-gnome-software', 'org-gnome-extensions-desktop', 'org-gnome-boxes', 'org-gnome-terminal', 'org-gnome-shell-extensions-gsconnect', 'gnome-printers-panel', 'org-gnome-music', 'gnome-system-monitor', 'steam', 'org-gnome-fileroller', 'com-github-wwmm-easyeffects', 'emacs', 'brave-browser', 'org-gnome-lollypop', 'org-gnome-logs', 'heroic', 'org-gnome-eog', 'visual-studio-code', 'org-freedesktop-piper', 'hyper', 'rpcs3', 'org-gnome-console', 'org-gnome-gedit', 'org-gnome-tweaks', 'blender', 'org-gnome-epiphany', 'system-config-printer', 'org-gnome-settings', 'gnome-network-panel', 'balena-etcher', 'chirp', 'kando', 'com-mitchellh-ghostty', 'org-gnome-geary', 'org-gnome-clocks', 'org-freecad-freecad', 'org-gnome-characters']
@@ -1053,7 +1056,7 @@ sort-order=['org.gnome.Documents.desktop', 'org.gnome.Settings.desktop', 'org.gn
 
 [org/gnome/desktop/sound]
 event-sounds=true
-theme-name='__custom'
+theme-name='ocean'
 input-feedback-sounds=false
 
 [org/gnome/desktop/wm/keybindings]
@@ -1100,7 +1103,7 @@ switch-windows-backward=['<Shift><Super>Tab']
 
 [org/gnome/desktop/wm/preferences]
 auto-raise=false
-button-layout='icon:close'
+button-layout='icon:minimize,maximize,close'
 focus-mode='mouse'
 workspace-names=['', '', 'Workspace 3', 'Workspace 4']
 
@@ -2501,3 +2504,21 @@ window-maximized=false
 [ar/xjuan/Cambalache/state/window]
 state=uint32 0
 size=(1071, 645)
+
+[com/vysp3r/ProtonPlus/State]
+width=1024
+
+[org/mate/engrampa/general]
+unar-open-zip=false
+
+[org/mate/engrampa/listing]
+show-path=false
+list-mode='as-folder'
+sort-method='name'
+sort-type='ascending'
+name-column-width=250
+
+[org/mate/engrampa/ui]
+window-width=1170
+sidebar-width=200
+window-height=1422

config/.config/ghostty/config

@@ -1,18 +1,19 @@
 font-family = ""
 # font-family = "FairfaxHaxHD"
 # font-family = "PragmataPro Liga"
-# font-family = "BigBlueTermPlus Nerd Font"
+font-family = "BigBlueTermPlus Nerd Font"
 # font-family = "Olympe Mono Hacked"
-# font-family = "CaskaydiaCove Nerd Font"
+font-family = "Cascadia Code"
+font-family = "CaskaydiaCove Nerd Font"
 # font-family = "Terminess Nerd Font Mono"
 # font-family = "Ubuntu Mono Nerd Font"
 font-family = "Iosevka Term SS12"
 # font-family = "Victor Mono Nerd Font"
 # font-family = "Sudo"
-# theme = light:rose-pine-dawn,dark:rose-pine
+theme = rose-pine
 font-size = 14
 # theme = light:xcodelight,dark:xcodedark
-theme = Monokai Classic
+# theme = Monokai Classic
 # window-decoration = false
 gtk-adwaita = false
 window-decoration = false

config/.config/kak/kakrc

@@ -207,15 +207,19 @@ hook global WinSetOption filetype=(c|zig|python|ruby|lua|java|html|css|swift) %{
     # set-option window lsp_auto_highlight_references true
     set-option window lsp_hover_anchor true
     lsp-auto-hover-enable
-    lsp-auto-hover-insert-mode-enable
+    #lsp-auto-hover-insert-mode-enable
+    lsp-auto-signature-help-enable
+    lsp-inlay-hints-enable global
     lsp-enable-window
 }
 
 hook global WinSetOption filetype=(rust) %{
-    # set-option window lsp_auto_highlight_references true
+    set-option window lsp_auto_highlight_references true
     set-option window lsp_hover_anchor true
     lsp-auto-hover-enable
     #lsp-auto-hover-insert-mode-enable
+    lsp-auto-signature-help-enable
+    lsp-inlay-hints-enable global
     lsp-enable-window
 }
 

config/.config/kde.org/UserFeedback.org.kde.discover.conf

@@ -0,0 +1,30 @@
+[Source-applicationSourceName]
+dataSourceCommonSettings\activeState=true
+
+[Source-applicationVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-locale]
+dataSourceCommonSettings\activeState=true
+
+[Source-opengl]
+dataSourceCommonSettings\activeState=true
+
+[Source-platform]
+dataSourceCommonSettings\activeState=true
+
+[Source-qtVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-screens]
+dataSourceCommonSettings\activeState=true
+
+[Source-startCount]
+dataSourceCommonSettings\activeState=true
+
+[Source-usageTime]
+dataSourceCommonSettings\activeState=true
+
+[UserFeedback]
+ApplicationStartCount=137
+ApplicationTime=622

config/.config/kde.org/UserFeedback.org.kde.dolphin.conf

@@ -0,0 +1,30 @@
+[Source-applicationVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-locale]
+dataSourceCommonSettings\activeState=true
+
+[Source-places]
+dataSourceCommonSettings\activeState=true
+
+[Source-platform]
+dataSourceCommonSettings\activeState=true
+
+[Source-qtVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-screens]
+dataSourceCommonSettings\activeState=true
+
+[Source-settings]
+dataSourceCommonSettings\activeState=true
+
+[Source-startCount]
+dataSourceCommonSettings\activeState=true
+
+[Source-usageTime]
+dataSourceCommonSettings\activeState=true
+
+[UserFeedback]
+ApplicationStartCount=3
+ApplicationTime=35142

config/.config/kde.org/UserFeedback.org.kde.kate.conf

@@ -0,0 +1,21 @@
+[Source-applicationVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-platform]
+dataSourceCommonSettings\activeState=true
+
+[Source-qtVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-screens]
+dataSourceCommonSettings\activeState=true
+
+[Source-startCount]
+dataSourceCommonSettings\activeState=true
+
+[Source-usageTime]
+dataSourceCommonSettings\activeState=true
+
+[UserFeedback]
+ApplicationStartCount=10
+ApplicationTime=3242

config/.config/kde.org/UserFeedback.org.kde.kmail.conf

@@ -0,0 +1,27 @@
+[Source-accounts]
+dataSourceCommonSettings\activeState=true
+
+[Source-applicationVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-locale]
+dataSourceCommonSettings\activeState=true
+
+[Source-platform]
+dataSourceCommonSettings\activeState=true
+
+[Source-qtVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-screens]
+dataSourceCommonSettings\activeState=true
+
+[Source-startCount]
+dataSourceCommonSettings\activeState=true
+
+[Source-usageTime]
+dataSourceCommonSettings\activeState=true
+
+[UserFeedback]
+ApplicationStartCount=1
+ApplicationTime=14

config/.config/kde.org/UserFeedback.org.kde.kmail2.conf

@@ -0,0 +1,2 @@
+[UserFeedback]
+ApplicationStartCount=1

config/.config/kde.org/UserFeedback.org.kde.plasmashell.conf

@@ -0,0 +1,31 @@
+[Source-applicationVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-compiler]
+dataSourceCommonSettings\activeState=true
+
+[Source-opengl]
+dataSourceCommonSettings\activeState=true
+
+[Source-panelCount]
+dataSourceCommonSettings\activeState=true
+
+[Source-platform]
+dataSourceCommonSettings\activeState=true
+
+[Source-qpa]
+dataSourceCommonSettings\activeState=true
+
+[Source-qtVersion]
+dataSourceCommonSettings\activeState=true
+
+[Source-screens]
+dataSourceCommonSettings\activeState=true
+
+[Source-usageTime]
+dataSourceCommonSettings\activeState=true
+
+[UserFeedback]
+ApplicationStartCount=210
+ApplicationTime=2008695
+LastEncouragement=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x87}\x4\n\x84\xab\0)

config/.config/kde.org/UserFeedback.org.kde.systemsettings.conf

@@ -0,0 +1,2 @@
+[UserFeedback]
+ApplicationStartCount=254

config/.config/kde.org/marble.conf

@@ -0,0 +1,5 @@
+[Favorites]
+Atlas=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x8c\xc2\x3\xd4\x8b\xdf\0)
+OpenStreetMap=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x8c\xc2\x3\xd4\x8b\xdf\0)
+Satellite%20View=@DateTime(\0\0\0\x10\0\0\0\0\0\0%\x8c\xc2\x3\xd4\x8b\xdf\0)
+initialized=true

config/.config/kde.org/plasmashell.conf

@@ -0,0 +1,7 @@
+[QQControlsFileDialog]
+favoriteFolders=@Invalid()
+height=0
+sidebarSplit=125.55000000000001
+sidebarVisible=true
+sidebarWidth=80
+width=0

config/.config/kde.org/spectacle.conf

@@ -0,0 +1,2 @@
+[KImageAnnotator]
+AnnotatorDockWidgetsState=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x3\0\0\0\0\0\0\0W\0\0\x1\x8a\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0T\0o\0o\0l\0 \0S\0\x65\0l\0\x65\0\x63\0t\0i\0o\0n\x1\0\0\0%\0\0\x1\x8a\0\0\0\x64\x1\0\0\x3\0\0\0\x2\0\0\x2t\0\0\0$\xfc\x1\0\0\0\x1\xfb\0\0\0\x1a\0I\0t\0\x65\0m\0 \0S\0\x65\0t\0t\0i\0n\0g\0s\x1\0\0\0\0\0\0\x2t\0\0\0\xe5\x1\0\0\x3\0\0\0\x3\0\0\x2t\0\0\0$\xfc\x1\0\0\0\x2\xfb\0\0\0 \0G\0\x65\0n\0\x65\0r\0\x61\0l\0 \0S\0\x65\0t\0t\0i\0n\0g\0s\x1\0\0\0\0\0\0\x1x\0\0\0x\x1\0\0\x3\xfb\0\0\0\x1c\0I\0m\0\x61\0g\0\x65\0 \0S\0\x65\0t\0t\0i\0n\0g\0s\x1\0\0\x1y\0\0\0\xfb\0\0\0P\x1\0\0\x3\0\0\x2\x1c\0\0\x1\x8a\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)

config/.config/kde.org/systemsettings.conf

@@ -0,0 +1,7 @@
+[QQControlsFileDialog]
+favoriteFolders=@Invalid()
+height=0
+sidebarSplit=125.55000000000001
+sidebarVisible=true
+sidebarWidth=80
+width=0

config/.config/kdedefaults/kcminputrc

@@ -0,0 +1,2 @@
+[Mouse]
+cursorTheme=breeze_cursors

config/.config/kdedefaults/kdeglobals

@@ -0,0 +1,8 @@
+[General]
+ColorScheme=BreezeDark
+
+[Icons]
+Theme=breeze-dark
+
+[KDE]
+widgetStyle=Breeze

config/.config/kdedefaults/kscreenlockerrc

@@ -0,0 +1,2 @@
+[Greeter]
+Theme=org.kde.breeze.desktop

config/.config/kdedefaults/ksplashrc

@@ -0,0 +1,3 @@
+[KSplash]
+Engine=KSplashQML
+Theme=org.kde.breezedark.desktop

config/.config/kdedefaults/kwinrc

@@ -0,0 +1,7 @@
+[Windows]
+Placement=Centered
+
+[org.kde.kdecoration2]
+NoPlugin=false
+library=org.kde.breeze
+theme=Breeze

config/.config/kdedefaults/package

@@ -0,0 +1 @@
+org.kde.breezedark.desktop

config/.config/kdedefaults/plasmarc

@@ -0,0 +1,2 @@
+[Theme]
+name=default

config/.config/qt5ct/qt5ct.conf

@@ -1,6 +1,6 @@
 [Appearance]
 color_scheme_path=/home/mikec/.config/qt5ct/style-colors.conf
-custom_palette=true
+custom_palette=false
 icon_theme=breeze-dark
 standard_dialogs=xdgdesktopportal
 style=kvantum
@@ -25,7 +25,7 @@ underline_shortcut=1
 wheel_scroll_lines=3
 
 [SettingsWindow]
-geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\0\0\0\t\xe3\0\0\x5\x65\0\0\0\0\0\0\0\0\0\0\t\xe3\0\0\x5\x65\0\0\0\0\0\0\0\0\n\0\0\0\0\0\0\0\0\0\0\0\t\xe3\0\0\x5\x65)
+geometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\0\0\0\0\xbb\0\0\t\xe3\0\0\x6 \0\0\0\0\0\0\0\xbb\0\0\t\xe3\0\0\x6 \0\0\0\0\0\0\0\0\v\xaf\0\0\0\0\0\0\0\xbb\0\0\t\xe3\0\0\x6 )
 
 [Troubleshooting]
 force_raster_widgets=1

config/.config/qt6ct/qt6ct.conf

@@ -3,7 +3,7 @@ color_scheme_path=/home/mikec/.config/qt6ct/colors/Chicago95.conf
 custom_palette=false
 icon_theme=rose-pine-icons
 standard_dialogs=xdgdesktopportal
-style=kvantum-dark
+style=Breeze
 
 [Fonts]
 fixed="BigBlueTermPlus Nerd Font Mono,9,-1,5,400,0,0,0,0,0,0,0,0,0,0,1,Regular"

config/.gitconfig

@@ -7,7 +7,7 @@
 	process = git-lfs filter-process
 	required = true
 [core]
-	editor = kak
+	editor = helix
 [init]
 	defaultBranch = master
 [sendemail]

config/.scripts/kdestart.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+ pipewire-launch &

config/.tmux.conf

@@ -4,8 +4,9 @@ set -g @rose_pine_variant 'main' # Options are 'main', 'moon' or 'dawn'
 #set -g @plugin 'arcticicestudio/nord-tmux'
 set -g @plugin 'rose-pine/tmux'
 set -g @plugin 'tmux-plugins/tpm'
-set -g default-terminal "tmux-256color"
+# set -g default-terminal "tmux-256color"
 set -ga terminal-overrides ",alacritty:Tc"
+# set -ga terminal-overrides ",xterm-256color:Tc"
 set -g mouse on
 # Changes prefix key to control a instead of control b
 unbind C-b

config/.xinitrc

@@ -2,5 +2,7 @@ xrdb -merge ~/.Xresources
 # /home/mikec/.scripts/startup.sh
 # exec awesome
 # exec dwm
-exec bspwm
+# exec bspwm
 # exec icewm
+# exec mlvwm
+exec spectrwm