Nvim: add packages to mason-lock

config-root.toml

@@ -143,9 +143,9 @@ dst = "/etc/pacserve/pacserve.service.conf"
 src = "etc/mkinitcpio.d/linux.preset"
 dst = "/etc/mkinitcpio.d/linux.preset"
 
-[dotfiles."f_mkinitcpio_linux-lts.preset"]
-src = "etc/mkinitcpio.d/linux-lts.preset"
-dst = "/etc/mkinitcpio.d/linux-lts.preset"
+[dotfiles."f_mkinitcpio_linux-cachyos.preset"]
+src = "etc/mkinitcpio.d/linux-cachyos.preset"
+dst = "/etc/mkinitcpio.d/linux-cachyos.preset"
 
 [dotfiles.f_cmdline]
 src = "etc/kernel/cmdline"
@@ -196,7 +196,7 @@ dotfiles = [
   "f_logind.conf",
   "f_mkinitcpio.conf",
   "f_mkinitcpio_linux.preset",
-  "f_mkinitcpio_linux-lts.preset",
+  "f_mkinitcpio_linux-cachyos.preset",
   "f_plymouthd.conf",
   "f_sshd_config",
   "f_system.conf",
@@ -216,7 +216,7 @@ dotfiles = [
   "f_adb.service",
   "f_mkinitcpio.conf",
   "f_mkinitcpio_linux.preset",
-  "f_mkinitcpio_linux-lts.preset",
+  "f_mkinitcpio_linux-cachyos.preset",
   "f_plymouthd.conf",
   "f_sshd_config",
   "f_flexo.toml",

config.toml

@@ -168,17 +168,14 @@ dotfiles = ["f_makepkg.conf", "f_paru.conf"]
 
 [profiles.terminal]
 dotfiles = [
-  "d_wal",
   "d_nvim",
   "d_ssh",
   "d_zsh",
-  "f_alacritty.yml",
   "f_gitconfig",
   "f_hushlogin",
   "f_ignore",
   "f_ranger.conf",
   "f_ranger_commands.py",
-  "f_rtv.cfg",
   "f_zellij",
   "f_zshrc",
   "f_npmrc",
@@ -190,10 +187,8 @@ dotfiles = [
   "f_abcde.conf",
   "f_beets_config",
   "f_beets_whitelist",
-  "f_libra_config",
   "f_mpd.conf",
   "f_mpdris2.conf",
-  "f_mpdscribble.conf",
   "f_ncmpcpp.conf",
   "f_ncmpcpp_bindings",
 ]
@@ -209,7 +204,6 @@ dotfiles = [
 [profiles.Mirkwood]
 include = ["pacman", "terminal", "media", "gpg"]
 dotfiles = [
-  "d_rofi",
   "f_librewolf_overrides",
   "f_dconf.ini",
   "f_docker-config.json",

docker/homeautomation/docker-compose.toml

@@ -1,45 +1,105 @@
 [volumes]
 hass = {}
-rhasspy = {}
 mosquitto = {}
+piper_english = {}
+whisper_english = {}
+openwakeword_english = {}
 
 [services.home-assistant]
 container_name = "home-assistant"
 image = "homeassistant/home-assistant"
+restart = "unless-stopped"
 environment = ["TZ=Europe/Helsinki"]
 devices = ["/dev/ttyACM0"]
 volumes = ["hass:/config", "/etc/localtime:/etc/localtime:ro"]
-restart = "unless-stopped"
 networks = ["homeautomation", "postgres", "proxy"]
 ports = ["8123:8123", "8300:8300"]
 extra_hosts = ["host.docker.internal:host-gateway"]
-depends_on = ["mosquitto"]
 
 [services.mosquitto]
 container_name = "mosquitto"
 image = "eclipse-mosquitto"
+restart = "unless-stopped"
 environment = ["TZ=Europe/Helsinki"]
+networks = ["homeautomation"]
 ports = ["1883:1883", "8866:8866"]
-networks = ["homeautomation"]
-volumes = [
-  "mosquitto:/mosquitto",
-  "/etc/localtime:/etc/localtime:ro",
-]
-restart = "unless-stopped"
+volumes = ["mosquitto:/mosquitto", "/etc/localtime:/etc/localtime:ro"]
 
-[services.rhasspy]
-container_name = "rhasspy"
-image = "rhasspy/rhasspy"
-command = "--profile en --user-profiles /profiles"
-volumes = ["rhasspy:/profiles"]
+[services.piper_english]
+container_name = "piper_english"
+image = "rhasspy/wyoming-piper"
+restart = "unless-stopped"
 environment = ["TZ=Europe/Helsinki"]
-ports = ["12101:12101"]
+ports = ["10200:10200"]
 networks = ["homeautomation"]
-restart = "unless-stopped"
-depends_on = ["home-assistant"]
-devices = ["/dev/snd:/dev/snd"]
+command = ["--voice", "en_US-hfc_male-medium"]
+volumes = ["piper_english:/data", "/etc/localtime:/etc/localtime:ro"]
 
-[networks]
+[services.whisper_english]
+container_name = "whisper_english"
+image = "rhasspy/wyoming-whisper"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+ports = ["10300:10300"]
+networks = ["homeautomation"]
+depends_on = ["home-assistant"]
+command = ["--model", "tiny-int8", "--language", "en"]
+volumes = ["whisper_english:/data", "/etc/localtime:/etc/localtime:ro"]
+
+[services.openwakeword_english]
+container_name = "openwakeword_english"
+image = "rhasspy/wyoming-openwakeword"
+restart = "unless-stopped"
+environment = ["TZ=Europe/Helsinki"]
+networks = ["homeautomation"]
+command = ["--preload-model", "ok_nabu"]
+depends_on = ["home-assistant"]
+volumes = ["openwakeword_english:/data", "/etc/localtime:/etc/localtime:ro"]
+
+[services.microphone]
+build = "https://github.com/rhasspy/wyoming-mic-external.git"
+image = "rhasspy/wyoming-mic-external"
+container_name = "microphone"
+restart = "unless-stopped"
+devices = ["/dev/snd:/dev/snd"]
+ports = ["10600:10600"]
+group_add = ["audio"]
+networks = ["homeautomation"]
+command = ["--device", "plughw:CARD=USB,DEV=0", "--debug"]
+volumes = ["/etc/localtime:/etc/localtime:ro"]
+
+[services.speaker]
+build = "https://github.com/rhasspy/wyoming-snd-external.git"
+image = "rhasspy/wyoming-snd-external"
+container_name = "speaker"
+restart = "unless-stopped"
+devices = ["/dev/snd:/dev/snd"]
+ports = ["10601:10601"]
+group_add = ["audio"]
+networks = ["homeautomation"]
+command = ["--device", "iec958:CARD=USB,DEV=0", "--debug"]
+volumes = ["/etc/localtime:/etc/localtime:ro"]
+
+[services.satellite]
+build = "https://github.com/rhasspy/wyoming-satellite.git"
+image = "rhasspy/wyoming-satellite"
+container_name = "satellite"
+restart = "unless-stopped"
+ports = ["10700:10700"]
+networks = ["homeautomation"]
+depends_on = ["speaker", "microphone", "whisper_english"]
+command = [
+  "--name",
+  "ha-server-satellite",
+  "--mic-uri",
+  "tcp://microphone:10600",
+  "--snd-uri",
+  "tcp://speaker:10601",
+  "--wake-uri",
+  "tcp://openwakeword_english:10400",
+  "--debug",
+]
+volumes = ["/etc/localtime:/etc/localtime:ro"]
 
 [networks.homeautomation]
 external = false

home/.config/nvim/lazy-lock.json

@@ -1,8 +1,8 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "8ae1dedd988eb56441b7858bd1e8554dfadaa46d" },
-  "alpha-nvim": { "branch": "main", "commit": "1356b9ef31b985d541d94314f2cf73c61124bf1d" },
-  "auto-dark-mode.nvim": { "branch": "master", "commit": "76e8d40d1e1544bae430f739d827391cbcb42fcc" },
-  "bufferline.nvim": { "branch": "main", "commit": "d6cb9b7cac52887bcac65f8698e67479553c0748" },
+  "LuaSnip": { "branch": "master", "commit": "a7a4b4682c4b3e2ba82b82a4e6e5f5a0e79dec32" },
+  "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" },
+  "auto-dark-mode.nvim": { "branch": "master", "commit": "e328dc463d238cb7d690fb4daf068eba732a5a14" },
+  "bufferline.nvim": { "branch": "main", "commit": "64e2c5def50dfd6b6f14d96a45fa3d815a4a1eef" },
   "cder.nvim": { "branch": "main", "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-cmdline": { "branch": "main", "commit": "8ee981b4a91f536f52add291594e89fb6645e451" },
@@ -13,54 +13,54 @@
   "cmp-spell": { "branch": "master", "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
   "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" },
-  "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" },
+  "copilot.lua": { "branch": "master", "commit": "f7612f5af4a7d7615babf43ab1e67a2d790c13a6" },
   "diffview.nvim": { "branch": "main", "commit": "3dc498c9777fe79156f3d32dddd483b8b3dbd95f" },
-  "dropbar.nvim": { "branch": "master", "commit": "4516fdf6bf64f7d5719665b4d446cc49d656bd96" },
-  "firenvim": { "branch": "master", "commit": "1acdf0270bdd9b83a876a15c99dca3c9b40fbaa5" },
-  "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
-  "kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
-  "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" },
-  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
-  "markdown-preview.nvim": { "branch": "master", "commit": "9becceee5740b7db6914da87358a183ad11b2049" },
+  "dropbar.nvim": { "branch": "master", "commit": "f1034cfe852cf62a0ebb12ae583f1477ea07e060" },
+  "firenvim": { "branch": "master", "commit": "3363c140dca2ef0b89e2be0317917f077d752cd7" },
+  "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" },
+  "gitsigns.nvim": { "branch": "main", "commit": "4e348641b8206c3b8d23080999e3ddbe4ca90efc" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
+  "kanagawa.nvim": { "branch": "master", "commit": "bfa818c7bf6259152f1d89cf9fbfba3554c93695" },
+  "lazy.nvim": { "branch": "main", "commit": "83493db50a434a4c5c648faf41e2ead80f96e478" },
+  "lualine.nvim": { "branch": "master", "commit": "af4c3cf17206810880d2a93562e0a4c0d901c684" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
   "mason-extra-cmds": { "branch": "main", "commit": "4d987485b4435bca6d2da735247482f40f839d6b" },
   "mason-lock.nvim": { "branch": "main", "commit": "4fb91ae8cbd85b7c6fa56f823231edfded07f17a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "56e435e09f8729af2d41973e81a0db440f8fe9c9" },
-  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
-  "mini.nvim": { "branch": "main", "commit": "b5645ac6eefce8e7af9d7dd4e5e296a81cba8a10" },
-  "neodev.nvim": { "branch": "main", "commit": "da1562e1e3df0e994ddc52cb4ba22376a5d7f2fc" },
-  "neoformat": { "branch": "master", "commit": "209b56a00fc0206d81db768b121b94d0daf48b64" },
-  "noice.nvim": { "branch": "main", "commit": "92433164e2f7118d4122c7674c3834d9511722ba" },
-  "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
-  "nvim-asciidoc-preview": { "branch": "main", "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" },
-  "nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
-  "nvim-cmp": { "branch": "main", "commit": "983453e32cb35533a119725883c04436d16c0120" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "82c7cb08ddb836ad938b2708e50085f12a8825d2" },
+  "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" },
+  "mini.nvim": { "branch": "main", "commit": "9968f6e221ae7bdac57a910c5bf2026186aa023c" },
+  "neodev.nvim": { "branch": "main", "commit": "84e0290f5600e8b89c0dfcafc864f45496a53400" },
+  "neoformat": { "branch": "master", "commit": "b8e0baf965d2fbb173aabe3d847538744c0e321b" },
+  "noice.nvim": { "branch": "main", "commit": "bf67d70bd7265d075191e7812d8eb42b9791f737" },
+  "nui.nvim": { "branch": "main", "commit": "3dc46d725f7b94bee5117c0a699b57b1902b5d65" },
+  "nvim-asciidoc-preview": { "branch": "main", "commit": "b42f326af4718cade583d8bd60af22010224d91e" },
+  "nvim-autopairs": { "branch": "master", "commit": "c6139ca0d5ad7af129ea6c89cb4c56093f2c034a" },
+  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
   "nvim-colorizer.lua": { "branch": "master", "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" },
-  "nvim-dap": { "branch": "master", "commit": "9d81c11fd185a131f81841e64941859305f6c42d" },
-  "nvim-dap-ui": { "branch": "master", "commit": "0b4816e5ad5f3219e8e3ec9cce07f61b770c1974" },
-  "nvim-jdtls": { "branch": "master", "commit": "a5c6f38f8151d7b4f5b32c005a95022fa66f4c9d" },
+  "nvim-dap": { "branch": "master", "commit": "c43c2473ecb482a9d91f32c1d4c0098fffad3c7d" },
+  "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" },
+  "nvim-jdtls": { "branch": "master", "commit": "8eb5f0dbe6e126b392ddcaf45893358619893e45" },
   "nvim-lsp-file-operations": { "branch": "master", "commit": "223aca86b737dc66e9c51ebcda8788a8d9cc6cf2" },
-  "nvim-lspconfig": { "branch": "master", "commit": "cf3dd4a290084a868fac0e2e876039321d57111c" },
-  "nvim-notify": { "branch": "master", "commit": "1576123bff3bed67bc673a3076e591abfe5d8ca9" },
-  "nvim-tree.lua": { "branch": "master", "commit": "f1b3e6a7eb92da492bd693257367d9256839ed3d" },
-  "nvim-treesitter": { "branch": "master", "commit": "f197a15b0d1e8d555263af20add51450e5aaa1f0" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
-  "nvim-ts-autotag": { "branch": "main", "commit": "a65b202cfd08e0e69e531eab737205ff5bc082a4" },
-  "nvim-ufo": { "branch": "main", "commit": "95a148d9b3c02facce59c2050fd20fa6e8eb2cb6" },
-  "nvim-web-devicons": { "branch": "master", "commit": "a55b801b7ef5719ca25692c3a0a5447fdfb692ed" },
-  "password-store": { "branch": "master", "commit": "1078f2514d579178d5df7042c6a790e9c9b731ad" },
-  "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
+  "nvim-lspconfig": { "branch": "master", "commit": "1f3ef31d1bb967050c81420ca921a1a2ade10e77" },
+  "nvim-notify": { "branch": "master", "commit": "5371f4bfc1f6d3adf4fe9d62cd3a9d44356bfd15" },
+  "nvim-tree.lua": { "branch": "master", "commit": "f7c09bd72e50e1795bd3afb9e2a2b157b4bfb3c3" },
+  "nvim-treesitter": { "branch": "master", "commit": "143ca5ce17ae21233101246b5785b90d53aa8329" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "531f48334c422222aebc888fd36e7d109cb354cd" },
+  "nvim-ufo": { "branch": "main", "commit": "2296dbb8939c4050c222f4eb24889540ef8acd76" },
+  "nvim-web-devicons": { "branch": "master", "commit": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec" },
+  "password-store": { "branch": "master", "commit": "b5e965a838bb68c1227caa2cdd874ba496f10149" },
+  "plenary.nvim": { "branch": "master", "commit": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" },
-  "statuscol.nvim": { "branch": "main", "commit": "3b629754420919575a9e5758027d6e1831dbf2aa" },
-  "suda.vim": { "branch": "master", "commit": "8b0fc3711760195aba104e2d190cff9af8267052" },
-  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
+  "promise-async": { "branch": "main", "commit": "93540c168c5ed2b030ec3e6c40ab8bbb85e36355" },
+  "statuscol.nvim": { "branch": "main", "commit": "d954893262a57a92e46edd87de67e2b3fe72305e" },
+  "suda.vim": { "branch": "master", "commit": "66727b416837836712975e748bc8a19fb6cf4ec3" },
+  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "master", "commit": "e54fbf4ab2b64640b639b75c006c23b4bc51c86f" },
+  "telescope.nvim": { "branch": "master", "commit": "e9e01d699843af530ef4ad2c8679a7e273bb3dd1" },
   "vim-asciidoctor": { "branch": "master", "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" },
   "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" },
-  "vim-fugitive": { "branch": "master", "commit": "96c1009fcf8ce60161cc938d149dd5a66d570756" },
-  "vim-gnupg": { "branch": "main", "commit": "6d106fa49df3d8c1e63fac8eb64b4a0174f7e83f" },
-  "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" }
+  "vim-fugitive": { "branch": "master", "commit": "8d4e8d45385c63a0bf735fe1164772116bf0da0d" },
+  "vim-gnupg": { "branch": "main", "commit": "f9b608f29003dfde6450931dc0f495a912973a88" },
+  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 }

home/.config/nvim/lua/plugins/ufo.lua

@@ -5,8 +5,8 @@ return {
   dependencies = { "kevinhwang91/promise-async" },
   --- @type UfoConfig
   opts = {
-    close_fold_kinds = {
-      "imports",
+    close_fold_kinds_for_ft = {
+      default = { "imports" },
     },
   },
   --- @param opts UfoConfig

home/.config/nvim/mason-lock.json

@@ -1,5 +1,19 @@
 {
+  "bash-language-server": "5.1.2",
+  "css-lsp": "4.8.0",
+  "docker-compose-language-service": "0.2.0",
   "dockerfile-language-server": "0.11.0",
+  "eslint-lsp": "4.8.0",
+  "html-lsp": "4.8.0",
+  "java-debug-adapter": "0.55.0",
+  "jdtls": "v1.33.0",
+  "json-lsp": "4.8.0",
+  "lemminx": "0.26.1",
   "lua-language-server": "3.7.4",
-  "stylua": "v0.20.0"
+  "prettier": "3.2.5",
+  "prettierd": "0.25.2",
+  "stylua": "v0.20.0",
+  "taplo": "0.8.1",
+  "typescript-language-server": "4.3.3",
+  "yaml-language-server": "1.14.0"
 }

root/etc/mkinitcpio.d/linux-cachyos.preset

@@ -0,0 +1,7 @@
+PRESETS=('default')
+
+ALL_config="/etc/mkinitcpio.conf"
+ALL_kver="/boot/vmlinuz-linux-cachyos"
+
+default_image="/boot/initramfs-linux-cachyos.img"
+default_uki="/boot/EFI/Linux/archlinux-linux-cachyos.efi"

root/etc/pacman.conf

@@ -13,6 +13,22 @@ CleanMethod=KeepCurrent
 CacheDir= /var/www/index.korhonen.cc/repo/arch_linux/korhonen_aur/x86_64
 {%@@ endif @@%}
 
+[cachyos-v3]
+Include = /etc/pacman.d/pacserve
+Include = /etc/pacman.d/cachyos-v3-mirrorlist
+
+[cachyos-core-v3]
+Include = /etc/pacman.d/pacserve
+Include = /etc/pacman.d/cachyos-v3-mirrorlist
+
+[cachyos-extra-v3]
+Include = /etc/pacman.d/pacserve
+Include = /etc/pacman.d/cachyos-v3-mirrorlist
+
+[cachyos]
+Include = /etc/pacman.d/pacserve
+Include = /etc/pacman.d/cachyos-mirrorlist
+
 [core]
 Include = /etc/pacman.d/pacserve
 Include = /etc/pacman.d/mirrorlist