diff --git a/home/dot_config/nvim/lsp/svelte-language-server.lua b/home/dot_config/nvim/lsp/svelte-language-server.lua index 3a7355f..6759670 100644 --- a/home/dot_config/nvim/lsp/svelte-language-server.lua +++ b/home/dot_config/nvim/lsp/svelte-language-server.lua @@ -1,6 +1,6 @@ ---@type vim.lsp.Config return { - cmd = { "svelteserver" }, + cmd = { "svelteserver", "--stdio" }, root_markers = { "package.json", "svelte.config.js" }, filetypes = { "svelte" }, settings = {}, diff --git a/nixcfgs/modules/nixos/core/configuration.nix b/nixcfgs/modules/nixos/core/configuration.nix index d2c7bee..2ef319d 100644 --- a/nixcfgs/modules/nixos/core/configuration.nix +++ b/nixcfgs/modules/nixos/core/configuration.nix @@ -20,10 +20,14 @@ }; # system.copySystemConfiguration = true; - nix.settings.experimental-features = [ - "nix-command" - "flakes" - ]; + nix.settings = { + trusted-users = ["js0ny" "root"]; + use-xdg-base-directories = true; + experimental-features = [ + "nix-command" + "flakes" + ]; + }; # Define a user account. Don't forget to set a password with ‘passwd’. users.users.js0ny = { @@ -47,8 +51,4 @@ extraArgs = "--keep 5 --keep-since 3d"; }; }; - - nix.extraOptions = '' - use-xdg-base-directories = true - ''; } diff --git a/nixcfgs/users/js0ny/default.nix b/nixcfgs/users/js0ny/default.nix index f26df15..f1bfc4e 100644 --- a/nixcfgs/users/js0ny/default.nix +++ b/nixcfgs/users/js0ny/default.nix @@ -20,13 +20,14 @@ in { programs.home-manager.enable = true; xdg.configFile = { - "nixpkgs/config.nix" = { - text = ''{allowUnfree = true;} ''; - enable = true; - }; - "nix/nix.conf" = { - text = ''use-xdg-base-directories = true ''; - enable = true; - }; + "nixpkgs/config.nix".text = ''{ allowUnfree = true; }''; + }; + nix.package = pkgs.nix; + nix.settings = { + use-xdg-base-directories = true; + experimental-features = [ + "nix-command" + "flakes" + ]; }; } diff --git a/nixcfgs/users/js0ny/packages/gui.nix b/nixcfgs/users/js0ny/packages/gui.nix index 71d6e5a..3bb0f7a 100644 --- a/nixcfgs/users/js0ny/packages/gui.nix +++ b/nixcfgs/users/js0ny/packages/gui.nix @@ -126,6 +126,7 @@ in { steamtinkerlaunch scanmem dex + piliplus ] ++ (mkFcitxIM [ pkgs.neovim-qt diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix new file mode 100644 index 0000000..a977fb4 --- /dev/null +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/copyous.nix @@ -0,0 +1,18 @@ +# 大败而归,等打包了 +{ + pkgs, + lib, + ... +}: let + highlightJs = pkgs.fetchurl { + url = "https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.11.1/es/highlight.min.js"; + sha256 = "sha256-eGWDmUnwdk2eCiHjEaTixCYz7q7oyl7BJ7hkOFZXMf4="; + }; +in { + # Currently, copyous is not in nixpkgs. + home.packages = with pkgs; [ + libgda6 + gsound + ]; + xdg.dataFile."copyous@boerdereinar.dev/highlight.min.js".source = highlightJs; +} diff --git a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix index 2992dca..815c6b0 100644 --- a/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix +++ b/nixcfgs/users/js0ny/programs/desktop/gnome/default.nix @@ -19,6 +19,7 @@ in { imports = [ ../../walker.nix + # ./copyous.nix ]; home.packages = with pkgs; [ diff --git a/nixcfgs/users/js0ny/programs/duti.nix b/nixcfgs/users/js0ny/programs/duti.nix index 19cfe6f..11e38b1 100644 --- a/nixcfgs/users/js0ny/programs/duti.nix +++ b/nixcfgs/users/js0ny/programs/duti.nix @@ -7,12 +7,14 @@ iina = "com.colliderli.iina"; # firefox = "org.nixos.firefox"; keka = "com.aone.keka"; + sioyek = "info.sioyek.sioyek"; defaultApps = { "${gvim}" = ["md" "json" "js" "txt" "xml"]; "${iina}" = ["mp4" "mkv"]; # "${firefox}" = ["html"]; "${keka}" = ["7z" "zip" "rar" "tar"]; + "${sioyek}" = ["pdf"]; }; duti = "${pkgs.duti}/bin/duti"; diff --git a/nixcfgs/users/js0ny/programs/mime.nix b/nixcfgs/users/js0ny/programs/mime.nix index 5cfa1bd..3b73500 100644 --- a/nixcfgs/users/js0ny/programs/mime.nix +++ b/nixcfgs/users/js0ny/programs/mime.nix @@ -71,7 +71,7 @@ in { enable = true; # In Dolphin, middle click to open with 2nd order default app defaultApplications = - mkAssoc "org.kde.okular.desktop" ["application/pdf"] + mkAssoc "sioyek.desktop;org.kde.okular;" ["application/pdf"] // mkAssoc gvim simpleText // { "inode/directory" = "org.kde.dolphin.desktop";