From a07b300be7b7daeb7763291ef76fbb0e9efa9e05 Mon Sep 17 00:00:00 2001 From: JuliaLange Date: Tue, 9 Apr 2024 15:07:17 -0700 Subject: [PATCH] Add zsh, swap alacritty for kitty Adds zsh with nix-your-shell support switch from alacritty to kitty Add zsh Fix ZSH, and switch to ZSH from alacritty Add zsh prompt Swap any-nix-shell for nix-your-shell --- home.nix | 1 + programs/hypr/keybinds.conf | 2 +- programs/hypr/window_rules.conf | 5 +++-- programs/zsh/default.nix | 31 +++++++++++++++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) create mode 100644 programs/zsh/default.nix diff --git a/home.nix b/home.nix index 097a0d3..00fedd6 100644 --- a/home.nix +++ b/home.nix @@ -26,6 +26,7 @@ ./programs/xonsh ./programs/obs ./programs/kitty + ./programs/zsh # ./services/scripts ./services/timers diff --git a/programs/hypr/keybinds.conf b/programs/hypr/keybinds.conf index d769a46..26e89e0 100644 --- a/programs/hypr/keybinds.conf +++ b/programs/hypr/keybinds.conf @@ -1,7 +1,7 @@ $mainMod = SUPER # Exec programs -bind = $mainMod, return, exec, alacritty +bind = $mainMod, return, exec, kitty bind = $mainMod SHIFT, return, exec, rofi -show run bind = $mainMod, P, exec, grimblast --freeze copy area bind = $mainMod SHIFT, P, exec, grimblast --freeze copysave area diff --git a/programs/hypr/window_rules.conf b/programs/hypr/window_rules.conf index 8d084ea..57be0c8 100644 --- a/programs/hypr/window_rules.conf +++ b/programs/hypr/window_rules.conf @@ -14,7 +14,7 @@ workspace=name:web , monitor:DP-1, persistent:true workspace=name:med , monitor:DP-1, persistent:true # Pseudo workspace=special:mus, persistent:true -workspace=special:scratch, on-created-empty: [float; size 50% 50%; center] alacritty +workspace=special:scratch, on-created-empty: [float; size 50% 50%; center] kitty windowrule = workspace name:web, librewolf windowrulev2 = workspace name:med, librewolf,title:Picture-in-Picture @@ -26,6 +26,7 @@ windowrule = workspace name:game, explorer.exe windowrulev2 = opacity 0.94 fullscreen:0 windowrulev2 = opacity 0.79 override, class:^(Alacritty)$ +windowrulev2 = opacity 0.79 override, class:^(kitty)$ windowrulev2 = opacity 1 override, initialTitle:^(Discord Popout)$ windowrulev2 = opacity 1 override, class:^(firefox)$ windowrulev2 = opacity 1 override, class:^(Gimp)$ @@ -34,6 +35,6 @@ windowrulev2 = opacity 1 override, class:^(mpv)$ env = HYPR_WORK_DB,$XDG_CACHE_HOME/hypr/workspace.db -exec-once = [workspace special:mus silent;float;size 70% 70%;center] alacritty -e spt +# exec-once = [workspace special:mus silent;float;size 70% 70%;center] mus client exec-once = [workspace name:chat silent] vesktop exec-once = [workspace name:chat silent] beeper diff --git a/programs/zsh/default.nix b/programs/zsh/default.nix new file mode 100644 index 0000000..694b981 --- /dev/null +++ b/programs/zsh/default.nix @@ -0,0 +1,31 @@ +{ config, pkgs, ... }: +{ + programs.zsh = { + enable = true; + enableCompletion = true; + autosuggestion.enable = true; + syntaxHighlighting.enable = true; + dotDir = ".config/zsh"; + + history.save = 10000; + history.size = 10000; + history.path = "${config.xdg.dataHome}/zsh/history"; + initExtra = '' + # Nix-shell + ${pkgs.nix-your-shell}/bin/nix-your-shell zsh | source /dev/stdin + + # Prompt + autoload -U colors && colors + autoload -Uz vcs_info + precmd_vcs_info() { vcs_info } + precmd_functions+=( precmd_vcs_info ) + setopt prompt_subst + zstyle ':vcs_info:*' check-for-changes true + zstyle ':vcs_info:*' unstagedstr '·*' + zstyle ':vcs_info:*' stagedstr '·+' + zstyle ':vcs_info:git:*' formats '%b%u%c' + export PROMPT="%(0?.%F{white}.%? %F{red})τ%f " + export RPROMPT="%F{yellow}\$vcs_info_msg_0_%f %F{blue}%~%f" + ''; + }; +}