formatting

This commit is contained in:
Aria Nolan 2023-10-13 12:11:33 -04:00
parent 9fca885be4
commit 0b19777712
8 changed files with 164 additions and 188 deletions

View file

@ -14,16 +14,13 @@
}; };
}; };
outputs = inputs: outputs = inputs: let
let
system = "x86_64-linux"; system = "x86_64-linux";
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
in { in {
homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration { homeConfigurations."tacocat" = inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs; inherit pkgs;
# Specify your home configuration modules here, for example,
# the path to your home.nix.
modules = [ modules = [
./home.nix ./home.nix
./shell ./shell
@ -31,8 +28,6 @@
./helix ./helix
]; ];
# Optionally use extraSpecialArgs
# to pass through arguments to home.nix
extraSpecialArgs = {inherit inputs system;}; extraSpecialArgs = {inherit inputs system;};
}; };
}; };

View file

@ -25,8 +25,6 @@
marksman marksman
nil nil
nodePackages.bash-language-server nodePackages.bash-language-server
# nodePackages.vscode-css-languageserver-bin
# nodePackages.vscode-langservers-extracted
shellcheck shellcheck
]) ])
]; ];

View file

@ -1,6 +1,4 @@
{ config, pkgs, ... }: {pkgs, ...}: {
{
home = { home = {
username = "tacocat"; username = "tacocat";
homeDirectory = "/home/tacocat"; homeDirectory = "/home/tacocat";

View file

@ -1,6 +1,4 @@
{ config, pkgs, ... }: {pkgs, ...}: {
{
programs.kitty = { programs.kitty = {
enable = true; enable = true;
package = pkgs.runCommandLocal "no-kitty" {} "mkdir $out"; package = pkgs.runCommandLocal "no-kitty" {} "mkdir $out";

View file

@ -1,26 +1,25 @@
{ config, pkgs, ... }: {...}: {
{
programs.bash = { programs.bash = {
enable = true; enable = true;
enableCompletion = true; enableCompletion = true;
bashrcExtra = '' bashrcExtra = ''
if [ -d "$HOME/.local/bin" ] ; then if [ -d "$HOME/.local/bin" ] ; then
PATH="$HOME/.local/bin:$PATH" PATH="$HOME/.local/bin:$PATH"
fi fi
# DotNet # DotNet
PATH=$PATH:~/.dotnet PATH=$PATH:~/.dotnet
export DOTNET_ROOT=~/.dotnet export DOTNET_ROOT=~/.dotnet
''; # this should be changed to use home.sessionVariables ''; # this should be changed to use home.sessionVariables
profileExtra = '' profileExtra = ''
eval "$(ssh-agent -s)" eval "$(ssh-agent -s)"
ssh-add ~/.ssh/git_school ssh-add ~/.ssh/git_school
ssh-add ~/.ssh/git_personal ssh-add ~/.ssh/git_personal
ssh-add ~/.ssh/id_ed25519 ssh-add ~/.ssh/id_ed25519
''; '';
}; };

View file

@ -1,8 +1,6 @@
{ {
imports = [
imports = [
./zsh.nix ./zsh.nix
./bash.nix ./bash.nix
]; ];
} }

View file

@ -1,6 +1,8 @@
{ config, pkgs, ... }:
{ {
config,
pkgs,
...
}: {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableAutosuggestions = true; enableAutosuggestions = true;
@ -16,7 +18,6 @@
}; };
historySubstringSearch.enable = true; historySubstringSearch.enable = true;
plugins = [ plugins = [
{ {
name = "powerlevel10k"; name = "powerlevel10k";
file = "powerlevel10k.zsh-theme"; file = "powerlevel10k.zsh-theme";
@ -28,16 +29,6 @@
}; };
} }
# {
# name = "zsh-bat";
# src = pkgs.fetchFromGitHub {
# owner = "fdellwing";
# repo = "zsh-bat";
# rev = "d7d5df4f6c7dd380e49b47e4da840226a828968a";
# sha256 = "4DQ/qSznM4A9IyM6W0bncHUa4jTIAdBxL16YJgMccHE=";
# };
# }
{ {
name = "z.lua"; name = "z.lua";
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
@ -57,7 +48,6 @@
sha256 = "QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4="; sha256 = "QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4=";
}; };
} }
]; ];
shellAliases = { shellAliases = {
ls = "eza"; ls = "eza";