diff --git a/helix/default.nix b/helix/default.nix index 947c1ff..87b6990 100644 --- a/helix/default.nix +++ b/helix/default.nix @@ -1,60 +1,62 @@ -{ config, pkgs, inputs, ... }: - { + config, + pkgs, + inputs, + ... +}: { + imports = [ + ./languages.nix + ]; - imports = [ - ./languages.nix - ]; + programs.helix = { + enable = true; + # package = inputs.helix.packages."x86_64-linux".default; - programs.helix = { - enable = true; - # package = inputs.helix.packages."x86_64-linux".default; + package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: { + makeWrapperArgs = with pkgs; + self.makeWrapperArgs + or [] + ++ [ + "--suffix" + "PATH" + ":" + (lib.makeBinPath [ + clang-tools + marksman + nil + nodePackages.bash-language-server + # nodePackages.vscode-css-languageserver-bin + # nodePackages.vscode-langservers-extracted + shellcheck + ]) + ]; + }); - package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: { - makeWrapperArgs = with pkgs; - self.makeWrapperArgs - or [] - ++ [ - "--suffix" - "PATH" - ":" - (lib.makeBinPath [ - clang-tools - marksman - nil - nodePackages.bash-language-server - nodePackages.vscode-css-languageserver-bin - nodePackages.vscode-langservers-extracted - shellcheck - ]) - ]; - }); - - settings = { - theme = "rose_pine_moon"; - editor = { - line-number = "relative"; - lsp.display-messages = true; - scrolloff = 5; - middle-click-paste = false; - cursorline = true; - auto-format = false; - idle-timeout = 400; - color-modes = true; - soft-wrap.enable = true; - whitespace = { - render = { - space = "none"; - tab = "none"; - newline = "none"; - }; - }; - indent-guides = { - render = true; - character = "▏"; - rainbow-option = "dim"; - }; - }; - }; - }; + settings = { + theme = "rose_pine_moon"; + editor = { + line-number = "relative"; + lsp.display-messages = true; + scrolloff = 5; + middle-click-paste = false; + cursorline = true; + auto-format = false; + idle-timeout = 400; + color-modes = true; + soft-wrap.enable = true; + whitespace = { + render = { + space = "none"; + tab = "none"; + newline = "none"; + }; + }; + indent-guides = { + render = true; + character = "▏"; + rainbow-option = "dim"; + }; + }; + }; + }; } diff --git a/helix/languages.nix b/helix/languages.nix index 8ea5ab9..b07101d 100644 --- a/helix/languages.nix +++ b/helix/languages.nix @@ -1,11 +1,13 @@ -{ pkgs, lib, ... }: - { + pkgs, + lib, + ... +}: { programs.helix.languages = { language = [ { name = "bash"; - auto-format = true; + auto-format = false; formatter = { command = "${pkgs.shfmt}/bin/shfmt"; args = ["-i" "2"]; @@ -28,13 +30,17 @@ config.nil.formatting.command = ["${lib.getExe pkgs.alejandra}" "-q"]; }; - vscode-css-language-server = { - command = "${pkgs.nodePackages.vscode-css-languageserver-bin}/bin/css-languageserver"; - args = ["--stdio"]; - config = { - provideFormatter = true; - css.validate.enable = true; - }; + texlab = { + command = "${pkgs.texlab}/bin/texlab"; + config.texlab.executable = "${pkgs.tectonic}/bin/tectonic"; + config.texlab.build.onSave = true; + config.texlab.args = [ + "-X" + "compile" + "%f" + "--keep-logs" + "--keep-intermediates" + ]; }; }; }; diff --git a/home.nix b/home.nix index 1a73c5a..34bd3bf 100644 --- a/home.nix +++ b/home.nix @@ -7,11 +7,13 @@ stateVersion = "23.11"; sessionVariables = { EDITOR = "hx"; + BAT_THEME = "ansi"; }; packages = with pkgs; [ wineWowPackages.unstable eza bat + pandoc ]; }; diff --git a/shell/bash.nix b/shell/bash.nix index bf2ed63..a7fad5c 100644 --- a/shell/bash.nix +++ b/shell/bash.nix @@ -3,13 +3,16 @@ programs.bash = { enable = true; enableCompletion = true; - enableVteIntegration = true; bashrcExtra = '' if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi +# DotNet +PATH=$PATH:~/.dotnet +export DOTNET_ROOT=~/.dotnet + ''; # this should be changed to use home.sessionVariables profileExtra = '' diff --git a/shell/zsh.nix b/shell/zsh.nix index 96423f7..447e6fa 100644 --- a/shell/zsh.nix +++ b/shell/zsh.nix @@ -28,15 +28,15 @@ }; } - { - name = "zsh-bat"; - src = pkgs.fetchFromGitHub { - owner = "fdellwing"; - repo = "zsh-bat"; - rev = "d7d5df4f6c7dd380e49b47e4da840226a828968a"; - sha256 = "4DQ/qSznM4A9IyM6W0bncHUa4jTIAdBxL16YJgMccHE="; - }; - } + # { + # name = "zsh-bat"; + # src = pkgs.fetchFromGitHub { + # owner = "fdellwing"; + # repo = "zsh-bat"; + # rev = "d7d5df4f6c7dd380e49b47e4da840226a828968a"; + # sha256 = "4DQ/qSznM4A9IyM6W0bncHUa4jTIAdBxL16YJgMccHE="; + # }; + # } { name = "z.lua";