Merge remote-tracking branch 'refs/remotes/origin/master'

.gitconfig

@@ -0,0 +1,24 @@
+[user]
+	email = [email protected]
+	name = ayamir
+[credential "https://github.com"]
+	helper = 
+	helper = !/usr/bin/gh auth git-credential
+[credential "https://gist.github.com"]
+	helper = 
+	helper = !/usr/bin/gh auth git-credential
+[http "https://github.com"]
+	proxy = http://127.0.0.1:7890
+[http "https://gitlab.com"]
+	proxy = http://127.0.0.1:7890
+[alias]
+	st = status -sb
+	ll = log --oneline
+	last = log -1 HEAD --stat
+	cm = commit -sm
+	rv = remote -v
+	gl = config --global -l
+    lg = log --graph --pretty=oneline --abbrev-commit
+	se = !git rev-list --all | xargs git grep -F
+[help]
+	autocorrect = 20

catppuccin/.config/awesome/rc.lua

@@ -148,7 +148,8 @@ local officemenu = {
 
 local networkmenu = {
 	{ "chrome", "google-chrome-stable" },
-	{ "vivaldi", "vivaldi" },
+	{ "microsoft-edge", "microsoft-edge-stable" },
+	{ "firefox", "firefox-bin" },
 }
 
 local termmenu = {
@@ -171,7 +172,6 @@ local settingsmenu = {
 }
 
 local utilsmenu = {
-	{ "screenshot", "flameshot gui" },
 	{ "screenkey", "screenkey" },
 }
 
@@ -286,18 +286,18 @@ local vol = lain.widget.alsa({
 
 vol.widget:buttons(awful.util.table.join(
 	awful.button({}, 1, function() -- left click
-		awful.spawn("pamixer -t")
+		awful.spawn("wpctl set-mute @DEFAULT_SINK@ toggle")
 		vol.update()
 	end),
 	awful.button({}, 3, function() -- middle click
 		awful.spawn("pavucontrol")
 	end),
 	awful.button({}, 4, function() -- scroll up
-		awful.spawn("pamixer -i 3")
+		awful.spawn("wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+")
 		vol.update()
 	end),
 	awful.button({}, 5, function() -- scroll down
-		awful.spawn("pamixer -d 3")
+		awful.spawn("wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-")
 		vol.update()
 	end)
 ))
@@ -502,8 +502,8 @@ local globalkeys = gears.table.join(
 		awful.spawn(rofi_powermenu, false)
 	end, { description = "launch powermenu", group = "launcher" }),
 	awful.key({ modkey }, "e", function()
-		awful.spawn("vivaldi")
-	end, { description = "launch vivaldi", group = "launcher" }),
+		awful.spawn("microsoft-edge-stable")
+	end, { description = "launch edge", group = "launcher" }),
 	awful.key({ modkey }, "x", function()
 		awful.spawn("logseq")
 	end, { description = "launch logseq", group = "launcher" }),
@@ -521,11 +521,11 @@ local globalkeys = gears.table.join(
 		awful.spawn("xkill", false)
 	end, { description = "launch xkill", group = "launcher" }),
 	awful.key({ modkey, "Shift" }, "s", function()
-		awful.spawn("flameshot gui", false)
+		awful.spawn("screensht area", false)
 	end, { description = "launch flameshot", group = "launcher" }),
 	awful.key({ modkey, "Shift" }, "e", function()
-		awful.spawn("google-chrome-stable")
-	end, { description = "launch chrome", group = "launcher" }),
+		awful.spawn("nautilus")
+	end, { description = "launch nautilus", group = "launcher" }),
 	awful.key({ modkey, "Shift" }, "m", function()
 		awful.spawn("yesplaymusic")
 	end, { description = "launch ncmpcpp", group = "launcher" }),
@@ -867,6 +867,9 @@ awful.rules.rules = {
 
 	-- Set Firefox to always map on the tag1 on screen 1.
 	{ rule = { class = "vivaldi-stable" }, properties = { screen = 1, tag = tag1 } },
+	{ rule = { class = "firefox-bin" }, properties = { screen = 1, tag = tag1 } },
+	{ rule = { class = "microsoft-edge-stable" }, properties = { screen = 1, tag = tag1 } },
+	{ rule = { class = "google-chrome" }, properties = { screen = 1, tag = tag1 } },
 	{ rule = { instance = "Devtools" }, properties = { screen = 2, tag = tag1 } },
 	-- { rule = { class = "Typora" }, properties = { screen = 2, tag = tag1 } },
 
@@ -896,8 +899,9 @@ awful.rules.rules = {
 	{ rule = { class = "Logseq" }, properties = { screen = 1, tag = tag8 } },
 	{ rule = { class = "obsidian" }, properties = { screen = 2, tag = tag8 } },
 
+	{ rule = { class = "picgo" }, properties = { screen = 1, tag = tag9 } },
 	{ rule = { class = "winedbg.exe" }, properties = { screen = 1, tag = tag9 } },
-	{ rule = { class = "Clash for Windows" }, properties = { screen = 2, tag = tag9 } },
+	{ rule = { class = "clash for windows" }, properties = { screen = 2, tag = tag9 } },
 }
 -- }}}
 

catppuccin/.config/kitty/kitty.conf

@@ -23,7 +23,7 @@
 #:     italic_font      Operator Mono Book Italic
 #:     bold_italic_font Operator Mono Medium Italic
 
-		font_size 14.0
+		font_size 12.0
 
 #: Font size (in pts)
 
@@ -240,11 +240,6 @@
 		url_color #0087bd
 		url_style curly
 
-#: The color and style for highlighting URLs on mouse-over. url_style
-#: can be one of: none, single, double, curly
-
-		open_url_modifiers kitty_mod
-
 #: The modifier keys to press when clicking with the mouse on URLs to
 #: open the URL
 
@@ -277,17 +272,6 @@
 
 		strip_trailing_spaces never
 
-#: Remove spaces at the end of lines when copying to clipboard. A
-#: value of smart will do it when using normal selections, but not
-#: rectangle selections. always will always do it.
-
-		rectangle_select_modifiers ctrl+alt
-
-#: The modifiers to use rectangular selection (i.e. to select text in
-#: a rectangular block with the mouse)
-
-		terminal_select_modifiers shift
-
 #: The modifiers to override mouse selection even when a terminal
 #: application has grabbed the mouse
 
@@ -469,7 +453,7 @@
 #: Fade the text in inactive windows by the specified amount (a number
 #: between zero and one, with zero being fully faded).
 
-		hide_window_decorations no
+		hide_window_decorations yes
 
 #: Hide the window decorations (title-bar and window borders) with
 #: yes. On macOS, titlebar-only can be used to only hide the titlebar.
@@ -765,7 +749,7 @@
 #: you want to prevent programs running on a remote computer over ssh
 #: from controlling kitty.
 
-		listen_on tcp:localhost:12345
+		listen_on unix:/tmp/kitty
 
 #: Tell kitty to listen to the specified unix/tcp socket for remote
 #: control connections. Note that this will apply to all kitty
@@ -1094,10 +1078,10 @@
 
 #: Tab management {{{
 
-    	map shift+alt+k     next_tab
-		map shift+alt+j     previous_tab
-		map shift+alt+t     new_tab
-		map shift+alt+w     close_tab
+    	map kitty_mod+k     next_tab
+		map kitty_mod+j     previous_tab
+		map kitty_mod+t     new_tab
+		map kitty_mod+w     close_tab
 		map kitty_mod+.     move_tab_forward
 		map kitty_mod+,     move_tab_backward
 		map kitty_mod+alt+t set_tab_title