merge: work

This commit is contained in:
AngeD 2022-10-04 18:07:14 +02:00
commit 73b98ef98c
11 changed files with 26 additions and 6 deletions

View File

@ -631,6 +631,7 @@ apps = {
"killall cbatticon", "killall cbatticon",
"cbatticon BAT0 -i symbolic", "cbatticon BAT0 -i symbolic",
"flameshot", "flameshot",
"blueman-applet",
} }
for _, app in ipairs(apps) do for _, app in ipairs(apps) do

View File

@ -4,8 +4,6 @@
vim.g.mapleader = " " vim.g.mapleader = " "
vim.o.path = vim.o.path .. ",**"
vim.o.expandtab = true vim.o.expandtab = true
vim.o.shiftwidth = 4 vim.o.shiftwidth = 4
vim.o.smartindent = true vim.o.smartindent = true
@ -34,11 +32,14 @@ vim.wo.cc = "80"
----- packages ----- ----- packages -----
-------------------- --------------------
vim.cmd("packadd plenary")
require"pack-black" require"pack-black"
require"pack-dirdiff" require"pack-dirdiff"
require"pack-easy-align" require"pack-easy-align"
require"pack-indent-blankline" require"pack-indent-blankline"
require"pack-lspconfig" require"pack-lspconfig"
require"pack-telescope"
require"pack-treesitter" require"pack-treesitter"
require"pack-which-key" require"pack-which-key"

View File

@ -0,0 +1,9 @@
vim.cmd("packadd telescope")
require"telescope".setup {}
local builtin = require("telescope.builtin")
vim.keymap.set("n", "<Leader>tf", builtin.find_files, {})
vim.keymap.set("n", "<Leader>tg", builtin.live_grep, {})
vim.keymap.set("n", "<Leader>tb", builtin.buffers, {})
vim.keymap.set("n", "<Leader>th", builtin.help_tags, {})

@ -1 +1 @@
Subproject commit 1a20c4d4874f912822f6a42cb61816330a4f6508 Subproject commit 27d7ea43eb127cc5189a724a7d194d94ba312861

@ -0,0 +1 @@
Subproject commit 4b7e52044bbb84242158d977a50c4cbcd85070c7

@ -0,0 +1 @@
Subproject commit 76ea9a898d3307244dce3573392dcf2cc38f340f

@ -1 +1 @@
Subproject commit 7ccb9a056fa43da243e3a439109c354c551c51b6 Subproject commit ffd4525fd9e61950520cea4737abc1800ad4aabb

View File

@ -15,4 +15,5 @@ bar swaybar_command waybar
exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
exec gammastep exec gammastep
exec blueman-applet
exec nm-applet --indicator exec nm-applet --indicator

@ -1 +1 @@
Subproject commit 7dcabbe6826073ef6069c8a4b6f9a943f00d2df0 Subproject commit 570158e464c9f57ab03c4162b4e6853b2c7c650d

6
.gitmodules vendored
View File

@ -13,6 +13,12 @@
[submodule ".config/nvim/pack/plugins/opt/lspconfig"] [submodule ".config/nvim/pack/plugins/opt/lspconfig"]
path = .config/nvim/pack/plugins/opt/lspconfig path = .config/nvim/pack/plugins/opt/lspconfig
url = https://github.com/neovim/nvim-lspconfig.git 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"] [submodule ".config/nvim/pack/plugins/opt/treesitter"]
path = .config/nvim/pack/plugins/opt/treesitter path = .config/nvim/pack/plugins/opt/treesitter
url = https://github.com/nvim-treesitter/nvim-treesitter.git url = https://github.com/nvim-treesitter/nvim-treesitter.git

View File

@ -2,6 +2,6 @@
xrandr \ xrandr \
--output eDP-1 --auto --primary \ --output eDP-1 --auto --primary \
--output HDMI-2 --auto --right-of eDP-1 --output HDMI-A-1 --auto --right-of eDP-1
exec awesome exec awesome