diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl index 49898d6..1695746 100644 --- a/home/.chezmoiignore.tmpl +++ b/home/.chezmoiignore.tmpl @@ -19,6 +19,7 @@ scripts .config/systemd .config/user-dirs.dirs .config/user-dirs.locale +.config/libvirt .local/share/kio/ {{ end }} @@ -40,6 +41,7 @@ scripts .config/readline .config/krunnerrc .bashrc +.local/share/kio {{ end }} {{ end }} diff --git a/home/dot_config/libvirt/libvirt.conf b/home/dot_config/libvirt/libvirt.conf new file mode 100644 index 0000000..deb583b --- /dev/null +++ b/home/dot_config/libvirt/libvirt.conf @@ -0,0 +1 @@ +uri_default = "qemu:///system" diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 79b1d01..632afa1 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -52,7 +52,6 @@ steam-run bottles lutris - libreoffice vivaldi rustdesk diff --git a/nixcfgs/users/js0ny/programs/libreoffice.nix b/nixcfgs/users/js0ny/programs/libreoffice.nix new file mode 100644 index 0000000..aa8b6c2 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/libreoffice.nix @@ -0,0 +1,19 @@ +{pkgs, ...}: { + home.packages = [pkgs.libreoffice]; + home.file.".local/share/kio/servicemenus/office2pdf.desktop" = { + text = '' + [Desktop Entry] + Type=Service + MimeType=application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.openxmlformats-officedocument.presentationml.presentation; + Actions=convertToPDF + Icon=application-pdf + X-KDE-Priority=TopLevel + X-KDE-StartupNotify=false + + [Desktop Action convertToPDF] + Name=转换为 PDF + Icon=application-pdf + Exec=soffice --headless --convert-to pdf "%f" --outdir . + ''; + }; +} diff --git a/nixcfgs/modules/home/programs/nvim.nix b/nixcfgs/users/js0ny/programs/nvim.nix similarity index 64% rename from nixcfgs/modules/home/programs/nvim.nix rename to nixcfgs/users/js0ny/programs/nvim.nix index d3f12a7..2b827fa 100644 --- a/nixcfgs/modules/home/programs/nvim.nix +++ b/nixcfgs/users/js0ny/programs/nvim.nix @@ -1,9 +1,16 @@ -{...}: let +{pkgs, ...}: let nvimAlias = {"v" = "nvim";}; in { programs.neovim = { enable = true; defaultEditor = true; + extraPackages = with pkgs; [ + lua5_1 + lua51Packages.luarocks + # image support + pkg-config + imagemagick + ]; }; programs.fish.shellAbbrs = nvimAlias; programs.bash.shellAliases = nvimAlias; diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 252f868..f8db836 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -24,6 +24,9 @@ ./programs/zed-editor.nix ./programs/rime.nix ./programs/sdcv.nix + ./programs/fzf.nix + ./programs/libreoffice.nix + ./programs/nvim.nix # Shell ./programs/shell/bash.nix @@ -34,10 +37,8 @@ ./programs/plasma.nix # General Program config - ../../modules/home/programs/nvim.nix ../../modules/home/programs/eza.nix ../../modules/home/programs/winboat.nix - ../../modules/home/programs/fzf.nix ../../modules/home/programs/lsd.nix ../../modules/home/programs/starship.nix ../../modules/home/programs/zoxide.nix