diff --git a/hosts/macbook/configuration.nix b/hosts/macbook/configuration.nix index bc8dd9a..ab1992f 100644 --- a/hosts/macbook/configuration.nix +++ b/hosts/macbook/configuration.nix @@ -10,6 +10,8 @@ home = "/Users/mthomson"; }; + nix.settings.experimental-features = [ "nix-command" "flakes" ]; + environment.systemPackages = with pkgs; [ hello ]; @@ -19,9 +21,10 @@ useGlobalPkgs = true; useUserPackages = true; users = { - "mthomson" = import ./home.nix; + mthomson = import ./home.nix; }; }; + programs.zsh.enable = true; # Auto upgrade nix package and the daemon service. services.nix-daemon.enable = true; diff --git a/hosts/macbook/home.nix b/hosts/macbook/home.nix index 1153ac8..244d3df 100644 --- a/hosts/macbook/home.nix +++ b/hosts/macbook/home.nix @@ -3,14 +3,14 @@ { imports = [ ../../modules/home-manager/wezterm + ../../modules/home-manager/zsh ]; home.username = "mthomson"; - #home.homeDirectory = "/Users/mthomson"; + home.homeDirectory = "/Users/mthomson"; home.stateVersion = "23.11"; home.packages = with pkgs; [ - hello - cowsay + btop ]; programs.home-manager.enable = true; diff --git a/modules/home-manager/zsh/default.nix b/modules/home-manager/zsh/default.nix new file mode 100644 index 0000000..3e4fe99 --- /dev/null +++ b/modules/home-manager/zsh/default.nix @@ -0,0 +1,24 @@ +{ pkgs, config, ... }: + +{ + programs = { + zsh = { + enable = true; + oh-my-zsh = { + enable = false; + }; + antidote = { + enable = true; + plugins = [ + "zsh-users/zsh-syntax-highlighting" + "zsh-users/zsh-autosuggestions" + "zsh-users/zsh-history-substring-search" + ]; + }; + }; + starship = { + enable = true; + enableZshIntegration = true; + }; + }; +}