From 49080e9ad9071270da40a817403d26139657d4b2 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Thu, 13 Apr 2023 17:13:06 +0100 Subject: [PATCH 1/4] [MAJOR] Changed tmux config --- .config/fish/config.fish | 3 +- .config/fish/myfunctions/replacements.fish | 3 + .config/tmux/tmux.conf | 20 +- .config/tmux/tmux.conf.local | 453 +++++++++++++++++++++ .local/bin/batterynotify | 31 ++ 5 files changed, 490 insertions(+), 20 deletions(-) create mode 100644 .config/fish/myfunctions/replacements.fish mode change 100644 => 120000 .config/tmux/tmux.conf create mode 100644 .config/tmux/tmux.conf.local create mode 100755 .local/bin/batterynotify diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 5b5cc65..59572ca 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -4,7 +4,7 @@ end fish_default_key_bindings -set -gx EDITOR vim +set -gx EDITOR nvim set -gx TERM 'xterm-256color' fish_add_path $HOME/.local/share/nvim/mason/bin @@ -17,3 +17,4 @@ source ~/.config/fish/myfunctions/code.fish source ~/.config/fish/myfunctions/dotfiles.fish source ~/.config/fish/myfunctions/pacman.fish source ~/.config/fish/myfunctions/qol.fish +source ~/.config/fish/myfunctions/replacements.fish diff --git a/.config/fish/myfunctions/replacements.fish b/.config/fish/myfunctions/replacements.fish new file mode 100644 index 0000000..cbad844 --- /dev/null +++ b/.config/fish/myfunctions/replacements.fish @@ -0,0 +1,3 @@ +alias ls=exa +alias find=fd +alias df=duf diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf deleted file mode 100644 index 42a6359..0000000 --- a/.config/tmux/tmux.conf +++ /dev/null @@ -1,19 +0,0 @@ -set -g default-terminal "tmux-256color" -set -ag terminal-overrides ",$TERM:RGB" -set -sg escape-time 0 - -# List of plugins -set -g @plugin 'tmux-plugins/tpm' -set -g @plugin 'tmux-plugins/tmux-sensible' -# Other examples: -# set -g @plugin 'github_username/plugin_name' -# set -g @plugin 'github_username/plugin_name#branch' -# set -g @plugin 'git@github.com:user/plugin' -# set -g @plugin 'git@bitbucket.com:user/plugin' -#Theme -set -g @plugin 'catppuccin/tmux' -set -g @catppuccin_flavour 'frappe' -set -g @catppuccin_window_tabs_enabled on - -# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) -run '~/.tmux/plugins/tpm/tpm' diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf new file mode 120000 index 0000000..8795a3d --- /dev/null +++ b/.config/tmux/tmux.conf @@ -0,0 +1 @@ +/home/afonso/.config/oh-my-tmux/.tmux.conf \ No newline at end of file diff --git a/.config/tmux/tmux.conf.local b/.config/tmux/tmux.conf.local new file mode 100644 index 0000000..19c745b --- /dev/null +++ b/.config/tmux/tmux.conf.local @@ -0,0 +1,453 @@ +# : << EOF +# https://github.com/gpakosz/.tmux +# (‑●‑●)> dual licensed under the WTFPL v2 license and the MIT license, +# without any warranty. +# Copyright 2012— Gregory Pakosz (@gpakosz). + + +# -- session creation ---------------------------------------------------------- + +# prompt for session name when creating a new session, possible values are: +# - true +# - false (default) +# - disabled (do not modify new-session bindings) +tmux_conf_new_session_prompt=true + + +# -- windows & pane creation --------------------------------------------------- + +# new window retains current path, possible values are: +# - true +# - false (default) +# - disabled (do not modify new-window bindings) +tmux_conf_new_window_retain_current_path=true + +# new window tries to reconnect ssh sessions, possible values are: +# - true +# - false (default) +# - disabled (do not modify new-window bindings) +tmux_conf_new_window_reconnect_ssh=false + +# new pane retains current path, possible values are: +# - true (default) +# - false +# - disabled (do not modify split-window bindings) +tmux_conf_new_pane_retain_current_path=true + +# new pane tries to reconnect ssh sessions, possible values are: +# - true +# - false (default) +# - disabled (do not modify split-window bindings) +tmux_conf_new_pane_reconnect_ssh=false + + +# -- display ------------------------------------------------------------------- + +# RGB 24-bit colour support, possible values are: +# - true +# - false +# - auto (default) +# +# automatic detection relies on the COLORTERM environment variable being defined +# to 'truecolor' or '24bit' or '$ tput colors' answering '16777216' +# see https://github.com/termstandard/colors +tmux_conf_24b_colour=auto + + +# -- theming ------------------------------------------------------------------- + +# enable or disable theming: +# - enabled (default) +# - disabled +# when disabled, all tmux_conf_theme_xxx variables are ignored except: +# - tmux_conf_theme_pairing +# - tmux_conf_theme_prefix +# - tmux_conf_theme_mouse +# - tmux_conf_theme_root +# - tmux_conf_theme_synchronized +tmux_conf_theme=enabled + +# default theme +tmux_conf_theme_colour_1="#080808" # dark gray +tmux_conf_theme_colour_2="#303030" # gray +tmux_conf_theme_colour_3="#8a8a8a" # light gray +tmux_conf_theme_colour_4="#00afff" # light blue +tmux_conf_theme_colour_5="#ffff00" # yellow +tmux_conf_theme_colour_6="#080808" # dark gray +tmux_conf_theme_colour_7="#e4e4e4" # white +tmux_conf_theme_colour_8="#080808" # dark gray +tmux_conf_theme_colour_9="#ffff00" # yellow +tmux_conf_theme_colour_10="#ff00af" # pink +tmux_conf_theme_colour_11="#5fff00" # green +tmux_conf_theme_colour_12="#8a8a8a" # light gray +tmux_conf_theme_colour_13="#e4e4e4" # white +tmux_conf_theme_colour_14="#080808" # dark gray +tmux_conf_theme_colour_15="#080808" # dark gray +tmux_conf_theme_colour_16="#d70000" # red +tmux_conf_theme_colour_17="#e4e4e4" # white + +# default theme (ansi) +#tmux_conf_theme_colour_1="colour0" +#tmux_conf_theme_colour_2="colour8" +#tmux_conf_theme_colour_3="colour8" +#tmux_conf_theme_colour_4="colour14" +#tmux_conf_theme_colour_5="colour11" +#tmux_conf_theme_colour_6="colour0" +#tmux_conf_theme_colour_7="colour15" +#tmux_conf_theme_colour_8="colour0" +#tmux_conf_theme_colour_9="colour11" +#tmux_conf_theme_colour_10="colour13" +#tmux_conf_theme_colour_11="colour10" +#tmux_conf_theme_colour_12="colour8" +#tmux_conf_theme_colour_13="colour15" +#tmux_conf_theme_colour_14="colour0" +#tmux_conf_theme_colour_15="colour0" +#tmux_conf_theme_colour_16="colour1" +#tmux_conf_theme_colour_17="colour15" + +# window style +tmux_conf_theme_window_fg="default" +tmux_conf_theme_window_bg="default" + +# highlight focused pane, possible values are: +# - true +# - false (default) +tmux_conf_theme_highlight_focused_pane=false + +# focused pane colours: +tmux_conf_theme_focused_pane_bg="$tmux_conf_theme_colour_2" + +# pane border style, possible values are: +# - thin (default) +# - fat +tmux_conf_theme_pane_border_style=thin + +# pane borders colours: +tmux_conf_theme_pane_border="$tmux_conf_theme_colour_2" +tmux_conf_theme_pane_active_border="$tmux_conf_theme_colour_4" +%if #{>=:#{version},3.2} +tmux_conf_theme_pane_active_border="#{?pane_in_mode,$tmux_conf_theme_colour_9,#{?synchronize-panes,$tmux_conf_theme_colour_16,$tmux_conf_theme_colour_4}}" +%endif + +# pane indicator colours (when you hit + q) +tmux_conf_theme_pane_indicator="$tmux_conf_theme_colour_4" +tmux_conf_theme_pane_active_indicator="$tmux_conf_theme_colour_4" + +# status line style +tmux_conf_theme_message_fg="$tmux_conf_theme_colour_1" +tmux_conf_theme_message_bg="$tmux_conf_theme_colour_5" +tmux_conf_theme_message_attr="bold" + +# status line command style ( : Escape) +tmux_conf_theme_message_command_fg="$tmux_conf_theme_colour_5" +tmux_conf_theme_message_command_bg="$tmux_conf_theme_colour_1" +tmux_conf_theme_message_command_attr="bold" + +# window modes style +tmux_conf_theme_mode_fg="$tmux_conf_theme_colour_1" +tmux_conf_theme_mode_bg="$tmux_conf_theme_colour_5" +tmux_conf_theme_mode_attr="bold" + +# status line style +tmux_conf_theme_status_fg="$tmux_conf_theme_colour_3" +tmux_conf_theme_status_bg="$tmux_conf_theme_colour_1" +tmux_conf_theme_status_attr="none" + +# terminal title +# - built-in variables are: +# - #{circled_window_index} +# - #{circled_session_name} +# - #{hostname} +# - #{hostname_ssh} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_terminal_title="#h ❐ #S ● #I #W" + +# window status style +# - built-in variables are: +# - #{circled_window_index} +# - #{circled_session_name} +# - #{hostname} +# - #{hostname_ssh} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_window_status_fg="$tmux_conf_theme_colour_3" +tmux_conf_theme_window_status_bg="$tmux_conf_theme_colour_1" +tmux_conf_theme_window_status_attr="none" +tmux_conf_theme_window_status_format="#I #W#{?#{||:#{window_bell_flag},#{window_zoomed_flag}}, ,}#{?window_bell_flag,!,}#{?window_zoomed_flag,Z,}" +#tmux_conf_theme_window_status_format="#{circled_window_index} #W#{?#{||:#{window_bell_flag},#{window_zoomed_flag}}, ,}#{?window_bell_flag,!,}#{?window_zoomed_flag,Z,}" +#tmux_conf_theme_window_status_format="#I #W#{?#{||:#{window_bell_flag},#{window_zoomed_flag}}, ,}#{?window_bell_flag,🔔,}#{?window_zoomed_flag,🔍,}" + +# window current status style +# - built-in variables are: +# - #{circled_window_index} +# - #{circled_session_name} +# - #{hostname} +# - #{hostname_ssh} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_window_status_current_fg="$tmux_conf_theme_colour_1" +tmux_conf_theme_window_status_current_bg="$tmux_conf_theme_colour_4" +tmux_conf_theme_window_status_current_attr="bold" +tmux_conf_theme_window_status_current_format="#I #W#{?#{||:#{window_bell_flag},#{window_zoomed_flag}}, ,}#{?window_bell_flag,!,}#{?window_zoomed_flag,Z,}" +#tmux_conf_theme_window_status_current_format="#{circled_window_index} #W#{?#{||:#{window_bell_flag},#{window_zoomed_flag}}, ,}#{?window_bell_flag,!,}#{?window_zoomed_flag,Z,}" +#tmux_conf_theme_window_status_current_format="#I #W#{?#{||:#{window_bell_flag},#{window_zoomed_flag}}, ,}#{?window_bell_flag,🔔,}#{?window_zoomed_flag,🔍,}" + +# window activity status style +tmux_conf_theme_window_status_activity_fg="default" +tmux_conf_theme_window_status_activity_bg="default" +tmux_conf_theme_window_status_activity_attr="underscore" + +# window bell status style +tmux_conf_theme_window_status_bell_fg="$tmux_conf_theme_colour_5" +tmux_conf_theme_window_status_bell_bg="default" +tmux_conf_theme_window_status_bell_attr="blink,bold" + +# window last status style +tmux_conf_theme_window_status_last_fg="$tmux_conf_theme_colour_4" +tmux_conf_theme_window_status_last_bg="$tmux_conf_theme_colour_2" +tmux_conf_theme_window_status_last_attr="none" + +# status left/right sections separators +tmux_conf_theme_left_separator_main="" +tmux_conf_theme_left_separator_sub="|" +tmux_conf_theme_right_separator_main="" +tmux_conf_theme_right_separator_sub="|" +#tmux_conf_theme_left_separator_main='\uE0B0' # /!\ you don't need to install Powerline +#tmux_conf_theme_left_separator_sub='\uE0B1' # you only need fonts patched with +#tmux_conf_theme_right_separator_main='\uE0B2' # Powerline symbols or the standalone +#tmux_conf_theme_right_separator_sub='\uE0B3' # PowerlineSymbols.otf font, see README.md + +# status left/right content: +# - separate main sections with "|" +# - separate subsections with "," +# - built-in variables are: +# - #{battery_bar} +# - #{battery_hbar} +# - #{battery_percentage} +# - #{battery_status} +# - #{battery_vbar} +# - #{circled_session_name} +# - #{hostname_ssh} +# - #{hostname} +# - #{hostname_full} +# - #{hostname_full_ssh} +# - #{loadavg} +# - #{mouse} +# - #{pairing} +# - #{prefix} +# - #{root} +# - #{synchronized} +# - #{uptime_y} +# - #{uptime_d} (modulo 365 when #{uptime_y} is used) +# - #{uptime_h} +# - #{uptime_m} +# - #{uptime_s} +# - #{username} +# - #{username_ssh} +tmux_conf_theme_status_left=" ❐ #S | ↑#{?uptime_y, #{uptime_y}y,}#{?uptime_d, #{uptime_d}d,}#{?uptime_h, #{uptime_h}h,}#{?uptime_m, #{uptime_m}m,} " +tmux_conf_theme_status_right=" #{prefix}#{mouse}#{pairing}#{synchronized}#{?battery_status,#{battery_status},}#{?battery_bar, #{battery_bar},}#{?battery_percentage, #{battery_percentage},} , %R , %d %b | #{username}#{root} | #{hostname} " + +# status left style +tmux_conf_theme_status_left_fg="$tmux_conf_theme_colour_6,$tmux_conf_theme_colour_7,$tmux_conf_theme_colour_8" +tmux_conf_theme_status_left_bg="$tmux_conf_theme_colour_9,$tmux_conf_theme_colour_10,$tmux_conf_theme_colour_11" +tmux_conf_theme_status_left_attr="bold,none,none" + +# status right style +tmux_conf_theme_status_right_fg="$tmux_conf_theme_colour_12,$tmux_conf_theme_colour_13,$tmux_conf_theme_colour_14" +tmux_conf_theme_status_right_bg="$tmux_conf_theme_colour_15,$tmux_conf_theme_colour_16,$tmux_conf_theme_colour_17" +tmux_conf_theme_status_right_attr="none,none,bold" + +# pairing indicator +tmux_conf_theme_pairing="⚇" # U+2687 +tmux_conf_theme_pairing_fg="none" +tmux_conf_theme_pairing_bg="none" +tmux_conf_theme_pairing_attr="none" + +# prefix indicator +tmux_conf_theme_prefix="⌨" # U+2328 +tmux_conf_theme_prefix_fg="none" +tmux_conf_theme_prefix_bg="none" +tmux_conf_theme_prefix_attr="none" + +# mouse indicator +tmux_conf_theme_mouse="↗" # U+2197 +tmux_conf_theme_mouse_fg="none" +tmux_conf_theme_mouse_bg="none" +tmux_conf_theme_mouse_attr="none" + +# root indicator +tmux_conf_theme_root="!" +tmux_conf_theme_root_fg="none" +tmux_conf_theme_root_bg="none" +tmux_conf_theme_root_attr="bold,blink" + +# synchronized indicator +tmux_conf_theme_synchronized="⚏" # U+268F +tmux_conf_theme_synchronized_fg="none" +tmux_conf_theme_synchronized_bg="none" +tmux_conf_theme_synchronized_attr="none" + +# battery bar symbols +tmux_conf_battery_bar_symbol_full="◼" +tmux_conf_battery_bar_symbol_empty="◻" +#tmux_conf_battery_bar_symbol_full="♥" +#tmux_conf_battery_bar_symbol_empty="·" + +# battery bar length (in number of symbols), possible values are: +# - auto +# - a number, e.g. 5 +tmux_conf_battery_bar_length="auto" + +# battery bar palette, possible values are: +# - gradient (default) +# - heat +# - "colour_full_fg,colour_empty_fg,colour_bg" +tmux_conf_battery_bar_palette="gradient" +#tmux_conf_battery_bar_palette="#d70000,#e4e4e4,#000000" # red, white, black + +# battery hbar palette, possible values are: +# - gradient (default) +# - heat +# - "colour_low,colour_half,colour_full" +tmux_conf_battery_hbar_palette="gradient" +#tmux_conf_battery_hbar_palette="#d70000,#ff5f00,#5fff00" # red, orange, green + +# battery vbar palette, possible values are: +# - gradient (default) +# - heat +# - "colour_low,colour_half,colour_full" +tmux_conf_battery_vbar_palette="gradient" +#tmux_conf_battery_vbar_palette="#d70000,#ff5f00,#5fff00" # red, orange, green + +# symbols used to indicate whether battery is charging or discharging +tmux_conf_battery_status_charging="↑" # U+2191 +tmux_conf_battery_status_discharging="↓" # U+2193 +#tmux_conf_battery_status_charging="🔌" # U+1F50C +#tmux_conf_battery_status_discharging="🔋" # U+1F50B + +# clock style (when you hit + t) +# you may want to use %I:%M %p in place of %R in tmux_conf_theme_status_right +tmux_conf_theme_clock_colour="$tmux_conf_theme_colour_4" +tmux_conf_theme_clock_style="24" + + +# -- clipboard ----------------------------------------------------------------- + +# in copy mode, copying selection also copies to the OS clipboard +# - true +# - false (default) +# - disabled +# on macOS, this requires installing reattach-to-user-namespace, see README.md +# on Linux, this requires xsel, xclip or wl-copy +tmux_conf_copy_to_os_clipboard=false + + +# -- user customizations ------------------------------------------------------- +# this is the place to override or undo settings + +set -g escape-time 0 + +# increase history size +#set -g history-limit 10000 + +# start with mouse mode enabled +#set -g mouse on + +# force Vi mode +# really you should export VISUAL or EDITOR environment variable, see manual +#set -g status-keys vi +#set -g mode-keys vi + +# replace C-b by C-a instead of using both prefixes +# set -gu prefix2 +# unbind C-a +# unbind C-b +# set -g prefix C-a +# bind C-a send-prefix + +# if you don't want Oh my tmux! to alter a binding, use #!important +# bind c new-window -c '#{pane_current_path}' #!important + +# move status line to top +#set -g status-position top + + +# -- tpm ----------------------------------------------------------------------- + +# while I don't use tpm myself, many people requested official support so here +# is a seamless integration that automatically installs plugins in parallel + +# whenever a plugin introduces a variable to be used in 'status-left' or +# 'status-right', you can use it in 'tmux_conf_theme_status_left' and +# 'tmux_conf_theme_status_right' variables. + +# by default, launching tmux will update tpm and all plugins +# - true (default) +# - false +tmux_conf_update_plugins_on_launch=true + +# by default, reloading the configuration will update tpm and all plugins +# - true (default) +# - false +tmux_conf_update_plugins_on_reload=true + +# by default, reloading the configuration will uninstall tpm and plugins when no +# plugins are enabled +# - true (default) +# - false +tmux_conf_uninstall_plugins_on_reload=true + +# /!\ the tpm bindings differ slightly from upstream: +# - installing plugins: + I +# - uninstalling plugins: + Alt + u +# - updating plugins: + u + +# /!\ do not add set -g @plugin 'tmux-plugins/tpm' +# /!\ do not add run '~/.tmux/plugins/tpm/tpm' + +# to enable a plugin, use the 'set -g @plugin' syntax: +# visit https://github.com/tmux-plugins for available plugins +#set -g @plugin 'tmux-plugins/tmux-copycat' +#set -g @plugin 'tmux-plugins/tmux-cpu' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'catppuccin/tmux' +set -g @catppuccin_flavour 'frappe' +set -g @catppuccin_window_tabs_enabled on +set -g @plugin 'tmux-plugins/tmux-resurrect' +set -g @plugin 'tmux-plugins/tmux-continuum' +set -g @continuum-restore 'on' + + +# -- custom variables ---------------------------------------------------------- + +# to define a custom #{foo} variable, define a POSIX shell function between the +# '# EOF' and the '# "$@"' lines. Please note that the opening brace { character +# must be on the same line as the function name otherwise the parse won't detect +# it. +# +# then, use #{foo} in e.g. the 'tmux_conf_theme_status_left' or the +# 'tmux_conf_theme_status_right' variables. + +# # /!\ do not remove the following line +# EOF +# +# # /!\ do not "uncomment" the functions: the leading "# " characters are needed +# +# weather() { # see https://github.com/chubin/wttr.in#one-line-output +# curl -f -s -m 2 'wttr.in?format=3' || printf '\n' # /!\ make sure curl is installed +# sleep 900 # sleep for 15 minutes, throttle network requests whatever the value of status-interval +# } +# +# online() { +# ping -c 1 1.1.1.1 >/dev/null 2>&1 && printf '✔' || printf '✘' +# } +# +# "$@" +# # /!\ do not remove the previous line diff --git a/.local/bin/batterynotify b/.local/bin/batterynotify new file mode 100755 index 0000000..cd77398 --- /dev/null +++ b/.local/bin/batterynotify @@ -0,0 +1,31 @@ +#!/bin/sh + +export DISPLAY=:0 +export DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/1000/bus" + +# Battery percentage at which to notify +WARNING_LEVEL=30 +BATTERY_DISCHARGING=`acpi -b | grep "Battery 0" | grep -c "Discharging"` +BATTERY_LEVEL=`acpi -b | grep "Battery 0" | grep -P -o '[0-9]+(?=%)'` + +# Use two files to store whether we've shown a notification or not (to prevent multiple notifications) +EMPTY_FILE=/tmp/batteryempty +FULL_FILE=/tmp/batteryfull + +# Reset notifications if the computer is charging/discharging +if [ $BATTERY_DISCHARGING -eq 1 ] && [ -f $FULL_FILE ]; then + rm $FULL_FILE +elif [ $BATTERY_DISCHARGING -eq 0 ] && [ -f $EMPTY_FILE ]; then + rm $EMPTY_FILE +fi + +# If the battery is charging and is full (and has not shown notification yet) +if [ $BATTERY_LEVEL -gt 95 ] && [ $BATTERY_DISCHARGING -eq 0 ] && [ ! -f $FULL_FILE ]; then + notify-send "Battery Charged" "Battery is above 95% charged." -r 9991 + touch $FULL_FILE +# If the battery is low and is not charging (and has not shown notification yet) +elif [ $BATTERY_LEVEL -le $WARNING_LEVEL ] && [ $BATTERY_DISCHARGING -eq 1 ] && [ ! -f $EMPTY_FILE ]; then + notify-send "Low Battery" "${BATTERY_LEVEL}% of battery remaining." -u critical -r 9991 + touch $EMPTY_FILE +fi + From ec2923b689d8edcbe7d38f6666fb707e99f06abc Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Wed, 19 Apr 2023 15:24:48 +0100 Subject: [PATCH 2/4] [MINOR] improved ls --- .config/fish/myfunctions/replacements.fish | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.config/fish/myfunctions/replacements.fish b/.config/fish/myfunctions/replacements.fish index cbad844..04f16cb 100644 --- a/.config/fish/myfunctions/replacements.fish +++ b/.config/fish/myfunctions/replacements.fish @@ -1,3 +1,5 @@ -alias ls=exa +function ls + exa --icons -l $argv +end alias find=fd alias df=duf From 62fd88bf34d51e2a634527c16243fc3b546e16a2 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Tue, 2 May 2023 15:02:47 +0100 Subject: [PATCH 3/4] Added zypper alias in fish and gitconfig fix --- .config/fish/config.fish | 2 +- .config/fish/myfunctions/packages.fish | 32 ++++++++++++++++++++++++++ .gitconfig | 4 ++-- 3 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 .config/fish/myfunctions/packages.fish diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 59572ca..2b0a5f0 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -15,6 +15,6 @@ fish_add_path $HOME/.ghcup/bin source ~/.config/fish/myfunctions/code.fish source ~/.config/fish/myfunctions/dotfiles.fish -source ~/.config/fish/myfunctions/pacman.fish +source ~/.config/fish/myfunctions/packages.fish source ~/.config/fish/myfunctions/qol.fish source ~/.config/fish/myfunctions/replacements.fish diff --git a/.config/fish/myfunctions/packages.fish b/.config/fish/myfunctions/packages.fish new file mode 100644 index 0000000..8809bac --- /dev/null +++ b/.config/fish/myfunctions/packages.fish @@ -0,0 +1,32 @@ +function i + sudo pacman -S $argv +end + +function zi + sudo zypper install $argv +end + +function s + sudo pacman -Ss $argv +end + +function zs + sudo zypper search $argv +end + +function u + sudo pacman -Syu +end + +function zu + sudo zypper refresh && sudo zypper update +end + +function r + sudo pacman -Rns $argv +end + +function zr + sudo zypper remove $argv +end + diff --git a/.gitconfig b/.gitconfig index e3670bd..1cf5bfd 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,7 +1,7 @@ [user] email = me@afonsofrancof.com name = afonsofrancof - signingkey = D774F2EDAE844584699E6B01C459E0BB3DCEE899 + signingkey = ~/.ssh/id_ed25519_sk.pub [filter "lfs"] process = git-lfs filter-process required = true @@ -12,6 +12,6 @@ [commit] gpgsign = true [gpg] - program = gpg2 + format = ssh [tag] gpgsign = true From 23758b67d5332c5e363a9749e6b4c546d79b0433 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Fri, 5 May 2023 21:46:32 +0100 Subject: [PATCH 4/4] added auto startx on tty1 --- .config/fish/config.fish | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 2b0a5f0..ec487e3 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -2,6 +2,10 @@ if status is-interactive # Commands to run in interactive sessions can go here end +if status --is-login + [ "$(tty)" = "/dev/tty1" ] && exec startx -- -keeptty +end + fish_default_key_bindings set -gx EDITOR nvim