From 0a5d6e13d331b685d1440cc8bc6d7301238f29cf Mon Sep 17 00:00:00 2001 From: jabuxas Date: Mon, 2 Dec 2024 17:18:40 -0300 Subject: [PATCH] feat(work): add right git config --- .../.config/alacritty/alacritty.toml | 2 +- .../configs/fish/.config/fish/config.fish | 12 +++++++- .../configs/scripts/scripts/switch.fish | 4 +-- .../configs/sway/.config/sway/settings/init | 6 ++-- .../configs/sway/.config/sway/settings/rules | 1 + work-laptop/configs/sway/.config/sway/xmonad | 30 ++++++------------- .../configs/tmux/.config/tmux/theme.conf | 2 +- 7 files changed, 28 insertions(+), 29 deletions(-) diff --git a/work-laptop/configs/alacritty/.config/alacritty/alacritty.toml b/work-laptop/configs/alacritty/.config/alacritty/alacritty.toml index fb3d8dc..a61c131 100644 --- a/work-laptop/configs/alacritty/.config/alacritty/alacritty.toml +++ b/work-laptop/configs/alacritty/.config/alacritty/alacritty.toml @@ -12,7 +12,7 @@ # I put the file alacritty.toml in $HOME/.config/alacritty. However it can be kept anywhere among the places mentioned in # https://github.com/alacritty/alacritty/tree/master#configuration -import = ["~/.config/alacritty/white.toml"] +import = ["~/.config/alacritty/black.toml"] [window] diff --git a/work-laptop/configs/fish/.config/fish/config.fish b/work-laptop/configs/fish/.config/fish/config.fish index 3191d0b..395ed49 100644 --- a/work-laptop/configs/fish/.config/fish/config.fish +++ b/work-laptop/configs/fish/.config/fish/config.fish @@ -20,7 +20,7 @@ if status is-interactive alias reboot="systemctl reboot" alias hr="date +'%Hh:%M, %d-%m-%Y'" alias hi="systemctl hibernate" - alias ff="fastfetch --config examples/19" + alias ff="fastfetch" alias feh="imv" alias lg="lazygit" alias cpr="cd ~/repos/cports-docker && docker compose run --build --rm cports" @@ -96,4 +96,14 @@ end abbr -a '!*' --position anywhere --function last_history_arguments abbr -a !! --position anywhere --function last_history_item +function switch_git_personal + git config user.name "jabuxas" + git config user.email "jabuxas@proton.me" +end + +function switch_git_work + git config user.name "lucas barbieri catarina" + git config user.email "lucas.catarina@consorciociga.gov.br" +end + fish_add_path /home/lucas/.spicetify diff --git a/work-laptop/configs/scripts/scripts/switch.fish b/work-laptop/configs/scripts/scripts/switch.fish index 1020868..381139b 100755 --- a/work-laptop/configs/scripts/scripts/switch.fish +++ b/work-laptop/configs/scripts/scripts/switch.fish @@ -13,8 +13,8 @@ swaymsg reload switch $CURRENT_THEME case black echo changing to white ... - gsettings set org.gnome.desktop.interface gtk-theme "Windows-95" - gsettings set org.gnome.desktop.interface icon-theme "nineicons-redux-v0.6" + # gsettings set org.gnome.desktop.interface gtk-theme "Windows-95" + # gsettings set org.gnome.desktop.interface icon-theme "nineicons-redux-v0.6" sed -i 's|black.toml|white.toml|' ~/.config/alacritty/alacritty.toml ln -sf ~/.config/tmux/themes/tmux-white.conf ~/.config/tmux/theme.conf tmux source ~/.config/tmux/tmux.conf diff --git a/work-laptop/configs/sway/.config/sway/settings/init b/work-laptop/configs/sway/.config/sway/settings/init index 34fd283..d17d700 100644 --- a/work-laptop/configs/sway/.config/sway/settings/init +++ b/work-laptop/configs/sway/.config/sway/settings/init @@ -3,7 +3,7 @@ exec { gsettings set $gnome-schema gtk-theme "Sunrise-Dark" gsettings set $gnome-schema icon-theme "Reversal-black-dark" gsettings set $gnome-schema cursor-theme 'Simp1e-Adw' - gsettings set $gnome-schema font-name 'CozetteVector 12' + gsettings set $gnome-schema font-name 'Cartograph CF 12' waybar & autotiling & gammastep -t 4500:3500 -l -23.5475:-46.63611 -b 1.0:0.7 & @@ -17,10 +17,10 @@ exec { timeout 300 'swaylock -f --image ~/pics/white.jpg' \ timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \ before-sleep 'swaylock -f --image ~/pics/white.jpg' - teams-for-linux & flatpak run com.mattermost.Desktop + flatpak run org.gnome.Evolution bitwarden-desktop-bin - flatpak run io.github.mahmoudbahaa.outlook_for_linux + # flatpak run io.github.mahmoudbahaa.outlook_for_linux } # vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/work-laptop/configs/sway/.config/sway/settings/rules b/work-laptop/configs/sway/.config/sway/settings/rules index 2963047..a10c23b 100644 --- a/work-laptop/configs/sway/.config/sway/settings/rules +++ b/work-laptop/configs/sway/.config/sway/settings/rules @@ -53,5 +53,6 @@ for_window [class="teams-for-linux"] move to workspace 8 for_window [class="Bitwarden"] move to workspace 9 for_window [class="outlook-for-linux"] move to workspace 10 for_window [class="Lacuna.WebPkiCore"] floating enable +for_window [app_id="org.gnome.Evolution"] move to workspace 10 # vim: ts=2 sts=2 sw=2 ft=swayconfig diff --git a/work-laptop/configs/sway/.config/sway/xmonad b/work-laptop/configs/sway/.config/sway/xmonad index 5dce18e..1ec04b2 100755 --- a/work-laptop/configs/sway/.config/sway/xmonad +++ b/work-laptop/configs/sway/.config/sway/xmonad @@ -9,7 +9,7 @@ outputs = [o for o in sway.get_outputs() if o.active] def focus_monitor(args): indices = {"left": 0, "center": 1, "right": 2} orientation = indices[args.orientation] - if len(outputs) <= 1 or len(outputs) < orientation+1: + if len(outputs) <= 1 or len(outputs) < orientation + 1: print(len(outputs)) return @@ -22,7 +22,7 @@ def focus_monitor(args): def send_to_monitor(args): indices = {"left": 0, "center": 1, "right": 2} orientation = indices[args.orientation] - if len(outputs) <= 1 or len(outputs) < orientation+1: + if len(outputs) <= 1 or len(outputs) < orientation + 1: print(len(outputs)) return @@ -74,7 +74,7 @@ def switch_workspace(args): # since we know there's at least one more commands = [ f"workspace {destination}", - f"move workspace to output {destination_output}" + f"move workspace to output {destination_output}", ] command = ";".join(commands) sway.command(command) @@ -85,35 +85,23 @@ parser = argparse.ArgumentParser(description="Process custom sway commands") subparsers = parser.add_subparsers(help="sub-command help") output_choose = subparsers.add_parser( - "monitor", - help="pick monitor in X orientation order" + "monitor", help="pick monitor in X orientation order" ) output_choose.add_argument( - "orientation", - type=str, - choices=["left", "center", "right"] + "orientation", type=str, choices=["left", "center", "right"] ) output_choose.set_defaults(func=focus_monitor) send_to_output = subparsers.add_parser( - "send_to_output", - help="pick monitor in X orientation order" + "send_to_output", help="pick monitor in X orientation order" ) send_to_output.add_argument( - "orientation", - type=str, - choices=["left", "center", "right"] + "orientation", type=str, choices=["left", "center", "right"] ) send_to_output.set_defaults(func=send_to_monitor) -workspace_choose = subparsers.add_parser( - "workspace", - help="switch workspace" -) -workspace_choose.add_argument( - "workspace", - type=str -) +workspace_choose = subparsers.add_parser("workspace", help="switch workspace") +workspace_choose.add_argument("workspace", type=str) workspace_choose.set_defaults(func=switch_workspace) diff --git a/work-laptop/configs/tmux/.config/tmux/theme.conf b/work-laptop/configs/tmux/.config/tmux/theme.conf index a772f81..3e3a0c7 120000 --- a/work-laptop/configs/tmux/.config/tmux/theme.conf +++ b/work-laptop/configs/tmux/.config/tmux/theme.conf @@ -1 +1 @@ -/home/lucas/.config/tmux/themes/tmux-white.conf \ No newline at end of file +/home/lucas/.config/tmux/themes/tmux-monochrome.conf \ No newline at end of file