This commit is contained in:
Evie Litherland-Smith 2023-05-28 19:19:46 +01:00
commit bd54d6f50a
6 changed files with 61 additions and 17 deletions

View file

@ -16,9 +16,12 @@
home.packages = [pkgs.gcc]; home.packages = [pkgs.gcc];
programs.zsh.shellAliases.update = "home-manager switch"; programs.fish.shellAbbrs.update = "home-manager switch";
programs.zsh.envExtra = '' programs.zsh = {
export CC=${pkgs.gcc}/bin/gcc shellAliases.update = "home-manager switch";
sessionVariables.CC = "${pkgs.gcc}/bin/gcc";
envExtra = ''
eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(/opt/homebrew/bin/brew shellenv)"
''; '';
};
} }

View file

@ -3,10 +3,7 @@
home.username = "xenia"; home.username = "xenia";
home.homeDirectory = "/home/xenia"; home.homeDirectory = "/home/xenia";
home.stateVersion = "22.11"; home.stateVersion = "22.11";
home.packages = with pkgs; [ home.packages = with pkgs; [prismlauncher nomachine-client];
prismlauncher
nomachine-client
];
programs.fish.shellAbbrs.hypr = "exec Hyprland"; programs.fish.shellAbbrs.hypr = "exec Hyprland";
xdg.configFile."hypr/hyprpaper.conf".text = '' xdg.configFile."hypr/hyprpaper.conf".text = ''

10
home/env/bat.nix vendored
View file

@ -2,9 +2,17 @@
programs.bat = { programs.bat = {
enable = true; enable = true;
config = { config = {
theme = "Catppuccin-macchiato"; theme = "tokyonight";
}; };
themes = { themes = {
tokyonight = builtins.readFile (pkgs.fetchFromGitHub
{
owner = "folke";
repo = "tokyonight.nvim";
rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
}
+ "/extras/sublime/tokyonight_storm.tmTheme");
Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub Catppuccin-macchiato = builtins.readFile (pkgs.fetchFromGitHub
{ {
owner = "catppuccin"; owner = "catppuccin";

15
home/env/fish.nix vendored
View file

@ -1,10 +1,23 @@
{...}: { {pkgs, ...}: {
programs.fish = { programs.fish = {
enable = true; enable = true;
shellAbbrs = { shellAbbrs = {
lg = "lazygit"; lg = "lazygit";
nixos-update = "sudo git -C /etc/nixos/config pull && sudo nixos-rebuild switch"; nixos-update = "sudo git -C /etc/nixos/config pull && sudo nixos-rebuild switch";
}; };
plugins = [
{
name = "tokyonight";
src =
pkgs.fetchFromGitHub {
owner = "folke";
repo = "tokyonight.nvim";
rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
}
+ "/extras/fish/tokyonight_storm.fish";
}
];
}; };
programs.keychain.enableFishIntegration = true; programs.keychain.enableFishIntegration = true;
programs.starship.enableFishIntegration = true; programs.starship.enableFishIntegration = true;

12
home/env/zsh.nix vendored
View file

@ -1,15 +1,19 @@
{config, ...}: { {config, ...}: {
programs.zsh = { programs.zsh = {
enable = true; enable = true;
enableAutosuggestions = true;
enableCompletion = true;
enableSyntaxHighlighting = true;
enableVteIntegration = true;
autocd = true;
dotDir = ".config/zsh";
historySubstringSearch.enable = true;
shellAliases = { shellAliases = {
ll = "ls -l"; ll = "ls -l";
lg = "lazygit"; lg = "lazygit";
nixos-update = "sudo git -C /etc/nixos/config pull && sudo nixos-rebuild switch"; nixos-update = "sudo git -C /etc/nixos/config pull && sudo nixos-rebuild switch";
}; };
history = { history.path = "${config.xdg.dataHome}/zsh/history";
size = 10000;
path = "${config.xdg.dataHome}/zsh/history";
};
}; };
programs.keychain.enableZshIntegration = true; programs.keychain.enableZshIntegration = true;
programs.starship.enableZshIntegration = true; programs.starship.enableZshIntegration = true;

View file

@ -1,14 +1,33 @@
{...}: { {pkgs, ...}: {
imports = [../env/bat.nix];
xdg.configFile."git/tokyonight_storm.gitconfig".source =
pkgs.fetchFromGitHub
{
owner = "folke";
repo = "tokyonight.nvim";
rev = "cd5156f4b4a6c4c337a46deb0c0bd37319920833";
sha256 = "/ht+ixR1eyYR0la00Xq5q1gCsgb5Ly90JghERwbaDPQ=";
}
+ "/extras/delta/tokyonight_storm.gitconfig";
programs.git = { programs.git = {
enable = true; enable = true;
userName = "Evie Litherland-Smith"; userName = "Evie Litherland-Smith";
includes = [{path = "tokyonight_storm.gitconfig";}];
delta = { delta = {
enable = true; enable = true;
options.syntax-theme = "Catppuccin-macchiato"; options = {
blame-code-style = "syntax";
line-numbers = true;
navigate = true;
side-by-side = true;
syntax-theme = "tokyonight";
zero-style = "dim syntax";
};
}; };
extraConfig = { extraConfig = {
pull.rebase = false; pull.rebase = false;
init.defaultBranch = "main"; init.defaultBranch = "main";
credential.helper = "store";
}; };
}; };
} }