From 6d84a1f91d117f21f8e4e5c6a9706672931b3f76 Mon Sep 17 00:00:00 2001 From: afonsofrancof Date: Sun, 21 May 2023 20:18:09 +0100 Subject: [PATCH] [MISC] A bunch of files I forgot to commit over time. --- .config/alacritty/alacritty.yml | 6 +- .config/fish/myfunctions/dotfiles.fish | 6 + .config/fish/myfunctions/qol.fish | 6 + .config/nvim/.gitignore | 1 + .config/nvim/lua/plugins/cmp.lua | 32 +- .config/nvim/lua/plugins/lazy.lua | 1 + .config/nvim/lua/plugins/null-ls.lua | 2 +- .config/nvim/lua/plugins/treesitter.lua | 2 +- .config/tmux/tmux.conf | 4 +- .config/tmux/tmux.conf.local | 453 ------------------------ .gitconfig | 2 + .local/bin/wrappedhl | 2 +- .xinitrc | 24 +- 13 files changed, 45 insertions(+), 496 deletions(-) delete mode 100644 .config/tmux/tmux.conf.local diff --git a/.config/alacritty/alacritty.yml b/.config/alacritty/alacritty.yml index 0f33c0b..b93a0a2 100644 --- a/.config/alacritty/alacritty.yml +++ b/.config/alacritty/alacritty.yml @@ -19,8 +19,8 @@ import: # Any items in the `env` entry below will be added as # environment variables. Some entries may override variables # set by alacritty itself. -#env: - # TERM variable +env: + TERM: xterm-256color # # This value is used to set the `$TERM` environment variable for # each instance of Alacritty. If it is not present, alacritty will @@ -163,7 +163,7 @@ font: #style: Bold Italic # Point size - #size: 11.0 + size: 12.0 # Offset is the extra space around each character. `offset.y` can be thought # of as modifying the line spacing, and `offset.x` as modifying the letter diff --git a/.config/fish/myfunctions/dotfiles.fish b/.config/fish/myfunctions/dotfiles.fish index f8d6bd3..30a0f59 100644 --- a/.config/fish/myfunctions/dotfiles.fish +++ b/.config/fish/myfunctions/dotfiles.fish @@ -2,3 +2,9 @@ function config /usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME $argv end +function lazyconfig + lazygit --git-dir=$HOME/dotfiles/ --work-tree=$HOME/ $argv +end +alias lc=lazyconfig + + diff --git a/.config/fish/myfunctions/qol.fish b/.config/fish/myfunctions/qol.fish index f95ecb9..7b1dde4 100644 --- a/.config/fish/myfunctions/qol.fish +++ b/.config/fish/myfunctions/qol.fish @@ -1,4 +1,10 @@ bind \cH backward-kill-path-component bind "[3;5~" kill-word +function backup --argument filename + cp $filename $filename.bak +end +function restore --argument file + mv $file (echo $file | sed s/.bak//) +end diff --git a/.config/nvim/.gitignore b/.config/nvim/.gitignore index 8cb205e..648bf93 100644 --- a/.config/nvim/.gitignore +++ b/.config/nvim/.gitignore @@ -1 +1,2 @@ plugin +lazy-lock.json diff --git a/.config/nvim/lua/plugins/cmp.lua b/.config/nvim/lua/plugins/cmp.lua index d60fee3..54a7527 100644 --- a/.config/nvim/lua/plugins/cmp.lua +++ b/.config/nvim/lua/plugins/cmp.lua @@ -42,6 +42,7 @@ local kind_icons = { Event = "", Operator = "", TypeParameter = "", + Copilot = "", } -- find more here: https://www.nerdfonts.com/cheat-sheet @@ -52,7 +53,7 @@ cmp.setup { end, }, mapping = { - [""] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.scroll_docs( -1), { "i", "c" }), [""] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }), [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), [""] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. @@ -61,7 +62,10 @@ cmp.setup { c = cmp.mapping.close(), }, -- Accept currently selected item. If none selected, do nothing. - [""] = cmp.mapping.confirm { select = false }, + [""] = cmp.mapping.confirm { + behavior = cmp.ConfirmBehavior.Replace, + select = false + }, [""] = cmp.mapping(function(fallback) if luasnip.expandable() then luasnip.expand() @@ -74,8 +78,8 @@ cmp.setup { end end), [""] = cmp.mapping(function(fallback) - if luasnip.jumpable(-1) then - luasnip.jump(-1) + if luasnip.jumpable( -1) then + luasnip.jump( -1) else fallback() end @@ -109,13 +113,14 @@ cmp.setup { vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind vim_item.menu = ({ - nvim_lsp = "(LSP)", - luasnip = "(Snippet)", - buffer = "(Text)", - nvim_lsp_signature_help = "(Signature)", - nvim_lua = "(Nvim LSP)", - path = "(Path)", - })[entry.source.name] + nvim_lsp = "(LSP)", + copilot = "(Copilot)", + luasnip = "(Snippet)", + buffer = "(Text)", + nvim_lsp_signature_help = "(Signature)", + nvim_lua = "(Nvim LSP)", + path = "(Path)", + })[entry.source.name] return vim_item end, }, @@ -138,7 +143,9 @@ cmp.setup { if char_before_cursor == "." then if kind == 2 or kind == 5 then return true - else return false end + else + return false + end elseif string.match(line, "^%s*%w*$") then if kind == 3 or kind == 6 then return true @@ -151,7 +158,6 @@ cmp.setup { }, { name = 'nvim_lua' }, - { name = 'copilot' }, { name = 'luasnip' }, { name = 'nvim_lsp_signature_help' }, { name = "path" }, diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index af837e5..6fafdc9 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -34,6 +34,7 @@ lazy.setup({ --Change add and remove surroundings from words 'tpope/vim-surround', + 'tpope/vim-obsession', --Tmux navigation { diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua index 41ba246..adbdb96 100644 --- a/.config/nvim/lua/plugins/null-ls.lua +++ b/.config/nvim/lua/plugins/null-ls.lua @@ -5,7 +5,7 @@ null_ls.setup({ null_ls.builtins.formatting.rustfmt, null_ls.builtins.formatting.stylish_haskell, null_ls.builtins.formatting.fourmolu, - null_ls.builtins.formatting.black, + null_ls.builtins.formatting.blue, null_ls.builtins.formatting.prettierd.with({ filetypes = { "html", "json", "yaml", "markdown" }, }), diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua index ed70d9c..107bfdd 100644 --- a/.config/nvim/lua/plugins/treesitter.lua +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -13,7 +13,7 @@ local options = { highlight = { enable = true, use_languagetree = true, - additional_vim_regex_highlighting = { "markdown" , "org"}, + additional_vim_regex_highlighting = {"org"}, }, indent = { enable = true, diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index b0e0328..23ece69 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -42,8 +42,8 @@ set -g @catppuccin_window_tabs_enabled on #THIS IS GOD MOD FOR TMUX set -g @plugin 'tmux-plugins/tmux-resurrect' -#THIS IS ALSO GOD MOD FOR TMUX -#THIS HAS TO BE LAST IN THE LIST OF PLUGINS +set -g @resurrect-strategy-nvim 'session' +set -g @resurrect-capture-pane-contents 'on' set -g @plugin 'tmux-plugins/tmux-continuum' set -g @continuum-restore 'on' set -g @continuum-save-interval '10' diff --git a/.config/tmux/tmux.conf.local b/.config/tmux/tmux.conf.local deleted file mode 100644 index 19c745b..0000000 --- a/.config/tmux/tmux.conf.local +++ /dev/null @@ -1,453 +0,0 @@ -# : << 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/.gitconfig b/.gitconfig index 1cf5bfd..276e126 100644 --- a/.gitconfig +++ b/.gitconfig @@ -15,3 +15,5 @@ format = ssh [tag] gpgsign = true +[pull] + rebase = false diff --git a/.local/bin/wrappedhl b/.local/bin/wrappedhl index 208d9d8..9ed45ef 100755 --- a/.local/bin/wrappedhl +++ b/.local/bin/wrappedhl @@ -10,5 +10,5 @@ export XDG_CURRENT_DESKTOP=sway export GBM_BACKEND=nvidia-drm export __GLX_VENDOR_LIBRARY_NAME=nvidia export WLR_NO_HARDWARE_CURSORS=1 - +echo "Starting Hyprland..." exec Hyprland diff --git a/.xinitrc b/.xinitrc index 446880a..004acd2 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,7 +1,7 @@ #!/bin/sh -XDG_SESSION_TYPE=x11 -XDG_CURRENT_DESKTOP=X-Generic +export XDG_SESSION_TYPE=x11 +export XDG_CURRENT_DESKTOP=X-Generic userresources=$HOME/.Xresources usermodmap=$HOME/.Xmodmap sysresources=/etc/X11/xinit/.Xresources @@ -10,33 +10,14 @@ sysmodmap=/etc/X11/xinit/.Xmodmap # merge in defaults and keymaps if [ -f $sysresources ]; then - - - - - - - xrdb -merge $sysresources - fi - if [ -f $sysmodmap ]; then xmodmap $sysmodmap fi - if [ -f "$userresources" ]; then - - - - - - - xrdb -merge "$userresources" - fi - if [ -f "$usermodmap" ]; then xmodmap "$usermodmap" fi @@ -54,6 +35,5 @@ setxkbmap -layout us,pt setxkbmap -option grp:win_space_toggle setxkbmap -option caps:escape xrandr --output DP-0 --primary --left-of HDMI-0 -xscreensaver -no-splash & dunst & /home/afonso/.local/bin/xmonad