Add i3 include directory for non-version controlled config, add catppuccin theme for xfce/gtk, remove fonts directory

.gitignore

@@ -10,4 +10,4 @@ config/git/user_email
 config/fish/fish_variables
 config/gtk-3.0/bookmarks
 config/xfce4/xfconf/xfce-perchannel-xml
-fonts/.uuid
+config/i3/config.d

Makefile

@@ -21,12 +21,11 @@ all: link install
 
 clean: unlink uninstall
 
-link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(HOME)/.local/share/fonts $(HOME)/.ssh/sockets
+link: $(CONFIG_TARGETS) $(SSH_TARGETS) $(HOME)/.ssh/sockets
 
 unlink:
 	for link in $(CONFIG_TARGETS); do rm "$$link"; done
 	for link in $(SSH_TARGETS); do rm "$$link"; done
-	rmdir $(HOME)/.local/share/fonts
 	rmdir $(HOME)/.ssh/sockets
 
 install: $(LAZY_DIR) $(PYENV_DIR) $(POETRY_DIR)
@@ -39,9 +38,6 @@ $(SSH_TARGETS): $(SSH_DIR)/%: ssh/%
 $(CONFIG_TARGETS) $(SSH_TARGETS):
 	ln -s $(PWD)/$? -t $$(dirname $@)
 
-$(HOME)/.local/share/fonts: fonts
-	ln -s $(PWD)/$? -t $(HOME)/.local/share
-
 $(LAZY_DIR):
 	git clone --depth 1 $(LAZY_REPO) $@
 

config/gtk-3.0/settings.ini

@@ -1,22 +1,21 @@
 [Settings]
 gtk-application-prefer-dark-theme=true
-gtk-button-images=true
+gtk-button-images=1
-gtk-cursor-theme-name=breeze_cursors
+gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=24
 gtk-decoration-layout=icon:minimize,maximize,close
 gtk-enable-animations=true
-gtk-enable-event-sounds=0
+gtk-enable-event-sounds=1
-gtk-enable-input-feedback-sounds=0
+gtk-enable-input-feedback-sounds=1
 gtk-font-name=Noto Sans,  10
-gtk-icon-theme-name=breeze
+gtk-icon-theme-name=Adwaita
-gtk-menu-images=true
+gtk-menu-images=1
-gtk-modules=colorreload-gtk-module:window-decorations-gtk-module
 gtk-primary-button-warps-slider=false
-gtk-theme-name=Catppuccin-Macchiato
+gtk-theme-name=Breeze
 gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR
-gtk-toolbar-style=3
+gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ
 gtk-xft-antialias=1
 gtk-xft-dpi=98304
 gtk-xft-hinting=1
-gtk-xft-hintstyle=hintfull
+gtk-xft-hintstyle=hintslight
-gtk-xft-rgba=none
+gtk-xft-rgba=rgb

config/i3/config

@@ -22,7 +22,7 @@
 # is used in the bar {} block below.
 # This font is widely installed, provides lots of unicode glyphs, right-to-left
 # text rendering and scalability on retina/hidpi displays (thanks to pango).
-font pango: Noto Sans Regular 10
+font pango: Noto Sans Regular 12
 
 # set the mod key to the winkey:
 set $mod Mod4
@@ -60,7 +60,7 @@ gaps outer 3
 #default_border normal
 
 # window title alignment
-#title_align center
+title_align center
 
 # Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
@@ -142,29 +142,29 @@ bindcode $mod+Shift+81 	 move container to workspace  $ws9
 bindcode $mod+Shift+90 	 move container to workspace  $ws10
 
 # resize window (you can also use the mouse for that):
-#mode "resize" {
+mode "resize" {
 # These bindings trigger as soon as you enter the resize mode
 # Pressing left will shrink the window's width.
 # Pressing right will grow the window's width.
 # Pressing up will shrink the window's height.
 # Pressing down will grow the window's height.
-#        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym h resize shrink width 10 px or 10 ppt
-#        bindsym k resize grow height 10 px or 10 ppt
+        bindsym j resize grow height 10 px or 10 ppt
-#        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym k resize shrink height 10 px or 10 ppt
-#        bindsym ntilde resize grow width 10 px or 10 ppt
+        bindsym l resize grow width 10 px or 10 ppt
 
 # same bindings, but for the arrow keys
-#	bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Left resize shrink width 10 px or 10 ppt
-#        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
-#        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
-#        bindsym Right resize grow width 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
 
 # back to normal: Enter or Escape
-#	bindsym Return mode "default"
+        bindsym Return mode "default"
-#        bindsym Escape mode "default"
+        bindsym Escape mode "default"
-#}
+}
 
