Compare commits

..

No commits in common. "096348358c2f5b868e77ad9d475b8c8c42fa3099" and "dce35118a8d984a78d1fe8e03576ca8d28f1c5a2" have entirely different histories.

4 changed files with 35 additions and 29 deletions

View file

@ -14,12 +14,12 @@
};
};
outputs = inputs:
outputs = inputs @ { nixpkgs, home-manager, ... }:
let
system = "x86_64-linux";
pkgs = inputs.nixpkgs.legacyPackages.${system};
pkgs = nixpkgs.legacyPackages.${system};
in {
homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration {
homeConfigurations."tacocat" = home-manager.lib.homeManagerConfiguration {
inherit pkgs;
# Specify your home configuration modules here, for example,

View file

@ -11,7 +11,8 @@
# package = inputs.helix.packages."x86_64-linux".default;
package = inputs.helix.packages.${pkgs.system}.default.overrideAttrs (self: {
makeWrapperArgs = with pkgs; self.makeWrapperArgs
makeWrapperArgs = with pkgs;
self.makeWrapperArgs
or []
++ [
"--suffix"
@ -51,9 +52,34 @@
indent-guides = {
render = true;
character = "";
rainbow-option = "dim";
};
};
};
# languages = {
# language = [{
# name = "nix";
# scope = "flake.nix";
# roots = [ "flake.nix" "flake.lock" ];
# injection-regex = "nix";
# auto-format = false;
# file-types = [ "nix" ];
# comment-token = "#";
# indent = {
# tab-width = 2;
# unit = " ";
# };
# language-servers = [ "${pkgs.nil}" ];
# formatter = {
# command = "${pkgs.nixpkgs-fmt}";
# };
# }];
# grammar = [{
# name = "nix";
# source = {
# git = "https://github.com/nix-community/tree-sitter-nix";
# rev = "66e3e9ce9180ae08fc57372061006ef83f0abde7";
# };
# }];
# };
};
}

View file

@ -2,16 +2,6 @@
{
programs.helix.languages = {
language = [
{
name = "bash";
auto-format = true;
formatter = {
command = "${pkgs.shfmt}/bin/shfmt";
args = ["-i" "2"];
};
}
];
language-server = {
bash-language-server = {
command = "${pkgs.nodePackages.bash-language-server}/bin/bash-language-server";

View file

@ -6,12 +6,11 @@
enableAutosuggestions = true;
enableCompletion = true;
enableVteIntegration = true;
autocd = false;
cdpath = [
"/mnt/nixos/etc/nixos/"
"/mnt/stuff/school/"
];
defaultKeymap = null;
defaultKeymap = null; # was "vicmd"
dotDir = ".config/zsh";
history = {
ignoreSpace = true;
@ -34,21 +33,12 @@
# strug
# bira
};
# plugins = [
# {
# name = "zsh-syntax-highlighting";
# src = pkgs.fetchFromGitHub {
# owner = "zsh-users";
# repo = "zsh-syntax-highlighting";
# rev = "0.7.1";
# sha256 = "gOG0NLlaJfotJfs+SUhGgLTNOnGLjoqnUp54V9aFJg8=";
# };
# }
# ];
sessionVariables = {
};
shellAliases = {
ls = "eza";
};
syntaxHighlighting.enable = true;
};
}