Compare commits
No commits in common. "cb6fcae89431f6bef7e6b9fd7758c2c2e0e5b31e" and "6e6f41f061cef96f09f0f1624e2da646941d1dda" have entirely different histories.
cb6fcae894
...
6e6f41f061
|
@ -18,11 +18,9 @@
|
||||||
|
|
||||||
homebrew = {
|
homebrew = {
|
||||||
enable = flake.inputs.homebrew-enabled.value;
|
enable = flake.inputs.homebrew-enabled.value;
|
||||||
onActivation = {
|
onActivation.autoUpdate = true;
|
||||||
autoUpdate = true;
|
onActivation.upgrade = true;
|
||||||
upgrade = true;
|
onActivation.cleanup = "uninstall";
|
||||||
cleanup = "uninstall";
|
|
||||||
};
|
|
||||||
global.brewfile = true;
|
global.brewfile = true;
|
||||||
|
|
||||||
taps = [ "homebrew/cask-versions" "homebrew/services" ];
|
taps = [ "homebrew/cask-versions" "homebrew/services" ];
|
||||||
|
|
|
@ -4,19 +4,17 @@ let
|
||||||
tomlFormat = pkgs.formats.toml { };
|
tomlFormat = pkgs.formats.toml { };
|
||||||
in {
|
in {
|
||||||
options.programs.helix = {
|
options.programs.helix = {
|
||||||
autoTheme = {
|
autoTheme.enable =
|
||||||
enable =
|
lib.mkEnableOption "Automatically switch helix theme with night mode";
|
||||||
lib.mkEnableOption "Automatically switch helix theme with night mode";
|
|
||||||
|
|
||||||
light = lib.mkOption {
|
autoTheme.light = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Light mode theme";
|
description = "Light mode theme";
|
||||||
};
|
};
|
||||||
|
|
||||||
dark = lib.mkOption {
|
autoTheme.dark = lib.mkOption {
|
||||||
type = lib.types.str;
|
type = lib.types.str;
|
||||||
description = "Dark mode theme";
|
description = "Dark mode theme";
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@ in {
|
||||||
ignores = [ ".DS_Store" ".direnv" "result" ];
|
ignores = [ ".DS_Store" ".direnv" "result" ];
|
||||||
|
|
||||||
# enhanced diffs
|
# enhanced diffs
|
||||||
# TODO: fix light colorscheme
|
|
||||||
delta = {
|
delta = {
|
||||||
enable = true;
|
enable = true;
|
||||||
options = {
|
options = {
|
||||||
|
|
103
home/kitty.nix
103
home/kitty.nix
|
@ -2,69 +2,62 @@
|
||||||
let font = "Rec Mono Duotone";
|
let font = "Rec Mono Duotone";
|
||||||
in {
|
in {
|
||||||
imports = [ ./extras/kitty/auto-theme.nix ./extras/kitty/nerd-font.nix ];
|
imports = [ ./extras/kitty/auto-theme.nix ./extras/kitty/nerd-font.nix ];
|
||||||
programs.kitty = {
|
programs.kitty.enable = true;
|
||||||
enable = true;
|
# using kitty from homebrew
|
||||||
# using kitty from homebrew
|
programs.kitty.package = pkgs.emptyDirectory;
|
||||||
package = pkgs.emptyDirectory;
|
|
||||||
|
|
||||||
settings = {
|
programs.kitty.settings = {
|
||||||
font_family = font;
|
font_family = font;
|
||||||
bold_font = "${font} Bold";
|
bold_font = "${font} Bold";
|
||||||
italic_font = "${font} Italic";
|
italic_font = "${font} Italic";
|
||||||
bold_italic_font = "${font} Bold Italic";
|
bold_italic_font = "${font} Bold Italic";
|
||||||
font_size = "15.0";
|
font_size = "15.0";
|
||||||
adjust_line_height = "120%";
|
adjust_line_height = "120%";
|
||||||
disable_ligatures = "cursor"; # disable ligatures when cursor is on them
|
disable_ligatures = "cursor"; # disable ligatures when cursor is on them
|
||||||
|
|
||||||
hide_window_decorations = "titlebar-only";
|
hide_window_decorations = "titlebar-only";
|
||||||
window_padding_width = "10";
|
window_padding_width = "10";
|
||||||
|
|
||||||
tab_bar_edge = "top";
|
tab_bar_edge = "top";
|
||||||
tab_bar_style = "powerline";
|
tab_bar_style = "powerline";
|
||||||
tab_powerline_style = "angled";
|
tab_powerline_style = "angled";
|
||||||
tab_title_template = "{index}: {title}";
|
tab_title_template = "{index}: {title}";
|
||||||
active_tab_font_style = "bold";
|
active_tab_font_style = "bold";
|
||||||
inactive_tab_font_style = "normal";
|
inactive_tab_font_style = "normal";
|
||||||
tab_activity_symbol = "💬";
|
tab_activity_symbol = "💬";
|
||||||
|
|
||||||
# shell integration is manually enabled for fish
|
# shell integration is manually enabled for fish
|
||||||
shell_integration = "disabled";
|
shell_integration = "disabled";
|
||||||
} // lib.optionalAttrs pkgs.stdenv.isDarwin {
|
} // lib.optionalAttrs pkgs.stdenv.isDarwin { macos_option_as_alt = "both"; };
|
||||||
macos_option_as_alt = "both";
|
|
||||||
};
|
|
||||||
|
|
||||||
useSymbolsFromNerdFont = "CaskaydiaCove Nerd Font";
|
programs.fish.interactiveShellInit = ''
|
||||||
colors = {
|
# Manually enable shell integration
|
||||||
enable = true;
|
if set -q KITTY_INSTALLATION_DIR
|
||||||
dark-name = "rose-pine";
|
set --global KITTY_SHELL_INTEGRATION enabled
|
||||||
light-name = "rose-pine-dawn";
|
source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
|
||||||
};
|
set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
|
||||||
|
end
|
||||||
|
set-term-colors
|
||||||
|
'';
|
||||||
|
programs.fish.shellAliases = {
|
||||||
|
s = "kitty +kitten ssh";
|
||||||
|
e = "edit-in-kitty";
|
||||||
};
|
};
|
||||||
|
|
||||||
programs.fish = {
|
programs.kitty.useSymbolsFromNerdFont = "CaskaydiaCove Nerd Font";
|
||||||
interactiveShellInit = ''
|
programs.kitty.colors = {
|
||||||
# Manually enable shell integration
|
enable = true;
|
||||||
if set -q KITTY_INSTALLATION_DIR
|
dark-name = "rose-pine";
|
||||||
set --global KITTY_SHELL_INTEGRATION enabled
|
light-name = "rose-pine-dawn";
|
||||||
source "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish"
|
};
|
||||||
set --prepend fish_complete_path "$KITTY_INSTALLATION_DIR/shell-integration/fish/vendor_completions.d"
|
programs.fish.functions.set-term-colors = {
|
||||||
|
body = ''
|
||||||
|
if test "$term_background" = light
|
||||||
|
term-light
|
||||||
|
else
|
||||||
|
term-dark
|
||||||
end
|
end
|
||||||
set-term-colors
|
|
||||||
'';
|
'';
|
||||||
shellAliases = {
|
onVariable = "term_background";
|
||||||
s = "kitty +kitten ssh";
|
|
||||||
e = "edit-in-kitty";
|
|
||||||
};
|
|
||||||
|
|
||||||
functions.set-term-colors = {
|
|
||||||
body = ''
|
|
||||||
if test "$term_background" = light
|
|
||||||
term-light
|
|
||||||
else
|
|
||||||
term-dark
|
|
||||||
end
|
|
||||||
'';
|
|
||||||
onVariable = "term_background";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
--configfile ${config.home.homeDirectory}/.tarsnaprc \
|
--configfile ${config.home.homeDirectory}/.tarsnaprc \
|
||||||
--keyfile ${config.xdg.configHome}/tarsnap/write-only.key \
|
--keyfile ${config.xdg.configHome}/tarsnap/write-only.key \
|
||||||
-f $(uname -n)-$date \
|
-f $(uname -n)-$date \
|
||||||
${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents}
|
${config.home.homeDirectory}/{dotfiles.nix,Desktop,Development,Documents,Downloads}
|
||||||
'';
|
'';
|
||||||
in {
|
in {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -3,13 +3,11 @@ let inherit (lib) mkDefault;
|
||||||
in {
|
in {
|
||||||
programs.starship.settings = {
|
programs.starship.settings = {
|
||||||
aws.symbol = mkDefault " ";
|
aws.symbol = mkDefault " ";
|
||||||
battery = {
|
battery.full_symbol = mkDefault "";
|
||||||
full_symbol = mkDefault "";
|
battery.charging_symbol = mkDefault "";
|
||||||
charging_symbol = mkDefault "";
|
battery.discharging_symbol = mkDefault "";
|
||||||
discharging_symbol = mkDefault "";
|
battery.unknown_symbol = mkDefault "";
|
||||||
unknown_symbol = mkDefault "";
|
battery.empty_symbol = mkDefault "";
|
||||||
empty_symbol = mkDefault "";
|
|
||||||
};
|
|
||||||
cmake.symbol = mkDefault "△ ";
|
cmake.symbol = mkDefault "△ ";
|
||||||
conda.symbol = mkDefault " ";
|
conda.symbol = mkDefault " ";
|
||||||
crystal.symbol = mkDefault " ";
|
crystal.symbol = mkDefault " ";
|
||||||
|
@ -23,19 +21,17 @@ in {
|
||||||
gcloud.symbol = mkDefault " ";
|
gcloud.symbol = mkDefault " ";
|
||||||
git_branch.symbol = mkDefault " ";
|
git_branch.symbol = mkDefault " ";
|
||||||
git_commit.tag_symbol = mkDefault " ";
|
git_commit.tag_symbol = mkDefault " ";
|
||||||
git_status = {
|
git_status.format = mkDefault "([$all_status$ahead_behind]($style) )";
|
||||||
format = mkDefault "([$all_status$ahead_behind]($style) )";
|
git_status.conflicted = mkDefault " ";
|
||||||
conflicted = mkDefault " ";
|
git_status.ahead = mkDefault " ";
|
||||||
ahead = mkDefault " ";
|
git_status.behind = mkDefault " ";
|
||||||
behind = mkDefault " ";
|
git_status.diverged = mkDefault " ";
|
||||||
diverged = mkDefault " ";
|
git_status.untracked = mkDefault " ";
|
||||||
untracked = mkDefault " ";
|
git_status.stashed = mkDefault " ";
|
||||||
stashed = mkDefault " ";
|
git_status.modified = mkDefault " ";
|
||||||
modified = mkDefault " ";
|
git_status.staged = mkDefault " ";
|
||||||
staged = mkDefault " ";
|
git_status.renamed = mkDefault " ";
|
||||||
renamed = mkDefault " ";
|
git_status.deleted = mkDefault " ";
|
||||||
deleted = mkDefault " ";
|
|
||||||
};
|
|
||||||
golang.symbol = mkDefault " ";
|
golang.symbol = mkDefault " ";
|
||||||
helm.symbol = mkDefault "⎈ ";
|
helm.symbol = mkDefault "⎈ ";
|
||||||
hg_branch.symbol = mkDefault " ";
|
hg_branch.symbol = mkDefault " ";
|
||||||
|
@ -57,13 +53,11 @@ in {
|
||||||
ruby.symbol = mkDefault " ";
|
ruby.symbol = mkDefault " ";
|
||||||
rust.symbol = mkDefault " ";
|
rust.symbol = mkDefault " ";
|
||||||
shlvl.symbol = mkDefault " ";
|
shlvl.symbol = mkDefault " ";
|
||||||
status = {
|
status.symbol = mkDefault " ";
|
||||||
symbol = mkDefault " ";
|
status.not_executable_symbol = mkDefault " ";
|
||||||
not_executable_symbol = mkDefault " ";
|
status.not_found_symbol = mkDefault " ";
|
||||||
not_found_symbol = mkDefault " ";
|
status.sigint_symbol = mkDefault " ";
|
||||||
sigint_symbol = mkDefault " ";
|
status.signal_symbol = mkDefault " ";
|
||||||
signal_symbol = mkDefault " ";
|
|
||||||
};
|
|
||||||
swift.symbol = mkDefault " ";
|
swift.symbol = mkDefault " ";
|
||||||
terraform.symbol = mkDefault "𝗧 ";
|
terraform.symbol = mkDefault "𝗧 ";
|
||||||
vagrant.symbol = mkDefault "𝗩 ";
|
vagrant.symbol = mkDefault "𝗩 ";
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
disabled = ["repeated_keys"]
|
Loading…
Reference in New Issue