From a17eb40eaec324c6f38550f16abaa82bdcaff775 Mon Sep 17 00:00:00 2001 From: stitchy Date: Wed, 18 Dec 2024 07:47:12 +0000 Subject: [PATCH 1/2] nvim: typst_lsp -> tinymist && glsl_analyzer --- config/nvim/nvim.lua | 2 +- packages/default.nix | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/config/nvim/nvim.lua b/config/nvim/nvim.lua index 7931289..39e44a1 100644 --- a/config/nvim/nvim.lua +++ b/config/nvim/nvim.lua @@ -37,7 +37,7 @@ local capabilities = require("cmp_nvim_lsp").default_capabilities() local lspconfig = require('lspconfig') -- Enable some language servers with the additional completion capabilities offered by nvim-cmp -local servers = { 'clangd', 'rust_analyzer', 'typst_lsp', 'vhdl_ls', 'vtsls' } +local servers = { 'clangd', 'glsl_analyzer', 'rust_analyzer', 'tinymist', 'vhdl_ls', 'vtsls' } for _, lsp in ipairs(servers) do lspconfig[lsp].setup { -- on_attach = my_custom_on_attach, diff --git a/packages/default.nix b/packages/default.nix index 0cf3b72..3714c40 100644 --- a/packages/default.nix +++ b/packages/default.nix @@ -72,13 +72,15 @@ in "fzf" "git" "glib" + "glsl_analyzer" "gnumake" "gnupg" "mypy" "neofetch" "p7zip" "pinentry" - "typst-lsp" + "rust-analyzer" + "tinymist" "unzip" "vhdl-ls" "vtsls" From 19069aba4454f91e018bf51729c778ee2cbd4879 Mon Sep 17 00:00:00 2001 From: stitchy Date: Wed, 18 Dec 2024 07:48:02 +0000 Subject: [PATCH 2/2] zsh: add nixos-rebuild aliases --- config/zshrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/config/zshrc b/config/zshrc index 0595102..b959ed4 100755 --- a/config/zshrc +++ b/config/zshrc @@ -137,8 +137,13 @@ export RUSTUP_HOME="$XDG_DATA_HOME"/rustup export CARGO_HOME="$XDG_DATA_HOME"/cargo -alias dosbox="dosbox -conf "$XDG_CONFIG_HOME"/dosbox/dosbox.conf " +alias dosbox="dosbox -conf $XDG_CONFIG_HOME/dosbox/dosbox.conf" +alias rbs="reconfig switch" +alias rbb="reconfig build" +reconfig() { + sudo nixos-rebuild --flake "/etc/nixos#$(cat /etc/hostname)" "$@" +} # Autostart Hyprland after all environmental Variables have been declared if [ -z $DISPLAY ] && [ "$(tty)" = "/dev/tty1" ]; then