-#bindsym $mod+r mode "resize"
+bindsym $mod+r mode "resize"
 
 ######################################
 # keybindings for different actions: #
@@ -252,6 +252,10 @@ bindsym $mod+a focus parent
 # open new empty workspace
 bindsym $mod+Shift+n exec ~/.config/i3/scripts/empty_workspace
 
+# move focused workspace between monitors
+bindsym $mod+Ctrl+greater move workspace to output right
+bindsym $mod+Ctrl+less move workspace to output left
+
 # Multimedia Keys
 
 # volume
@@ -311,16 +315,13 @@ set $ws10 "10"
 # bind program to workspace and focus to them on startup:
 assign [class="wezterm"] $ws1
 assign [class="(?i)firefox"] $ws2
-assign [class="Microsoft-edge"] $ws2
 assign [class="Thunar"] $ws3
 assign [class="thunderbird"] $ws4
 assign [class="TelegramDesktop"] $ws5
 
 # automatic set focus new window if it opens on another workspace than the current:
-for_window [class=Xfce4-terminal] focus
 for_window [class=wezterm] focus
 for_window [class=(?i)firefox] focus
-for_window [class=Microsoft-edge] focus
 for_window [class=Thunar] focus
 for_window [class=Thunderbird] focus
 for_window [class=TelegramDesktop] focus
@@ -349,7 +350,7 @@ for_window [class=TelegramDesktop] focus
 # For modifications, it can be copied to ~/.config/picom/picom.conf or ~/.config/picom.conf
 # install picom package (yay -S picom)
 # start using default config
-#exec_always --no-startup-id picom -b
+exec_always --no-startup-id picom -b
 #
 # for custom config:
 #exec_always --no-startup-id picom --config  ~/.config/picom.conf
@@ -604,3 +605,5 @@ bindsym F10 exec rofi -show window \
 #exec --no-startup-id greenclip daemon>/dev/null
 #bindsym $mod+c exec --no-startup-id rofi -modi "clipboard:greenclip print" -show clipboard \
 #		-config ~/.config/rofi/rofidmenu.rasi
+
+include config.d/*

config/i3/i3blocks.conf

@@ -50,7 +50,7 @@ markup=pango
 [terminal]
 full_text= 
 color=#807dfe
-command=i3-msg -q exec xfce4-terminal
+command=i3-msg -q exec wezterm
 
 [browser]
 full_text= 

config/rofi/arc_dark_colors.rasi

@@ -1,34 +0,0 @@
-/*******************************************************
- * ROFI Arc Dark colors for EndeavourOS
- * Maintainer: joekamprad <joekamprad@endeavouros.com>
- *******************************************************/
-* {
-    selected-normal-foreground:  rgba ( 249, 249, 249, 100 % );
-    foreground:                  rgba ( 196, 203, 212, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 64, 69, 82, 59 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 249, 249, 249, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 204, 102, 102, 100 % );
-    alternate-urgent-background: rgba ( 75, 81, 96, 90 % );
-    active-foreground:           rgba ( 101, 172, 255, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 249, 249, 249, 100 % );
-    alternate-active-background: rgba ( 75, 81, 96, 89 % );
-    background:                  rgba ( 45, 48, 59, 95 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           @background;
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 64, 132, 214, 100 % );
-    border-color:                rgba ( 124, 131, 137, 100 % );
-    spacing:                     2;
-    separatorcolor:              rgba ( 29, 31, 33, 100 % );
-    urgent-background:           rgba ( 29, 31, 33, 17 % );
-    selected-urgent-background:  rgba ( 165, 66, 66, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 29, 31, 33, 17 % );
-    selected-active-background:  rgba ( 68, 145, 237, 100 % );
-}

config/rofi/arc_dark_transparent_colors.rasi

