diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 75c3a53..f82d648 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -16,7 +16,12 @@ export MANPAGER="sh -c 'col -bx | bat -l man -p'" set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/tsousa/.ghcup/bin $PATH # ghcup-env fish_add_path $HOME/.local/share/nvim/mason/bin/ fish_add_path $HOME/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin +<<<<<<< HEAD fish_add_path $HOME/.config/emacs/bin/ +======= +fish_add_path $HOME/.cargo/bin/ +fish_add_path $HOME/.config/emacs/bin +>>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab starship init fish | source diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables index fc9ec51..5ba2057 100644 --- a/.config/fish/fish_variables +++ b/.config/fish/fish_variables @@ -40,4 +40,8 @@ SETUVAR fish_pager_color_selected_background:\x1d SETUVAR fish_pager_color_selected_completion:\x1d SETUVAR fish_pager_color_selected_description:\x1d SETUVAR fish_pager_color_selected_prefix:\x1d +<<<<<<< HEAD SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin +======= +SETUVAR fish_user_paths:/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin\x1e/home/tsousa/\x2erustup/toolchains/nightly\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin +>>>>>>> acb4dfaf16e54fbe9a7cc850f7c54d6b6b4f59ab diff --git a/.config/i3/config b/.config/i3/config index 5d7af8e..37832c4 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -210,15 +210,15 @@ bindsym $mod+r mode "resize" gaps inner 10 gaps top 40 - -# anchor programs to specific workspaces assign [class="^tidal-hifi$"] 4 +assign [class="discord"] 5 # startup programs exec --no-startup-id nextcloud exec --no-startup-id nitrogen --restore exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec alacritty' exec --no-startup-id picom -b +exec --no-startup-id openrgb -d 0 -m off -d 1 -m off exec_always --no-startup-id ~/.config/polybar/launch.sh #mode "Power menu: [e]xit i3 | [S-s]hutdown | [s]uspend | [r]eboot" { diff --git a/.config/nvim/after/plugin/cmp.lua b/.config/nvim/after/plugin/cmp.lua index f9833fd..5a63acb 100644 --- a/.config/nvim/after/plugin/cmp.lua +++ b/.config/nvim/after/plugin/cmp.lua @@ -15,33 +15,33 @@ local check_backspace = function() return col == 0 or vim.fn.getline("."):sub(col, col):match "%s" end ---   פּ ﯟ   some other good icons +-- 󰃐 󰆩 󰙅 󰛡  󰅲 some other good icons local kind_icons = { - Text = "", + Text = "󰉿", Method = "m", - Function = "", + Function = "󰊕", Constructor = "", Field = "", - Variable = "", - Class = "", + Variable = "󰆧", + Class = "󰌗", Interface = "", Module = "", Property = "", Unit = "", - Value = "", + Value = "󰎠", Enum = "", - Keyword = "", + Keyword = "󰌋", Snippet = "", - Color = "", - File = "", + Color = "󰏘", + File = "󰈙", Reference = "", - Folder = "", + Folder = "󰉋", EnumMember = "", - Constant = "", + Constant = "󰇽", Struct = "", Event = "", - Operator = "", - TypeParameter = "", + Operator = "󰆕", + TypeParameter = "󰊄", } -- find more here: https://www.nerdfonts.com/cheat-sheet @@ -153,8 +153,8 @@ cmp.setup { { name = 'nvim_lua' }, { name = 'luasnip' }, { name = 'nvim_lsp_signature_help' }, - { name = "path" }, - { name = "orgmode" } + { name = 'path' }, + { name = 'orgmode' } }, { --This sources will only show up if there aren't any sources from the other list diff --git a/.config/nvim/after/plugin/treesitter.lua b/.config/nvim/after/plugin/treesitter.lua index 59c6564..7ddfa82 100644 --- a/.config/nvim/after/plugin/treesitter.lua +++ b/.config/nvim/after/plugin/treesitter.lua @@ -1,5 +1,5 @@ require'nvim-treesitter.configs'.setup { - ensure_installed = {"vim","python","rust","lua","haskell","c","java", "bash","go"}, + ensure_installed = {"lua","vim","python","rust","haskell","c","java", "bash","go"}, sync_install = false, highlight = { diff --git a/.config/nvim/lua/tsousa/packer.lua b/.config/nvim/lua/tsousa/packer.lua index 075d5bf..65d934d 100644 --- a/.config/nvim/lua/tsousa/packer.lua +++ b/.config/nvim/lua/tsousa/packer.lua @@ -9,19 +9,30 @@ return require('packer').startup(function(use) use("tpope/vim-fugitive") use("theprimeagen/harpoon") use("mbbill/undotree") - use("j-hui/fidget.nvim") + + -- fidget change when rewrite version comes out + use { + 'j-hui/fidget.nvim', + tag = 'legacy', + config = function() + require("fidget").setup { + -- options + } + end, + } use("norcalli/nvim-colorizer.lua") use("nvim-orgmode/orgmode") use("lervag/vimtex") - use({"hrsh7th/nvim-cmp", + use({ + "hrsh7th/nvim-cmp", requires = { "hrsh7th/cmp-nvim-lsp", -- lsp - "hrsh7th/cmp-buffer", --buffer completions - "hrsh7th/cmp-path", --path completions - "hrsh7th/cmp-cmdline" --cmdline completions + "hrsh7th/cmp-buffer", --buffer completions + "hrsh7th/cmp-path", --path completions + "hrsh7th/cmp-cmdline" --cmdline completions }, }) @@ -31,11 +42,12 @@ return require('packer').startup(function(use) use("neovim/nvim-lspconfig") use("mfussenegger/nvim-jdtls") use("jose-elias-alvarez/null-ls.nvim") - use({"L3MON4D3/LuaSnip", - requires = { - "saadparwaiz1/cmp_luasnip" - }, - }) + use({ + "L3MON4D3/LuaSnip", + requires = { + "saadparwaiz1/cmp_luasnip" + }, + }) use("nvim-treesitter/nvim-treesitter", { run = ":TSUpdate" diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 5e86f77..e413963 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -49,8 +49,8 @@ local function save_profiles(threshold) end time([[Luarocks path setup]], true) -local package_path_str = "/home/tsousa/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/tsousa/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/tsousa/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/tsousa/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" -local install_cpath_pattern = "/home/tsousa/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so" +local package_path_str = "/home/tsousa/.cache/nvim/packer_hererocks/2.1.1694285958/share/lua/5.1/?.lua;/home/tsousa/.cache/nvim/packer_hererocks/2.1.1694285958/share/lua/5.1/?/init.lua;/home/tsousa/.cache/nvim/packer_hererocks/2.1.1694285958/lib/luarocks/rocks-5.1/?.lua;/home/tsousa/.cache/nvim/packer_hererocks/2.1.1694285958/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/tsousa/.cache/nvim/packer_hererocks/2.1.1694285958/lib/lua/5.1/?.so" if not string.find(package.path, package_path_str, 1, true) then package.path = package.path .. ';' .. package_path_str end @@ -105,6 +105,7 @@ _G.packer_plugins = { url = "https://github.com/saadparwaiz1/cmp_luasnip" }, ["fidget.nvim"] = { + config = { "\27LJ\2\n8\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\vfidget\frequire\0" }, loaded = true, path = "/home/tsousa/.local/share/nvim/site/pack/packer/start/fidget.nvim", url = "https://github.com/j-hui/fidget.nvim" @@ -227,6 +228,10 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], false) +-- Config for: fidget.nvim +time([[Config for fidget.nvim]], true) +try_loadstring("\27LJ\2\n8\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\vfidget\frequire\0", "config", "fidget.nvim") +time([[Config for fidget.nvim]], false) _G._packer.inside_compile = false if _G._packer.needs_bufread == true then diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index e90d746..ccf4216 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -289,8 +289,8 @@ backend = "glx"; # Enable/disable VSync. -#vsync = true -vsync = false +vsync = true +#vsync = false # Enable remote control via D-Bus. See the *D-BUS API* section below for more details. # dbus = false