From cf21a0a31934f994b222b3ca60a8087a3f301b2c Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Feb 2024 15:22:46 +0100 Subject: [PATCH] zsh with starship --- alacritty.toml | 2 +- configuration.nix | 9 ++++++++- home_manager.nix | 3 +-- zsh.nix | 22 ++++++++++++++++++++++ 4 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 zsh.nix diff --git a/alacritty.toml b/alacritty.toml index 57aa399..e41ca76 100644 --- a/alacritty.toml +++ b/alacritty.toml @@ -3,7 +3,7 @@ opacity=0.8 dynamic_padding=true [font] -#normal={family="Source Code Pro"} +normal= { family="FiraCode Nerd Font Mono" } size=10 [colors] diff --git a/configuration.nix b/configuration.nix index 1e61b36..e2b8b1b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -81,7 +81,9 @@ # services.xserver.libinput.enable = true; # Define a user account. Don't forget to set a password with ‘passwd’. + programs.zsh.enable = true; users.users.catvayor = { + shell = pkgs.zsh; isNormalUser = true; extraGroups = [ "wheel" "usb" "networkmanager" "video" "audio" ]; packages = with pkgs; [ @@ -89,6 +91,7 @@ tree ]; }; + users.users.root.shell = pkgs.zsh; environment.systemPackages = with pkgs; [ wget @@ -98,6 +101,10 @@ btop ranger ]; + fonts.packages = with pkgs; [ + fira-code-nerdfont + font-awesome + ]; # Some programs need SUID wrappers, can be configured further or are # started in user sessions. @@ -118,7 +125,7 @@ # }; home-manager.users.root = { home.stateVersion = "23.11"; - imports = [ ./neovim ]; + imports = [ ./neovim ./zsh.nix ]; }; services.syncthing = { diff --git a/home_manager.nix b/home_manager.nix index 1262ead..81d91e0 100644 --- a/home_manager.nix +++ b/home_manager.nix @@ -6,7 +6,7 @@ home-manager.users.catvayor = { home.stateVersion = "23.11"; - imports = [ ./neovim ]; + imports = [ ./neovim ./zsh.nix ]; xdg.configFile."sway/config".onChange = lib.mkForce ""; @@ -25,7 +25,6 @@ wl-clipboard firefox pavucontrol - font-awesome libnotify discord diff --git a/zsh.nix b/zsh.nix new file mode 100644 index 0000000..dab6643 --- /dev/null +++ b/zsh.nix @@ -0,0 +1,22 @@ +{ config, pkgs, lib, ... }: +{ + programs.zsh = { + enable = true; + oh-my-zsh = { + enable = true; + plugins = [ "git" ]; + }; + zplug = { + enable = true; + plugins = [ + { name = "zsh-users/zsh-autosuggestions"; } + { name = "zsh-users/zsh-syntax-highlighting"; } + ]; + }; + }; + + programs.starship = { + enable = true; + enableZshIntegration = true; + }; +}