@@ -1,34 +0,0 @@
-/*******************************************************
- * ROFI Arch Dark Transparent colors for EndeavourOS
- * Maintainer: joekamprad <joekamprad@endeavouros.com>
- *******************************************************/
-* {
-    selected-normal-foreground:  rgba ( 255, 147, 5, 100 % );
-    foreground:                  rgba ( 196, 203, 212, 100 % );
-    normal-foreground:           @foreground;
-    alternate-normal-background: rgba ( 45, 48, 59, 1 % );
-    red:                         rgba ( 220, 50, 47, 100 % );
-    selected-urgent-foreground:  rgba ( 249, 249, 249, 100 % );
-    blue:                        rgba ( 38, 139, 210, 100 % );
-    urgent-foreground:           rgba ( 204, 102, 102, 100 % );
-    alternate-urgent-background: rgba ( 75, 81, 96, 90 % );
-    active-foreground:           rgba ( 101, 172, 255, 100 % );
-    lightbg:                     rgba ( 238, 232, 213, 100 % );
-    selected-active-foreground:  rgba ( 249, 249, 249, 100 % );
-    alternate-active-background: rgba ( 45, 48, 59, 88 % );
-    background:                  rgba ( 45, 48, 59, 88 % );
-    alternate-normal-foreground: @foreground;
-    normal-background:           rgba ( 45, 48, 59, 1 % );
-    lightfg:                     rgba ( 88, 104, 117, 100 % );
-    selected-normal-background:  rgba ( 24, 26, 32, 100 % );
-    border-color:                rgba ( 124, 131, 137, 100 % );
-    spacing:                     2;
-    separatorcolor:              rgba ( 45, 48, 59, 1 % );
-    urgent-background:           rgba ( 45, 48, 59, 15 % );
-    selected-urgent-background:  rgba ( 165, 66, 66, 100 % );
-    alternate-urgent-foreground: @urgent-foreground;
-    background-color:            rgba ( 0, 0, 0, 0 % );
-    alternate-active-foreground: @active-foreground;
-    active-background:           rgba ( 29, 31, 33, 17 % );
-    selected-active-background:  rgba ( 26, 28, 35, 100 % );
-}

config/xfce4/terminal/terminalrc

@@ -28,17 +28,17 @@ MiscRewrapOnResize=TRUE
 MiscUseShiftArrowsToScroll=FALSE
 MiscSlimTabs=FALSE
 MiscNewTabAdjacent=FALSE
-ColorForeground=#e3e3ea
+ColorForeground=#CAD3F5
-ColorBackground=#08052b
+ColorBackground=#24273A
-ColorCursor=#ff7f7f
+ColorCursor=#F4DBD6
-ColorCursorForeground=#FFFFFF
+TabActivityColor=#F5A97F
-ColorBold=#7fbaff
-TabActivityColor=#47B35D
 ColorCursorUseDefault=FALSE
-ColorBoldIsBright=FALSE
 ScrollingUnlimited=TRUE
-FontName=Source Code Pro 10
+FontName=Fira Mono 12
-ColorPalette=rgb(8,5,43);rgb(255,127,127);rgb(127,63,191);rgb(204,57,128);rgb(127,186,255);rgb(127,63,191);rgb(127,127,255);rgb(205,204,219);rgb(127,186,255);rgb(255,127,127);rgb(153,153,204);rgb(255,127,127);rgb(127,127,255);rgb(127,63,191);rgb(127,127,255);rgb(227,227,234)
+ColorPalette=#494D64;#ED8796;#A6DA95;#EED49F;#8AADF4;#F5BDE6;#8BD5CA;#B8C0E0;#5B6078;#ED8796;#A6DA95;#EED49F;#8AADF4;#F5BDE6;#8BD5CA;#A5ADCB
 ScrollingBar=TERMINAL_SCROLLBAR_NONE
 MiscRightClickAction=TERMINAL_RIGHT_CLICK_ACTION_CONTEXT_MENU
+ColorSelection=#24273A
+ColorSelectionBackground=#F4DBD6
+ColorSelectionUseDefault=FALSE
 

fonts/LICENSE

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2014 Ryan L McIntyre
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

fonts/readme.md

@@ -1,8 +0,0 @@
-
-# Nerd Fonts
-
-This is an archived font from a Nerd Fonts release.
-
-For more information see:
-* https://github.com/ryanoasis/nerd-fonts/
-* https://github.com/ryanoasis/nerd-fonts/releases/latest/

themes/Catppuccin-Frappe-Standard-Blue-Dark-hdpi/xfwm4/themerc

@@ -0,0 +1,23 @@
+button_offset=9
+button_spacing=0
+
+show_app_icon=false
+
+full_width_title=true
+
+title_shadow_active=false
+title_shadow_inactive=false
+
+title_horizontal_offset=3
+
+active_text_color=#afafaf
+active_text_shadow_color=#252525
+
+inactive_text_color=#808080
+inactive_text_shadow_color=#252525
+
+shadow_delta_height=2
+shadow_delta_width=0
+shadow_delta_x=0
+shadow_delta_y=-5
+shadow_opacity=40