Merge branch 'main' of gitlab.com:elitherl/dotfiles into main

Makefile

@@ -15,7 +15,7 @@ LAZY_DIR := $(HOME)/.local/share/nvim/lazy/lazy.nvim
 PYENV_DIR := $(if $(PYENV_ROOT), $(PYENV_ROOT), $(HOME)/.pyenv)
 POETRY_DIR := $(HOME)/.local/share/pypoetry
 
-.PHONY: all clean check link unlink install uninstall pacman starship
+.PHONY: all clean check link unlink install uninstall pacman
 
 all: link install
 
@@ -55,8 +55,5 @@ $(PYENV_DIR):
 $(POETRY_DIR):
 	python3 packages/poetry.py
 
-starship:
-	bash packages/starship.sh
-
 $(CONFIG_DIR) $(SSH_DIR) $(THEMES_DIR) $(HOME)/.ssh/sockets:
 	mkdir -p $@

config/i3/config

@@ -32,15 +32,7 @@ set $mod Mod4
 #####################
 
 # default i3 tiling mode:
-workspace_layout default
+workspace_layout tabbed
-
-# i3 stacking layout:
-# Each window will be fullscreen and tabbed top to bottom.
-#workspace_layout stacking
-
-# i3 tabbed layout:
-# Each new window will open fullscreen as a tab (left to right)
-#workspace_layout tabbed
 
 ##############################
 # extra options for windows: #
@@ -413,7 +405,7 @@ exec --no-startup-id dbus-launch dunst --config ~/.config/dunst/dunstrc
 #exec_always --no-startup-id autotiling
 
 # Autostart apps as you like
-exec --no-startup-id sleep 2 && wezterm
+#exec --no-startup-id sleep 2 && wezterm
 #exec --no-startup-id sleep 7 && firefox https://github.com/endeavouros-team/endeavouros-i3wm-setup/blob/main/force-knowledge.md
 #exec --no-startup-id sleep 3 && thunar
 
@@ -522,17 +514,18 @@ client.background        $base
 bar {
 		font pango: Noto Sans Regular 12
 		status_command i3blocks -c ~/.config/i3/i3blocks.conf
+                output primary
 	    	position top
 #	    	i3bar_command i3bar --transparency
 # it could be that you have no primary display set: set one (xrandr --output <output> --primary)
 # reference: https://i3wm.org/docs/userguide.html#_tray_output
-		    #tray_output primary
+		    tray_output primary
-		    tray_padding 0
+		    tray_padding 1
 
 # When strip_workspace_numbers is set to yes,
 # any workspace that has a name of the form
 # “[n][:][NAME]” will display only the name.
-strip_workspace_numbers no
+strip_workspace_numbers yes
 
 		    colors {
 		    separator          $mauve
@@ -552,30 +545,30 @@ strip_workspace_numbers no
 # https://gist.github.com/lopspower/03fb1cc0ac9f32ef38f4
 # #08052be6 --> e6=90%
 
-# bar {
+bar {
-#	font pango: Noto Sans Regular 10
+	font pango: Noto Sans Regular 10
-#	status_command i3blocks -c ~/.config/i3/i3blocks-2.conf
+	status_command i3blocks -c ~/.config/i3/i3blocks-2.conf
-#	i3bar_command i3bar --transparency
+	i3bar_command i3bar
-#	output HDMI-0
+	output nonprimary
-#	position bottom
+	position top
-#
+
 # When strip_workspace_numbers is set to yes,
 # any workspace that has a name of the form
 # “[n][:][NAME]” will display only the name.
-#strip_workspace_numbers yes
+strip_workspace_numbers yes
-##strip_workspace_name no
+# strip_workspace_name no
-#
+
-#	colors {
+		    colors {
-#		separator          $purple
+		    separator          $mauve
-#		background         $darkbluetrans
+		    background         $base
-#        	statusline         $white
+		    statusline         $text
 #                          		border 		        bg		txt		indicator
-#		focused_workspace	$lighterblue	$lighterblue	$darkblue	$purple
+		focused_workspace  $pink  $base $text  $rosewater
-#		active_workspace	$lightdblue	$lightdblue	$darkblue	$purple
+		active_workspace   $mauve $base $text  $rosewater
-#		inactive_workspace	$darkblue	$darkblue	$lightdblue	$purple
+		inactive_workspace $mauve $base $text  $rosewater
-#		urgent_workspace	$urgentred	$urgentred	$white		$purple
+		urgent_workspace   $peach $base $peach $overlay0
-#	}
+	}
-#}
+}
 
 #####################################
 # Application menu handled by rofi: #
@@ -600,7 +593,7 @@ bindsym F10 exec rofi -show window \
 ## rofi bindings to manage clipboard (install rofi-greenclip from the AUR)
 
 #exec --no-startup-id greenclip daemon>/dev/null
-#bindsym $mod+c exec --no-startup-id rofi -modi "clipboard:greenclip print" -show clipboard \
+##bindsym $mod+c exec --no-startup-id rofi -modi "clipboard:greenclip print" -show clipboard \
 #		-config ~/.config/rofi/rofidmenu.rasi
 
 include config.d/*

config/nvim/lua/config/catppuccin.lua

@@ -1,7 +1,7 @@
 return {
     flavour = "macchiato",
     term_colors = true,
-    transparent_background = true,
+    -- transparent_background = true,
     integrations = {
         dashboard = true,
         gitsigns = true,

config/wezterm/wezterm.lua

@@ -7,12 +7,14 @@ require("status").setup(scheme)
 require "navigator"
 
 return {
+    audible_bell = "Disabled",
     font_size = 14,
-    window_background_opacity = 0.85,
+    -- window_background_opacity = 0.85,
     color_scheme = scheme_name,
     use_fancy_tab_bar = false,
     tab_max_width = 79,
     tab_bar_style = { new_tab = tab_bar_style.new_tab(scheme), new_tab_hover = tab_bar_style.new_tab_hover(scheme) },
+    hide_tab_bar_if_only_one_tab = true,
     disable_default_key_bindings = true,
     keys = require "keys",
     key_tables = require "key_tables",