diff --git a/.config/awesome/rc.lua b/.config/awesome/rc.lua index 8df14dc..1f8e1e1 100644 --- a/.config/awesome/rc.lua +++ b/.config/awesome/rc.lua @@ -631,6 +631,7 @@ apps = { "killall cbatticon", "cbatticon BAT0 -i symbolic", "flameshot", + "blueman-applet", } for _, app in ipairs(apps) do diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index b2806b5..e820dbb 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -4,8 +4,6 @@ vim.g.mapleader = " " -vim.o.path = vim.o.path .. ",**" - vim.o.expandtab = true vim.o.shiftwidth = 4 vim.o.smartindent = true @@ -34,11 +32,14 @@ vim.wo.cc = "80" ----- packages ----- -------------------- +vim.cmd("packadd plenary") + require"pack-black" require"pack-dirdiff" require"pack-easy-align" require"pack-indent-blankline" require"pack-lspconfig" +require"pack-telescope" require"pack-treesitter" require"pack-which-key" diff --git a/.config/nvim/lua/pack-telescope.lua b/.config/nvim/lua/pack-telescope.lua new file mode 100644 index 0000000..2a31ac0 --- /dev/null +++ b/.config/nvim/lua/pack-telescope.lua @@ -0,0 +1,9 @@ +vim.cmd("packadd telescope") +require"telescope".setup {} + +local builtin = require("telescope.builtin") + +vim.keymap.set("n", "tf", builtin.find_files, {}) +vim.keymap.set("n", "tg", builtin.live_grep, {}) +vim.keymap.set("n", "tb", builtin.buffers, {}) +vim.keymap.set("n", "th", builtin.help_tags, {}) diff --git a/.config/nvim/pack/plugins/opt/black b/.config/nvim/pack/plugins/opt/black index 1a20c4d..27d7ea4 160000 --- a/.config/nvim/pack/plugins/opt/black +++ b/.config/nvim/pack/plugins/opt/black @@ -1 +1 @@ -Subproject commit 1a20c4d4874f912822f6a42cb61816330a4f6508 +Subproject commit 27d7ea43eb127cc5189a724a7d194d94ba312861 diff --git a/.config/nvim/pack/plugins/opt/plenary b/.config/nvim/pack/plugins/opt/plenary new file mode 160000 index 0000000..4b7e520 --- /dev/null +++ b/.config/nvim/pack/plugins/opt/plenary @@ -0,0 +1 @@ +Subproject commit 4b7e52044bbb84242158d977a50c4cbcd85070c7 diff --git a/.config/nvim/pack/plugins/opt/telescope b/.config/nvim/pack/plugins/opt/telescope new file mode 160000 index 0000000..76ea9a8 --- /dev/null +++ b/.config/nvim/pack/plugins/opt/telescope @@ -0,0 +1 @@ +Subproject commit 76ea9a898d3307244dce3573392dcf2cc38f340f diff --git a/.config/nvim/pack/plugins/opt/treesitter b/.config/nvim/pack/plugins/opt/treesitter index 7ccb9a0..ffd4525 160000 --- a/.config/nvim/pack/plugins/opt/treesitter +++ b/.config/nvim/pack/plugins/opt/treesitter @@ -1 +1 @@ -Subproject commit 7ccb9a056fa43da243e3a439109c354c551c51b6 +Subproject commit ffd4525fd9e61950520cea4737abc1800ad4aabb diff --git a/.config/sway/config.d/30-startup.conf b/.config/sway/config.d/30-startup.conf index f4ee3f4..e0687a0 100644 --- a/.config/sway/config.d/30-startup.conf +++ b/.config/sway/config.d/30-startup.conf @@ -15,4 +15,5 @@ bar swaybar_command waybar exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec gammastep +exec blueman-applet exec nm-applet --indicator diff --git a/.config/zsh/ohmyzsh b/.config/zsh/ohmyzsh index 7dcabbe..570158e 160000 --- a/.config/zsh/ohmyzsh +++ b/.config/zsh/ohmyzsh @@ -1 +1 @@ -Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0 +Subproject commit 570158e464c9f57ab03c4162b4e6853b2c7c650d diff --git a/.gitmodules b/.gitmodules index 8470a0e..a1745e6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,6 +13,12 @@ [submodule ".config/nvim/pack/plugins/opt/lspconfig"] path = .config/nvim/pack/plugins/opt/lspconfig url = https://github.com/neovim/nvim-lspconfig.git +[submodule ".config/nvim/pack/plugins/opt/plenary"] + path = .config/nvim/pack/plugins/opt/plenary + url = https://github.com/nvim-lua/plenary.nvim.git +[submodule ".config/nvim/pack/plugins/opt/telescope"] + path = .config/nvim/pack/plugins/opt/telescope + url = https://github.com/nvim-telescope/telescope.nvim.git [submodule ".config/nvim/pack/plugins/opt/treesitter"] path = .config/nvim/pack/plugins/opt/treesitter url = https://github.com/nvim-treesitter/nvim-treesitter.git diff --git a/.xinitrc b/.xinitrc index 23534a6..bc3996b 100644 --- a/.xinitrc +++ b/.xinitrc @@ -2,6 +2,6 @@ xrandr \ --output eDP-1 --auto --primary \ - --output HDMI-2 --auto --right-of eDP-1 + --output HDMI-A-1 --auto --right-of eDP-1 exec awesome