Update alacritty, tuigreetd, add nvim-pack-lock

5 files changed, 42 insertions, 6 deletions

diff --git a/Common/nvim/nvim-pack-lock.json b/Common/nvim/nvim-pack-lock.json
new file mode 100644
index 0000000..58252e4
--- /dev/null
+++ b/Common/nvim/nvim-pack-lock.json
@@ -0,0 +1,32 @@
+{
+  "plugins": {
+    "fzf": {
+      "rev": "3ccf162cf0222c05d52a0c1a550918e6275c49d7",
+      "src": "https://github.com/junegunn/fzf"
+    },
+    "fzf.vim": {
+      "rev": "34a564c81f36047f50e593c1656f4580ff75ccca",
+      "src": "https://github.com/junegunn/fzf.vim"
+    },
+    "mason-lspconfig.nvim": {
+      "rev": "037398b9ce4a53ba48d5f94765c641a1fd16d906",
+      "src": "https://github.com/mason-org/mason-lspconfig.nvim"
+    },
+    "mason.nvim": {
+      "rev": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65",
+      "src": "https://github.com/mason-org/mason.nvim"
+    },
+    "nvim-lspconfig": {
+      "rev": "16812abf0e8d8175155f26143a8504e8253e92b0",
+      "src": "https://github.com/neovim/nvim-lspconfig"
+    },
+    "vim-dadbod": {
+      "rev": "6d1d41da4873a445c5605f2005ad2c68c99d8770",
+      "src": "https://github.com/tpope/vim-dadbod"
+    },
+    "vim-fugitive": {
+      "rev": "3b753cf8c6a4dcde6edee8827d464ba9b8c4a6f0",
+      "src": "https://github.com/tpope/vim-fugitive"
+    }
+  }
+}
diff --git a/Makefile.m4 b/Makefile.m4
index 443e4a4..bafedc1 100644
--- a/Makefile.m4
+++ b/Makefile.m4
@@ -231,8 +231,9 @@ m4_ifelse(DT_TLP, `yes', `tlp',) m4_dnl
 m4_dnl
 m4_ifelse(DT_SWAY, `yes', `sway swayidle physlock blueman network-manager-gnome wob wlogout wofi brightnessctl clipman xwayland seahorse fcitx5',) m4_dnl
 m4_ifelse(DT_NEOVIM, `yes', `cmake gettext',) m4_dnl
-m4_ifelse(DT_ALACRITTY, `yes', `libfontconfig1-dev pkg-config',)
-m4_dnl
+m4_ifelse(DT_ALACRITTY, `yes', `libfontconfig1-dev pkg-config',) m4_dnl
+m4_ifelse(DT_I3,    `yes', `i3 xorg pulseaudio pulseaudio-utils pavucontrol pasystray network-manager-applet firefox-esr brightnessctl',) m4_dnl
+m4_ifelse(DT_ALACRITTY, `yes', `alacritty',)
 
 
 install_packages:
@@ -266,6 +267,7 @@ m4_dnl
 m4_ifelse(DT_QTILE, `yes', `python3-cffi python3-cairocffi pango pango-devel python3-dbus-next',) m4_dnl qtile core
 m4_ifelse(DT_QTILE, `yes', `python3-xcffib xsecurelock',) m4_dnl qtile x11
 m4_ifelse(DT_QTILE, `yes', `wlroots python3-pywayland python3-xkbcommon',) m4_dnl qtile wayland
+m4_ifelse(DT_I3,    `yes', `i3 xorg pulseaudio pulseaudio-utils pavucontrol pasystray network-manager-applet firefox-esr brightnessctl',) m4_dnl
 
 
 install_packages:
diff --git a/linux/alacritty/alacritty.toml b/linux/alacritty/alacritty.toml
index 39b0972..fc43360 100644
--- a/linux/alacritty/alacritty.toml
+++ b/linux/alacritty/alacritty.toml
@@ -1,5 +1,3 @@
-import = ["/home/jakob/.config/alacritty/papertheme.toml"]
-live_config_reload = true
 
 [env]
 TERM = "alacritty"
@@ -23,3 +21,7 @@ mods = "Alt"
 [window.padding]
 x = 0
 y = 0
+
+[general]
+live_config_reload = true
+import = ["/home/jakob/.config/alacritty/papertheme.toml"]
diff --git a/linux/greetd.toml b/linux/greetd.toml
index 52a9f74..981286f 100644
--- a/linux/greetd.toml
+++ b/linux/greetd.toml
@@ -8,7 +8,7 @@ vt = 8
 
 # `agreety` is the bundled agetty/login-lookalike. You can replace `/bin/sh`
 # with whatever you want started, such as `sway`.
-command = "/usr/local/bin/tuigreet --remember --remember-user-session --asterisks --cmd sway"
+command = "/usr/bin/tuigreet --remember --remember-user-session --asterisks --cmd startx i3"
 
 # The user to run the command as. The privileges this user must have depends
 # on the greeter. A graphical greeter may for example require the user to be
diff --git a/linux/i3/config b/linux/i3/config
index 0e7e46f..9398fab 100644
--- a/linux/i3/config
+++ b/linux/i3/config
@@ -52,7 +52,7 @@ floating_modifier $mod
 tiling_drag modifier titlebar
 
 # start a terminal
-bindsym $mod+Return exec /home/jakob/.cargo/bin/alacritty
+bindsym $mod+Return exec alacritty
 
 # kill focused window
 bindsym $mod+Shift+q kill