formatting
This commit is contained in:
Aria Nolan
parent
9fca885be4
commit
0b19777712
33
flake.nix
33
flake.nix
|
|
@ -14,26 +14,21 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
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,
|
modules = [
|
||||||
# the path to your home.nix.
|
./home.nix
|
||||||
modules = [
|
./shell
|
||||||
./home.nix
|
./programs
|
||||||
./shell
|
./helix
|
||||||
./programs
|
];
|
||||||
./helix
|
|
||||||
];
|
|
||||||
|
|
||||||
# Optionally use extraSpecialArgs
|
extraSpecialArgs = {inherit inputs system;};
|
||||||
# to pass through arguments to home.nix
|
|
||||||
extraSpecialArgs = {inherit inputs system;};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -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
|
||||||
])
|
])
|
||||||
];
|
];
|
||||||
|
|
|
||||||
64
home.nix
64
home.nix
|
|
@ -1,43 +1,41 @@
|
||||||
{ config, pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
|
home = {
|
||||||
|
username = "tacocat";
|
||||||
|
homeDirectory = "/home/tacocat";
|
||||||
|
stateVersion = "23.11";
|
||||||
|
sessionVariables = {
|
||||||
|
EDITOR = "hx";
|
||||||
|
BAT_THEME = "ansi";
|
||||||
|
};
|
||||||
|
packages = with pkgs; [
|
||||||
|
wineWowPackages.unstable
|
||||||
|
eza
|
||||||
|
bat
|
||||||
|
pandoc
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
{
|
# # You can also create simple shell scripts directly inside your
|
||||||
home = {
|
# # configuration. For example, this adds a command 'my-hello' to your
|
||||||
username = "tacocat";
|
# # environment:
|
||||||
homeDirectory = "/home/tacocat";
|
# (pkgs.writeShellScriptBin "my-hello" ''
|
||||||
stateVersion = "23.11";
|
# echo "Hello, ${config.home.username}!"
|
||||||
sessionVariables = {
|
# '')
|
||||||
EDITOR = "hx";
|
|
||||||
BAT_THEME = "ansi";
|
|
||||||
};
|
|
||||||
packages = with pkgs; [
|
|
||||||
wineWowPackages.unstable
|
|
||||||
eza
|
|
||||||
bat
|
|
||||||
pandoc
|
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# # You can also create simple shell scripts directly inside your
|
|
||||||
# # configuration. For example, this adds a command 'my-hello' to your
|
|
||||||
# # environment:
|
|
||||||
# (pkgs.writeShellScriptBin "my-hello" ''
|
|
||||||
# echo "Hello, ${config.home.username}!"
|
|
||||||
# '')
|
|
||||||
# ];
|
# ];
|
||||||
|
|
||||||
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
# Home Manager is pretty good at managing dotfiles. The primary way to manage
|
||||||
# plain files is through 'home.file'.
|
# plain files is through 'home.file'.
|
||||||
# home.file = {
|
# home.file = {
|
||||||
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
# # Building this configuration will create a copy of 'dotfiles/screenrc' in
|
||||||
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
# # the Nix store. Activating the configuration will then make '~/.screenrc' a
|
||||||
# # symlink to the Nix store copy.
|
# # symlink to the Nix store copy.
|
||||||
# ".screenrc".source = dotfiles/screenrc;
|
# ".screenrc".source = dotfiles/screenrc;
|
||||||
|
|
||||||
# # You can also set the file content immediately.
|
# # You can also set the file content immediately.
|
||||||
# ".gradle/gradle.properties".text = ''
|
# ".gradle/gradle.properties".text = ''
|
||||||
# org.gradle.console=verbose
|
# org.gradle.console=verbose
|
||||||
# org.gradle.daemon.idletimeout=3600000
|
# org.gradle.daemon.idletimeout=3600000
|
||||||
# '';
|
# '';
|
||||||
# };
|
# };
|
||||||
|
|
||||||
# Let Home Manager install and manage itself.
|
# Let Home Manager install and manage itself.
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./kitty.nix
|
./kitty.nix
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,34 +1,32 @@
|
||||||
{ config, pkgs, ... }:
|
{pkgs, ...}: {
|
||||||
|
programs.kitty = {
|
||||||
{
|
enable = true;
|
||||||
programs.kitty = {
|
package = pkgs.runCommandLocal "no-kitty" {} "mkdir $out";
|
||||||
enable = true;
|
# use kitty provided by your distro's package manager
|
||||||
package = pkgs.runCommandLocal "no-kitty" {} "mkdir $out";
|
# can cause weird behaviour if anyhting depends on this package
|
||||||
# use kitty provided by your distro's package manager
|
font.name = "FiraCode Nerd Font Mono";
|
||||||
# can cause weird behaviour if anyhting depends on this package
|
# font.package = pkgs.maple-mono-NF;
|
||||||
font.name = "FiraCode Nerd Font Mono";
|
font.package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
|
||||||
# font.package = pkgs.maple-mono-NF;
|
font.size = 12.0;
|
||||||
font.package = pkgs.nerdfonts.override {fonts = ["FiraCode"];};
|
shellIntegration.enableZshIntegration = true;
|
||||||
font.size = 12.0;
|
theme = "Rosé Pine Moon";
|
||||||
shellIntegration.enableZshIntegration = true;
|
settings = {
|
||||||
theme = "Rosé Pine Moon";
|
cursor = "none";
|
||||||
settings = {
|
cursor_shape = "block";
|
||||||
cursor = "none";
|
cursor_blink_interval = 0;
|
||||||
cursor_shape = "block";
|
shell = "/home/tacocat/.nix-profile/bin/zsh";
|
||||||
cursor_blink_interval = 0;
|
shell_integration = "no-cursor";
|
||||||
shell = "/home/tacocat/.nix-profile/bin/zsh";
|
background_opacity = "0.9";
|
||||||
shell_integration = "no-cursor";
|
tab_bar_style = "powerline";
|
||||||
background_opacity = "0.9";
|
tab_separator = " |";
|
||||||
tab_bar_style = "powerline";
|
tab_powerline_style = "slanted";
|
||||||
tab_separator = " |";
|
enable_audio_bell = "no";
|
||||||
tab_powerline_style = "slanted";
|
# allow_remote_control = "password";
|
||||||
enable_audio_bell = "no";
|
update_check_interval = 0;
|
||||||
# allow_remote_control = "password";
|
linux_display_server = "wayland";
|
||||||
update_check_interval = 0;
|
};
|
||||||
linux_display_server = "wayland";
|
keybindings = {
|
||||||
};
|
"kitty_mod+b" = "select_tab";
|
||||||
keybindings = {
|
};
|
||||||
"kitty_mod+b" = "select_tab";
|
};
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,27 +1,26 @@
|
||||||
{ 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
|
||||||
|
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
{
|
{
|
||||||
|
imports = [
|
||||||
imports = [
|
./zsh.nix
|
||||||
./zsh.nix
|
./bash.nix
|
||||||
./bash.nix
|
];
|
||||||
];
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
132
shell/zsh.nix
132
shell/zsh.nix
|
|
@ -1,75 +1,65 @@
|
||||||
{ config, pkgs, ... }:
|
|
||||||
|
|
||||||
{
|
{
|
||||||
programs.zsh = {
|
config,
|
||||||
enable = true;
|
pkgs,
|
||||||
enableAutosuggestions = true;
|
...
|
||||||
enableCompletion = true;
|
}: {
|
||||||
syntaxHighlighting.enable = true;
|
programs.zsh = {
|
||||||
autocd = true;
|
enable = true;
|
||||||
defaultKeymap = null;
|
enableAutosuggestions = true;
|
||||||
dotDir = ".config/zsh";
|
enableCompletion = true;
|
||||||
history = {
|
syntaxHighlighting.enable = true;
|
||||||
ignoreSpace = true;
|
autocd = true;
|
||||||
path = "${config.xdg.dataHome}/zsh/zsh_history";
|
defaultKeymap = null;
|
||||||
save = 10000;
|
dotDir = ".config/zsh";
|
||||||
};
|
history = {
|
||||||
historySubstringSearch.enable = true;
|
ignoreSpace = true;
|
||||||
plugins = [
|
path = "${config.xdg.dataHome}/zsh/zsh_history";
|
||||||
|
save = 10000;
|
||||||
|
};
|
||||||
|
historySubstringSearch.enable = true;
|
||||||
|
plugins = [
|
||||||
|
{
|
||||||
|
name = "powerlevel10k";
|
||||||
|
file = "powerlevel10k.zsh-theme";
|
||||||
|
src = pkgs.fetchFromGitHub {
|
||||||
|
owner = "romkatv";
|
||||||
|
repo = "powerlevel10k";
|
||||||
|
rev = "v1.19.0";
|
||||||
|
sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
name = "powerlevel10k";
|
name = "z.lua";
|
||||||
file = "powerlevel10k.zsh-theme";
|
src = pkgs.fetchFromGitHub {
|
||||||
src = pkgs.fetchFromGitHub {
|
owner = "skywind3000";
|
||||||
owner = "romkatv";
|
repo = "z.lua";
|
||||||
repo = "powerlevel10k";
|
rev = "1.8.16";
|
||||||
rev = "v1.19.0";
|
sha256 = "VVJXBVENXlJXVj831Hx4sa7AzGHXpsui6tga9uA6ZnE=";
|
||||||
sha256 = "+hzjSbbrXr0w1rGHm6m2oZ6pfmD6UUDBfPd7uMg5l5c=";
|
};
|
||||||
};
|
}
|
||||||
}
|
|
||||||
|
|
||||||
# {
|
{
|
||||||
# name = "zsh-bat";
|
name = "zsh-vi-mode";
|
||||||
# src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
# owner = "fdellwing";
|
owner = "jeffreytse";
|
||||||
# repo = "zsh-bat";
|
repo = "zsh-vi-mode";
|
||||||
# rev = "d7d5df4f6c7dd380e49b47e4da840226a828968a";
|
rev = "v0.10.0";
|
||||||
# sha256 = "4DQ/qSznM4A9IyM6W0bncHUa4jTIAdBxL16YJgMccHE=";
|
sha256 = "QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4=";
|
||||||
# };
|
};
|
||||||
# }
|
}
|
||||||
|
];
|
||||||
{
|
shellAliases = {
|
||||||
name = "z.lua";
|
ls = "eza";
|
||||||
src = pkgs.fetchFromGitHub {
|
la = "eza -la";
|
||||||
owner = "skywind3000";
|
l = "eza -l";
|
||||||
repo = "z.lua";
|
};
|
||||||
rev = "1.8.16";
|
initExtra = ''
|
||||||
sha256 = "VVJXBVENXlJXVj831Hx4sa7AzGHXpsui6tga9uA6ZnE=";
|
source ~/.config/zsh/.p10k.zsh
|
||||||
};
|
'';
|
||||||
}
|
localVariables = {
|
||||||
|
POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;
|
||||||
{
|
};
|
||||||
name = "zsh-vi-mode";
|
};
|
||||||
src = pkgs.fetchFromGitHub {
|
home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
|
||||||
owner = "jeffreytse";
|
|
||||||
repo = "zsh-vi-mode";
|
|
||||||
rev = "v0.10.0";
|
|
||||||
sha256 = "QE6ZwwM2X0aPqNnbVrj0y7w9hmuRf0H1j8nXYwyoLo4=";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
];
|
|
||||||
shellAliases = {
|
|
||||||
ls = "eza";
|
|
||||||
la = "eza -la";
|
|
||||||
l = "eza -l";
|
|
||||||
};
|
|
||||||
initExtra = ''
|
|
||||||
source ~/.config/zsh/.p10k.zsh
|
|
||||||
'';
|
|
||||||
localVariables = {
|
|
||||||
POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
home.file.".config/zsh/.p10k.zsh".source = ./.p10k.zsh;
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue