zsh: update various systems
This commit is contained in:
parent
612a1bae69
commit
0626d19c75
11 changed files with 22 additions and 17 deletions
|
@ -14,8 +14,7 @@
|
||||||
(set mod.colors dracula-colors)
|
(set mod.colors dracula-colors)
|
||||||
|
|
||||||
(fn mod.setup []
|
(fn mod.setup []
|
||||||
(set g.dracula_show_end_of_buffer false)
|
(dracula.setup {:show_end_of_buffer false :italic_comment true})
|
||||||
(set g.dracula_italic_comment true)
|
|
||||||
(set o.background :dark)
|
(set o.background :dark)
|
||||||
(colorscheme :dracula)
|
(colorscheme :dracula)
|
||||||
;; Tabline
|
;; Tabline
|
||||||
|
|
|
@ -173,8 +173,7 @@
|
||||||
:new_tab_hover {:bg_color colors.hover-background
|
:new_tab_hover {:bg_color colors.hover-background
|
||||||
:fg_color colors.hover-foreground}}}
|
:fg_color colors.hover-foreground}}}
|
||||||
;; Fonts
|
;; Fonts
|
||||||
:font (wezterm.font_with_fallback [{:family "Berkeley Mono"
|
:font (wezterm.font_with_fallback ["Berkeley Mono"
|
||||||
:weight :Regular}
|
|
||||||
"Symbols Nerd Font"
|
"Symbols Nerd Font"
|
||||||
"Apple Symbols"
|
"Apple Symbols"
|
||||||
"Apple Color Emoji"
|
"Apple Color Emoji"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../programs/fish.nix
|
../programs/zsh
|
||||||
../programs/atuin.nix
|
../programs/atuin.nix
|
||||||
../programs/starship.nix
|
../programs/starship.nix
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../programs/fish.nix
|
|
||||||
../programs/zsh
|
../programs/zsh
|
||||||
../programs/atuin.nix
|
../programs/atuin.nix
|
||||||
../programs/starship.nix
|
../programs/starship.nix
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../programs/fish.nix
|
../programs/zsh
|
||||||
../programs/starship.nix
|
../programs/starship.nix
|
||||||
|
|
||||||
../programs/git.nix
|
../programs/git.nix
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
../programs/fish.nix
|
../programs/zsh
|
||||||
../programs/atuin.nix
|
../programs/atuin.nix
|
||||||
../programs/starship.nix
|
../programs/starship.nix
|
||||||
|
|
||||||
|
|
|
@ -20,7 +20,6 @@ in
|
||||||
|
|
||||||
syntaxHighlighting = {
|
syntaxHighlighting = {
|
||||||
enable = true;
|
enable = true;
|
||||||
highlighters = [ "main" "brackets" ];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
plugins = [
|
plugins = [
|
||||||
|
@ -102,13 +101,23 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
initExtra = /* sh */ ''
|
initExtra = /* sh */ ''
|
||||||
|
# Options
|
||||||
|
setopt AUTO_CD
|
||||||
|
setopt AUTO_PUSHD
|
||||||
|
setopt PUSHD_IGNORE_DUPS
|
||||||
|
setopt INTERACTIVE_COMMENTS
|
||||||
|
|
||||||
# Keymaps
|
# Keymaps
|
||||||
bindkey '^[[1;3C' forward-word # Alt+Right
|
bindkey '^[[1;3C' forward-word # Alt+Right
|
||||||
bindkey '^[[1;3D' backward-word # Alt+Left
|
bindkey '^[[1;3D' backward-word # Alt+Left
|
||||||
|
|
||||||
# Plugins
|
# Plugins
|
||||||
|
ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets cursor)
|
||||||
|
typeset -gA ZSH_HIGHLIGHT_STYLES
|
||||||
|
|
||||||
ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true
|
ZSH_TAB_TITLE_ENABLE_FULL_COMMAND=true
|
||||||
ZSH_TAB_TITLE_DEFAULT_DISABLE_PREFIX=true
|
ZSH_TAB_TITLE_DEFAULT_DISABLE_PREFIX=true
|
||||||
|
ZSH_TAB_TITLE_ADDITIONAL_TERMS='wezterm'
|
||||||
|
|
||||||
AUTO_NOTIFY_THRESHOLD=10
|
AUTO_NOTIFY_THRESHOLD=10
|
||||||
|
|
||||||
|
|
|
@ -215,7 +215,6 @@ in
|
||||||
};
|
};
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
fish.enable = true;
|
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
htop.enable = true;
|
htop.enable = true;
|
||||||
};
|
};
|
||||||
|
@ -231,7 +230,7 @@ in
|
||||||
home = "/home/daniel";
|
home = "/home/daniel";
|
||||||
description = "Daniel";
|
description = "Daniel";
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.zsh;
|
||||||
openssh.authorizedKeys.keys = [ ssh-keys.LAN ssh-keys.DanielsPhone ];
|
openssh.authorizedKeys.keys = [ ssh-keys.LAN ssh-keys.DanielsPhone ];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -154,7 +154,6 @@ in
|
||||||
fonts.fontconfig.enable = false;
|
fonts.fontconfig.enable = false;
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
fish.enable = true;
|
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
htop.enable = true;
|
htop.enable = true;
|
||||||
};
|
};
|
||||||
|
|
|
@ -149,7 +149,6 @@ in
|
||||||
services.hardware.argonone.enable = true;
|
services.hardware.argonone.enable = true;
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
fish.enable = true;
|
|
||||||
zsh.enable = true;
|
zsh.enable = true;
|
||||||
htop.enable = true;
|
htop.enable = true;
|
||||||
};
|
};
|
||||||
|
@ -165,7 +164,7 @@ in
|
||||||
home = "/home/daniel";
|
home = "/home/daniel";
|
||||||
description = "Daniel";
|
description = "Daniel";
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.zsh;
|
||||||
openssh.authorizedKeys.keys = [ ssh-keys.LAN ];
|
openssh.authorizedKeys.keys = [ ssh-keys.LAN ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -174,8 +174,10 @@ in
|
||||||
|
|
||||||
fonts.fontconfig.enable = false;
|
fonts.fontconfig.enable = false;
|
||||||
|
|
||||||
programs.fish.enable = true;
|
programs = {
|
||||||
programs.htop.enable = true;
|
htop.enable = true;
|
||||||
|
zsh.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
users.users = {
|
users.users = {
|
||||||
root = {
|
root = {
|
||||||
|
@ -188,7 +190,7 @@ in
|
||||||
home = "/home/daniel";
|
home = "/home/daniel";
|
||||||
description = "Daniel";
|
description = "Daniel";
|
||||||
extraGroups = [ "wheel" ];
|
extraGroups = [ "wheel" ];
|
||||||
shell = pkgs.fish;
|
shell = pkgs.zsh;
|
||||||
openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ssh-keys.DanielsPhone ];
|
openssh.authorizedKeys.keys = [ ssh-keys.Hetzner ssh-keys.DanielsPhone ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue