use zsh

desktop/gnome/default.nix

@@ -3,6 +3,7 @@
 {
   boot.plymouth = {
     enable = true;
+    theme = "breeze";
   };
 
   services = {
@@ -41,10 +42,13 @@
 
 
   programs.dconf.enable = true;
+  boot.initrd.systemd.enable = true;
 
   environment = {
     systemPackages = [
       #pkgs.gnome.dconf-editor
+      pkgs.plymouth
+      pkgs.breeze-plymouth
       pkgs.gnome.networkmanager-openconnect
       pkgs.numix-icon-theme
       pkgs.papirus-icon-theme

machines/xps/configuration.nix

@@ -31,7 +31,7 @@
     "/crypto_keyfile.bin" = null;
   };
 
-  boot.kernelParams = [ "i915.force_probe=9b41" ];
+  boot.kernelParams = [ "i915.force_probe=9b41" "quiet" ];
 
   networking.hostName = "alice-xps"; # Define your hostname.
   # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.

user/programs/terminal/default.nix

@@ -37,6 +37,7 @@
     pkgs.duf
     pkgs.dust
     pkgs.rustscan
+    pkgs.zoxide
   ];
 
   programs = {
@@ -56,30 +57,5 @@
     ".shellrc/rc.d" = {
       source = ./files/shell/rc.d;
     };
-    # ".oh-my-zsh" = {
-    #   source = builtins.fetchGit {
-    #     url = "https://github.com/ohmyzsh/ohmyzsh";
-    #     rev = "b07c8cfe692bc6c7702f0aef5d493b12dfb43392";
-    #   };
-    # };
-    # ".config/zsh/custom/plugins/zsh-autosuggestions" = {
-    #   source = builtins.fetchGit {
-    #     url = "https://github.com/zsh-users/zsh-autosuggestions";
-    #     rev = "c3d4e576c9c86eac62884bd47c01f6faed043fc5";
-    #   };
-    # };
-    # ".config/zsh/custom/plugins/zsh-syntax-highlighting" = {
-    #   source = builtins.fetchGit {
-    #     url = "https://github.com/zsh-users/zsh-syntax-highlighting";
-    #     rev = "143b25eb98aa3227af63bd7f04413e1b3e7888ec";
-    #   };
-    # };
-    #
-    # ".config/zsh/custom/zsh-vi-mode" = {
-    #   source = builtins.fetchGit {
-    #     url = "https://github.com/jeffreytse/zsh-vi-mode";
-    #     rev = "1f28e1886dc8e49f41b817634d5c7695b6abb145";
-    #   };
-    # };
   };
 }

user/programs/terminal/files/bashrc

@@ -1,15 +1,10 @@
 # Load all files from .shell/rc.d directory
 if [ -d $HOME/.shellrc/rc.d ]; then
   for file in $HOME/.shellrc/rc.d/*.sh; do
-    source $file
+    source $file || echo "Failed to source $file"
   done
-fi
 
-if [ -d $HOME/.shellrc/rc.d ]; then
   for file in $HOME/.shellrc/rc.d/*.bash; do
-    source $file
+    source $file || echo "Failed to source $file"
   done
 fi
-
-[ -f ~/.fzf.bash ] && source ~/.fzf.bash
-

user/programs/terminal/files/shell/rc.d/01-starship.zsh

@@ -0,0 +1 @@
+eval "$(starship init zsh)"

user/programs/terminal/files/shell/rc.d/10-atuin.bash

@@ -1 +0,0 @@
-eval "$(atuin init bash)"

user/programs/terminal/files/shell/rc.d/10-atuin.zsh

@@ -0,0 +1 @@
+eval "$(atuin init zsh)"

user/programs/terminal/files/shell/rc.d/10-starship.bash

@@ -1 +0,0 @@
-eval "$(starship init bash)"

user/programs/terminal/files/zshrc

@@ -1,41 +1,10 @@
 export XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-$HOME/.cache}
-export ZSH="$HOME/.oh-my-zsh"
-export ZSH_CUSTOM="$HOME/.config/zsh/custom"
-ZSH_THEME="robbyrussell"
-
-plugins=(
-  git
-  zsh-autosuggestions
-  copypath
-  copyfile
-  copybuffer
-  dirhistory
-  history
-  z
-  bgnotify
-  zsh-syntax-highlighting
-)
-source $ZSH/oh-my-zsh.sh
-export LANG=en_US.UTF-8
-
-plugins+=(zsh-vi-mode)
-source $ZSH_CUSTOM/zsh-vi-mode/zsh-vi-mode.plugin.zsh
-
-zvm_after_init() {
-  FZF_SHARE=/usr/share/fzf
-  [ -f $FZF_SHARE/completion.zsh ] && . "$FZF_SHARE/completion.zsh"
-  [ -f $FZF_SHARE/key-bindings.zsh ] && . "$FZF_SHARE/key-bindings.zsh"
-}
-
 # Load all files from .shell/rc.d directory
 if [ -d $HOME/.shellrc/rc.d ]; then
   for file in $HOME/.shellrc/rc.d/*.sh; do
     source $file
   done
-fi
 
-# Load all files from .shell/zshrc.d directory
-if [ -d $HOME/.shellrc/zshrc.d ]; then
   for file in $HOME/.shellrc/zshrc.d/*.zsh; do
     source $file
   done
@@ -46,47 +15,6 @@ if [[ -n "$SSH_CONNECTION" ]] ;then
   export PINENTRY_USER_DATA="USE_CURSES=1"
 fi
 
-if [ `tput cols` -gt "70" ]; then
-function PRINT_CENTER {
-  COLS=`tput cols`
-  OFFSET=$(( ($COLS - $1) / 2 ))
-  PRE=""
-  for i in `seq $OFFSET`; do
-    PRE="$PRE "
-  done 
-  while IFS= read -r line; do
-    echo "$PRE$line"
-  done <<< "$2"
-}
-PRINT_CENTER 60 "
-
-       ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
-       █░▄▄▀█▀▄▄▀█░▄▄░█▄░▄█▀▄▀██░▄░██░██░█░▄▄█░▄▄░█
-       █░▀▀▄█░██░█░▀▄░██░██░█▀█░▀▀░▀█░██░█▄▄▀███▄██
-       █▄█▄▄██▄▄██░▀▀░██▄███▄█████░███▄▄▄█▄▄▄█░▀▀░█
-       ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
-             
-               ⣴⣶⣤⡤⠦⣤⣀⣤⠆     ⣈⣭⣿⣶⣿⣦⣼⣆          
-                ⠉⠻⢿⣿⠿⣿⣿⣶⣦⠤⠄⡠⢾⣿⣿⡿⠋⠉⠉⠻⣿⣿⡛⣦       
-                      ⠈⢿⣿⣟⠦ ⣾⣿⣿⣷    ⠻⠿⢿⣿⣧⣄     
-                       ⣸⣿⣿⢧ ⢻⠻⣿⣿⣷⣄⣀⠄⠢⣀⡀⠈⠙⠿⠄    
-                      ⢠⣿⣿⣿⠈    ⣻⣿⣿⣿⣿⣿⣿⣿⣛⣳⣤⣀⣀   
-               ⢠⣧⣶⣥⡤⢄ ⣸⣿⣿⠘  ⢀⣴⣿⣿⡿⠛⣿⣿⣧⠈⢿⠿⠟⠛⠻⠿⠄  
-              ⣰⣿⣿⠛⠻⣿⣿⡦⢹⣿⣷   ⢊⣿⣿⡏  ⢸⣿⣿⡇ ⢀⣠⣄⣾⠄   
-             ⣠⣿⠿⠛ ⢀⣿⣿⣷⠘⢿⣿⣦⡀ ⢸⢿⣿⣿⣄ ⣸⣿⣿⡇⣪⣿⡿⠿⣿⣷⡄  
-             ⠙⠃   ⣼⣿⡟  ⠈⠻⣿⣿⣦⣌⡇⠻⣿⣿⣷⣿⣿⣿ ⣿⣿⡇ ⠛⠻⢷⣄ 
-                  ⢻⣿⣿⣄   ⠈⠻⣿⣿⣿⣷⣿⣿⣿⣿⣿⡟ ⠫⢿⣿⡆     
-                   ⠻⣿⣿⣿⣿⣶⣶⣾⣿⣿⣿⣿⣿⣿⣿⣿⡟⢀⣀⣤⣾⡿⠃     
-▄▄▄ . ▌ ▐·▪  ▄▄▌    ▄▄▌ ▐ ▄▌▪  ▄▄▄▄▄ ▄ .▄      ▄• ▄▌▄▄▄▄▄
-▀▄.▀·▪█·█▌██ ██•    ██· █▌▐███ •██  ██▪▐█ ▄█▀▄ █▪██▌•██  
-▐▀▀▪▄▐█▐█•▐█·██ ▪   ██▪▐█▐▐▌▐█· ▐█.▪██▀▀█▐█▌.▐▌█▌▐█▌ ▐█.▪
-▐█▄▄▌ ███ ▐█▌▐█▌ ▄  ▐█▌██▐█▌▐█▌ ▐█▌·██▌▐▀▐█▌.▐▌▐█▄█▌ ▐█▌·
- ▀▀▀ . ▀  ▀▀▀.▀▀▀    ▀▀▀▀ ▀▪▀▀▀ ▀▀▀ ▀▀▀ · ▀█▄▀▪ ▀▀▀  ▀▀▀ 
-
-  > welcome x_x
-"
-fi
-
 export PATH=~/.npm-global/bin:$PATH
 export NODE_PATH=~/.npm-global/lib/node_modules