diff --git a/.config/fish/myfunctions/replacements.fish b/.config/fish/myfunctions/replacements.fish index e8ab78a..35fd08f 100644 --- a/.config/fish/myfunctions/replacements.fish +++ b/.config/fish/myfunctions/replacements.fish @@ -1,5 +1,5 @@ function ls - eza --icons -l --sort type $argv + eza --icons -l $argv end abbr -a find fd abbr -a df duf diff --git a/.config/nvim/lua/plugins/lazy.lua b/.config/nvim/lua/plugins/lazy.lua index 330ded1..d8e8268 100644 --- a/.config/nvim/lua/plugins/lazy.lua +++ b/.config/nvim/lua/plugins/lazy.lua @@ -25,18 +25,15 @@ lazy.setup({ --better navigation with 's-letter' { 'ggandor/leap.nvim', - event = "VeryLazy", config = function() require('leap').add_default_mappings() end }, - --Nvim to browser 'subnut/nvim-ghost.nvim', { '2kabhishek/nerdy.nvim', - event = "VeryLazy", dependencies = { 'stevearc/dressing.nvim', 'nvim-telescope/telescope.nvim', @@ -60,7 +57,6 @@ lazy.setup({ { "folke/todo-comments.nvim", - event = "VeryLazy", dependencies = { "nvim-lua/plenary.nvim" }, config = function() require("todo-comments").setup {} @@ -69,7 +65,6 @@ lazy.setup({ { 'folke/zen-mode.nvim', - event = "VeryLazy", config = function() require("zen-mode").setup { vim.keymap.set('n', 'z', ' ZenMode ', { noremap = true, silent = true }) @@ -80,6 +75,8 @@ lazy.setup({ --Change add and remove surroundings from words 'tpope/vim-surround', 'tpope/vim-obsession', + 'tpope/vim-fugitive', + { 'NvChad/nvim-colorizer.lua', @@ -90,7 +87,6 @@ lazy.setup({ { "roobert/tailwindcss-colorizer-cmp.nvim", - event = "VeryLazy", config = function() require("tailwindcss-colorizer-cmp").setup({ color_square_width = 2, @@ -99,7 +95,6 @@ lazy.setup({ }, { 'laytan/tailwind-sorter.nvim', - event = "VeryLazy", dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-lua/plenary.nvim' }, build = 'cd formatter && bun i && bun run build', config = true, @@ -136,7 +131,6 @@ lazy.setup({ 'stevearc/dressing.nvim', { 'krady21/compiler-explorer.nvim', - event = "VeryLazy", config = function() require("compiler-explorer").setup({ url = "https://godbolt.org", @@ -159,8 +153,7 @@ lazy.setup({ }, { - 'luk400/vim-jukit', - event = "VeryLazy", + 'luk400/vim-jukit' }, { @@ -185,7 +178,6 @@ lazy.setup({ { 'stevearc/oil.nvim', - event = "VeryLazy", config = function() require("oil").setup() end @@ -239,9 +231,10 @@ lazy.setup({ end }, + 'simrat39/rust-tools.nvim', + { 'nvimtools/none-ls.nvim', - event = "VeryLazy", config = function() require 'plugins.none-ls' end @@ -249,7 +242,6 @@ lazy.setup({ { 'lervag/vimtex', - event = "VeryLazy", config = function() require 'plugins.vimtex' end @@ -285,7 +277,7 @@ lazy.setup({ --does so much { 'nvim-telescope/telescope.nvim', - tag = '0.1.4', + tag = '0.1.0', -- or , branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim' }, config = function() require('plugins.telescope') end @@ -303,19 +295,19 @@ lazy.setup({ -------------------------------------------OTHERS---------------------------------------------- - -- { - -- "nvim-neorg/neorg", - -- build = ":Neorg sync-parsers", - -- config = function() - -- require("neorg").setup { - -- load = { - -- ["core.defaults"] = {}, -- Loads default behaviour - -- ["core.concealer"] = {} -- Adds pretty icons to your documents - -- }, - -- } - -- end, - -- dependencies = { "nvim-lua/plenary.nvim" }, - -- }, + { + "nvim-neorg/neorg", + build = ":Neorg sync-parsers", + config = function() + require("neorg").setup { + load = { + ["core.defaults"] = {}, -- Loads default behaviour + ["core.concealer"] = {} -- Adds pretty icons to your documents + }, + } + end, + dependencies = { "nvim-lua/plenary.nvim" }, + }, -- 'kmonad/kmonad-vim', -- 'elkowar/yuck.vim', diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua index 0d4df96..0f36dc7 100644 --- a/.config/nvim/lua/plugins/lspconfig.lua +++ b/.config/nvim/lua/plugins/lspconfig.lua @@ -59,3 +59,29 @@ mason_lspconfig.setup_handlers { } end, } + +require('lspconfig')['hls'].setup { + filetypes = { 'haskell', 'lhaskell', 'cabal' }, + on_attach = on_attach, + flags = lsp_flags, + capabilities = capabilities, +} + +require("rust-tools").setup({ + server = { + on_attach = on_attach, + capabilities = capabilities, + settings = { + ["rust-analyzer"] = { + checkOnSave = { + command = "clippy", + }, + }, + }, + }, + tools = { + hover_actions = { + auto_focus = true, + }, + }, +}) diff --git a/.config/wireplumber/main.lua.d/51-acer-monitor.lua b/.config/wireplumber/main.lua.d/51-acer-monitor.lua index 211b84d..25f6e20 100644 --- a/.config/wireplumber/main.lua.d/51-acer-monitor.lua +++ b/.config/wireplumber/main.lua.d/51-acer-monitor.lua @@ -1,7 +1,7 @@ rule ={ matches = { { - {"node.description","equals","GA104 High Definition Audio Controller Digital Stereo (HDMI)"}, + {"node.name","equals","GA104 High Definition Audio Controller Digital Stereo (HDMI 2)"}, } }, apply_properties = { diff --git a/.config/xmobar/scripts/battery.sh b/.config/xmobar/scripts/battery.sh index a8d02e3..7bb01e0 100755 --- a/.config/xmobar/scripts/battery.sh +++ b/.config/xmobar/scripts/battery.sh @@ -12,7 +12,7 @@ then echo "" exit 0 fi - echo "󰋋 $xm3bat% " + echo "󰋋 $xm3bat%" exit 0 fi @@ -24,55 +24,55 @@ if [ $batLevel -le 20 ]; then if [ $charging == "on-line" ]; then - echo "󰂆 $batLevel% " + echo "󰂆 $batLevel%" else - echo "󰁻 $batLevel% " + echo "󰁻 $batLevel%" fi elif [ $batLevel -le 30 ]; then if [ $charging == "on-line" ]; then - echo "󰂇 $batLevel% " + echo "󰂇 $batLevel%" else - echo "󰁼 $batLevel% " + echo "󰁼 $batLevel%" fi elif [ $batLevel -le 40 ]; then if [ $charging == "on-line" ]; then - echo "󰂈 $batLevel% " + echo "󰂈 $batLevel%" else - echo "󰁽 $batLevel% " + echo "󰁽 $batLevel%" fi elif [ $batLevel -le 60 ]; then if [ $charging == "on-line" ]; then - echo "󰂉 $batLevel% " + echo "󰂉 $batLevel%" else - echo "󰁿 $batLevel% " + echo "󰁿 $batLevel%" fi elif [ $batLevel -le 80 ]; then if [ $charging == "on-line" ]; then - echo "󰂊 $batLevel% " + echo "󰂊 $batLevel%" else - echo "󰂁 $batLevel% " + echo "󰂁 $batLevel%" fi elif [ $batLevel -le 95 ]; then if [ $charging == "on-line" ]; then - echo "󰂋 $batLevel% " + echo "󰂋 $batLevel%" else - echo "󰂂 $batLevel% " + echo "󰂂 $batLevel%" fi else if [ $charging == "on-line" ]; then - echo "󰂅 $batLevel% " + echo "󰂅 $batLevel%" else - echo "󰁹 $batLevel% " + echo "󰁹 $batLevel%" fi fi diff --git a/.gitconfig b/.gitconfig index 2e1d6a7..276e126 100644 --- a/.gitconfig +++ b/.gitconfig @@ -17,5 +17,3 @@ gpgsign = true [pull] rebase = false -[init] - defaultBranch = main diff --git a/.local/bin/shellcheck b/.local/bin/shellcheck deleted file mode 100755 index f2941dc..0000000 Binary files a/.local/bin/shellcheck and /dev/null differ diff --git a/.local/bin/watchsync b/.local/bin/watchsync deleted file mode 100755 index 4e4addf..0000000 --- a/.local/bin/watchsync +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -watch -d grep -e Dirty: /proc/meminfo diff --git a/.local/bin/xmobar b/.local/bin/xmobar deleted file mode 100755 index edee424..0000000 Binary files a/.local/bin/xmobar and /dev/null differ diff --git a/.local/bin/xmonad b/.local/bin/xmonad deleted file mode 100755 index 414f8a5..0000000 Binary files a/.local/bin/xmonad and /dev/null differ diff --git a/.ssh/config b/.ssh/config index 1bd80f6..56bae1c 100644 --- a/.ssh/config +++ b/.ssh/config @@ -8,12 +8,3 @@ Host gon Port 522 ControlPath ~/.ssh/session.%r@%h:%p ControlPersist 5m - -Host search - ControlMaster auto - HostName s7edu2.di.uminho.pt - User pg53595 - Port 22 - IdentityFile ~/.ssh/id_search - ControlPath ~/.ssh/session.%r@%h:%p - ControlPersist 5m