From 7fccc551519011ace3892158516a7da9af21028b Mon Sep 17 00:00:00 2001 From: Marko Korhonen Date: Sat, 11 Nov 2023 10:40:27 +0200 Subject: [PATCH] Revert pacman on termux Caused too many issues to solve, using apt instead --- docker/nextcloud/docker-compose.toml | 26 +-- home/.config/mpv/mpv.conf | 3 - home/.config/nvim/lazy-lock.json | 218 +++++++++++++++++++++++++ home/.config/nvim/lua/plugins/init.lua | 4 +- home/.config/zsh/04-aliases.zsh | 21 ++- 5 files changed, 245 insertions(+), 27 deletions(-) create mode 100644 home/.config/nvim/lazy-lock.json diff --git a/docker/nextcloud/docker-compose.toml b/docker/nextcloud/docker-compose.toml index 26cef00..818d07f 100644 --- a/docker/nextcloud/docker-compose.toml +++ b/docker/nextcloud/docker-compose.toml @@ -18,19 +18,19 @@ environment = [ "OVERWRITEPROTOCOL=https", ] depends_on = ["redis"] -labels = [ - "ofelia.enabled=true", - "ofelia.job-exec.nextcloud.schedule=0 */5 * * * *", - "ofelia.job-exec.nextcloud.command=php /var/www/html/cron.php", - "ofelia.job-exec.nextcloud.user=www-data", - "ofelia.smtp-host=${SMTP_HOST}", - "ofelia.smtp-port=${SMTP_PORT}", - "ofelia.smtp-user=${SMTP_USER}", - "ofelia.smtp-password=${SMTP_PASSWORD}", - "ofelia.email-to=${EMAIL_TO}", - "ofelia.email-from=${EMAIL_FROM}", - "ofelia.mail-only-on-error", -] + +[services.nextcloud.labels] +"ofelia.enabled" = true +"ofelia.job-exec.nextcloud.schedule" = "0 */5 * * * *" +"ofelia.job-exec.nextcloud.command" = "php /var/www/html/cron.php" +"ofelia.job-exec.nextcloud.user" = "www-data" +"ofelia.smtp-host" = "${SMTP_HOST}" +"ofelia.smtp-port" = "${SMTP_PORT}" +"ofelia.smtp-user" = "${SMTP_USER}" +"ofelia.smtp-password" = "${SMTP_PASSWORD}" +"ofelia.email-to" = "${EMAIL_TO}" +"ofelia.email-from" = "${EMAIL_FROM}" +"ofelia.mail-only-on-error" = true [services.redis] image = "redis:alpine" diff --git a/home/.config/mpv/mpv.conf b/home/.config/mpv/mpv.conf index fc3dff8..28e7c93 100644 --- a/home/.config/mpv/mpv.conf +++ b/home/.config/mpv/mpv.conf @@ -10,9 +10,6 @@ hwdec-codecs=all {%@@ if wayland @@%} gpu-context=wayland {%@@ endif @@%} -{%@@ if profile == "mko-laptop" @@%} -script=~/.lib/mpris.so -{%@@ endif @@%} ############# # Audio # diff --git a/home/.config/nvim/lazy-lock.json b/home/.config/nvim/lazy-lock.json new file mode 100644 index 0000000..4b100fd --- /dev/null +++ b/home/.config/nvim/lazy-lock.json @@ -0,0 +1,218 @@ +{ + "LuaSnip": { + "branch": "master", + "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" + }, + "bufferline.nvim": { + "branch": "main", + "commit": "243893ba9d5d1049dd451a25cab32ec7f8f67bcf" + }, + "cder.nvim": { + "branch": "main", + "commit": "07c9e3e8324ee7c3ffde493c1612aca0be5255d0" + }, + "cmp-buffer": { + "branch": "main", + "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" + }, + "cmp-cmdline": { + "branch": "main", + "commit": "8ee981b4a91f536f52add291594e89fb6645e451" + }, + "cmp-git": { + "branch": "main", + "commit": "f900a4cf117300fdc3ba31d26f8b6223ccd9c574" + }, + "cmp-nvim-lsp": { + "branch": "main", + "commit": "44b16d11215dce86f253ce0c30949813c0a90765" + }, + "cmp-nvim-lua": { + "branch": "main", + "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" + }, + "cmp-path": { + "branch": "main", + "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" + }, + "cmp-spell": { + "branch": "master", + "commit": "32a0867efa59b43edbb2db67b0871cfad90c9b66" + }, + "cmp_luasnip": { + "branch": "master", + "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" + }, + "copilot-cmp": { + "branch": "master", + "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" + }, + "copilot.lua": { + "branch": "master", + "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" + }, + "dashboard-nvim": { + "branch": "master", + "commit": "c71cab740e2add248c54c458b5ca9d6e77c30fa6" + }, + "emmylua-nvim": { + "branch": "master", + "commit": "58f94b43b4d6fc4c6806598d7b3ed29a6fb2b877" + }, + "firenvim": { + "branch": "master", + "commit": "138424db463e6c0e862a05166a4ccc781cd7c19d" + }, + "friendly-snippets": { + "branch": "main", + "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" + }, + "gitsigns.nvim": { + "branch": "main", + "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" + }, + "indent-blankline.nvim": { + "branch": "master", + "commit": "29be0919b91fb59eca9e90690d76014233392bef" + }, + "kanagawa.nvim": { + "branch": "master", + "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" + }, + "lazy.nvim": { + "branch": "main", + "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" + }, + "lsp_signature.nvim": { + "branch": "master", + "commit": "9ed85616b772a07f8db56c26e8fff2d962f1f211" + }, + "lualine.nvim": { + "branch": "master", + "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" + }, + "markdown-preview.nvim": { + "branch": "master", + "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" + }, + "mason-lspconfig.nvim": { + "branch": "main", + "commit": "6eb8cae80f2e4322ec82cd9f8fa423f6d1eb02c3" + }, + "mason-tool-installer.nvim": { + "branch": "main", + "commit": "e4f34741daa9cf95de68a603d3e7a6844a69fdf0" + }, + "mason.nvim": { + "branch": "main", + "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" + }, + "neoformat": { + "branch": "master", + "commit": "51f0eef4c47f4a677ce6272c103d4ac74acb3b8f" + }, + "nvim-asciidoc-preview": { + "branch": "main", + "commit": "b1b757ccaff84fba37fb254421ffa34d3cbe3edb" + }, + "nvim-autopairs": { + "branch": "master", + "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" + }, + "nvim-cmp": { + "branch": "main", + "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" + }, + "nvim-colorizer.lua": { + "branch": "master", + "commit": "36c610a9717cc9ec426a07c8e6bf3b3abcb139d6" + }, + "nvim-dap": { + "branch": "master", + "commit": "9d81c11fd185a131f81841e64941859305f6c42d" + }, + "nvim-jdtls": { + "branch": "master", + "commit": "503a399e0d0b5d432068ab5ae24b9848891b0d53" + }, + "nvim-lspconfig": { + "branch": "master", + "commit": "36e4ffec0a9e373ac9dbf7949d3567c8f04ca3df" + }, + "nvim-tree.lua": { + "branch": "master", + "commit": "a2aaf8b430c11af36b869cf1c0ad2f7c8ceeaf2c" + }, + "nvim-treesitter": { + "branch": "master", + "commit": "8996612bfbebe1657e1bb55a95201c96cab945c6" + }, + "nvim-ts-context-commentstring": { + "branch": "main", + "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" + }, + "nvim-ufo": { + "branch": "main", + "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" + }, + "nvim-web-devicons": { + "branch": "master", + "commit": "47103b80c38c59f7a1b5408c232b92bf5d018651" + }, + "password-store": { + "branch": "master", + "commit": "28cec11f1dbe6c4273d30370af45b69c9f408386" + }, + "plenary.nvim": { + "branch": "master", + "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" + }, + "promise-async": { + "branch": "main", + "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" + }, + "suda.vim": { + "branch": "master", + "commit": "8b0fc3711760195aba104e2d190cff9af8267052" + }, + "telescope-fzf-native.nvim": { + "branch": "main", + "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" + }, + "telescope-ui-select.nvim": { + "branch": "master", + "commit": "0fc69ebbf178631b8ab76745459fade062156ec5" + }, + "telescope.nvim": { + "branch": "master", + "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" + }, + "vim-asciidoctor": { + "branch": "master", + "commit": "f553311b5db03440eb8d7035434d0405e4a2c559" + }, + "vim-caddyfile": { + "branch": "master", + "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" + }, + "vim-commentary": { + "branch": "master", + "commit": "e87cd90dc09c2a203e13af9704bd0ef79303d755" + }, + "vim-fugitive": { + "branch": "master", + "commit": "46eaf8918b347906789df296143117774e827616" + }, + "vim-gnupg": { + "branch": "main", + "commit": "f9b608f29003dfde6450931dc0f495a912973a88" + }, + "vim-surround": { + "branch": "master", + "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" + }, + "which-key.nvim": { + "branch": "main", + "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" + } +} diff --git a/home/.config/nvim/lua/plugins/init.lua b/home/.config/nvim/lua/plugins/init.lua index 27c9907..9a3da45 100644 --- a/home/.config/nvim/lua/plugins/init.lua +++ b/home/.config/nvim/lua/plugins/init.lua @@ -233,6 +233,4 @@ local plugins = { }, } -local lazy_opts = {} - -require("lazy").setup(plugins, lazy_opts) +require("lazy").setup(plugins, { lockfile = "~/git/dotfiles/home/.config/nvim/lazy-lock.json" }) diff --git a/home/.config/zsh/04-aliases.zsh b/home/.config/zsh/04-aliases.zsh index 4a5a151..fde351c 100644 --- a/home/.config/zsh/04-aliases.zsh +++ b/home/.config/zsh/04-aliases.zsh @@ -30,18 +30,23 @@ function command_not_found_handler { # search and install/remove packages with fzf pi() { - {%@@ if distro_id == "arch" @@%} - SELECTED_PKGS="$(paru -Slq | fzf --header='Install packages' -m --preview 'paru -Si {1}' | tr '\n' ' ')" + {%@@ if distro_id == "arch" or distro_id == "termux" @@%} + local pkgmanager='pacman' + if command -v paru &> /dev/null; then + pkgmanager='paru' + fi + SELECTED_PKGS="$($pkgmanager -Slq | fzf --header='Install packages' -m --preview "$pkgmanager -Si {1}" | tr '\n' ' ')" {%@@ else @@%} SELECTED_PKGS="$(apt list 2>/dev/null | cut -d '/' -f 1 | tail +2 | fzf --header='Install packages' -m --preview 'apt show 2>/dev/null {1}' | tr '\n' ' ')" {%@@ endif @@%} if [ -n "$SELECTED_PKGS" ]; then - {%@@ if distro_id == "arch" @@%} - cmd="paru -S $SELECTED_PKGS" + {%@@ if distro_id == "arch" or distro_id == "termux" @@%} + if [ pkgmanager -eq 'pacman' ] && [ distro_id -ne "termux" ]; then + pkgmanager="doas pacman" + fi + cmd="$pkgmanager -S $SELECTED_PKGS" {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} cmd="doas apt install $SELECTED_PKGS" - {%@@ elif distro_id == "termux" @@%} - cmd="apt install $SELECTED_PKGS" {%@@ endif @@%} # Append the expanded command to history @@ -185,9 +190,9 @@ update() { {%@@ elif distro_id == "ubuntu" or distro_id == "debian" @@%} doas apt update && doas apt full-upgrade -y && doas apt autoremove -y && doas apt autoclean -y {%@@ elif distro_id == "termux" @@%} - pkg update && pkg upgrade --yes + pacman -Syu --noconfirm {%@@ endif @@%} - {%@@ if distro_id == "termux" or distro_id == "ubuntu" or distro_id == "debian" @@%} + {%@@ if distro_id == "ubuntu" or distro_id == "debian" @@%} pip-update-installed cargo-update-installed {%@@ endif @@%}