Some more nixos changes along with some other stuff

5 files changed, 65 insertions, 51 deletions

diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json
index 5a3f510..30888ec 100644
--- a/.config/nvim/lazy-lock.json
+++ b/.config/nvim/lazy-lock.json
@@ -20,7 +20,7 @@
   "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
   "helpview.nvim": { "branch": "main", "commit": "857aec1dab331252910da158ab6cbfbc65239c71" },
   "indent-blankline.nvim": { "branch": "master", "commit": "04e44b09ee3ff189c69ab082edac1ef7ae2e256c" },
-  "lazy.nvim": { "branch": "main", "commit": "cf8ecc2c5e4332760431a33534240b0cbc6680ab" },
+  "lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
   "lazydev.nvim": { "branch": "main", "commit": "d5800897d9180cea800023f2429bce0a94ed6064" },
   "leap.nvim": { "branch": "main", "commit": "c6bfb191f1161fbabace1f36f578a20ac6c7642c" },
   "lsp-progress.nvim": { "branch": "main", "commit": "d5f4d28efe75ce636bfbe271eb45f39689765aab" },
diff --git a/.gitconfig b/.gitconfig
index d7c95ae..2b74d0e 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -1,5 +1,5 @@
 [credential "https://github.com"]
-	helper = !/usr/bin/gh auth git-credential
+	helper = !/etc/profiles/per-user/kyren/bin/gh auth git-credential
 [credential "https://gist.github.com"]
 	helper = !/usr/bin/gh auth git-credential
 [user]
diff --git a/.zshrc b/.zshrc
index a267f71..4885e5d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,12 +1,12 @@
 START_TIME=$(date +%s.%3N)
-
-# Fix for tmux on openSuse with WSL2
-mkdir -p /tmp
-export TMUX_TMPDIR='/tmp'
-
-# Enable rustup tab completion for zsh - https://rust-lang.github.io/rustup/installation/index.html
-rustup completions zsh > ~/.zfunc/_rustup
-fpath+=~/.zfunc
+# 
+# #  Fix for tmux on openSuse with WSL2
+# mkdir -p /tmp
+# export TMUX_TMPDIR='/tmp'
+# 
+# # Enable rustup tab completion for zsh - https://rust-lang.github.io/rustup/installation/index.html
+# rustup completions zsh > ~/.zfunc/_rustup
+# fpath+=~/.zfunc
 
 # Install zinit if missing
 if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then
@@ -29,10 +29,10 @@ zinit ice wait lucid && zinit light Aloxaf/fzf-tab
 zinit ice wait lucid atload'_zsh_autosuggest_start && bindkey "^y" autosuggest-accept'
 zinit light zsh-users/zsh-autosuggestions
 
-# # Zsh snippets
+# Zsh snippets
 zinit ice wait lucid && zinit snippet OMZP::git
-zinit ice wait lucid && zinit snippet OMZP::sudo
-zinit ice wait lucid && zinit snippet OMZP::command-not-found
+# zinit ice wait lucid && zinit snippet OMZP::sudo
+# zinit ice wait lucid && zinit snippet OMZP::command-not-found
 
 # Completion styling
 zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}'
@@ -46,16 +46,16 @@ eval "$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/tokyocat.omp.yml)"
 # zinit ice wait atload"eval '$(oh-my-posh init zsh --config $HOME/.config/ohmyposh/tokyocat.omp.yml)'"
 # zinit load zdharma-continuum/null
 
-# # Shell integrations
+# Shell integrations
 zinit ice wait lucid atload'source <(fzf --zsh)' && zinit load zdharma-continuum/null
 zinit ice wait lucid atload'eval "$(zoxide init --cmd cd zsh)"' && zinit load zdharma-continuum/null
 
-# Keybindings
+# # Keybindings
 bindkey -v # Vim Mode
 bindkey '^p' history-search-backward
 bindkey '^n' history-search-forward
 
-# # History
+# History
 HISTSIZE=10000
 HISTFILE=~/.zsh_history
 SAVEHIST=$HISTSIZE
@@ -67,49 +67,49 @@ setopt hist_ignore_all_dups
 setopt hist_save_no_dups
 setopt hist_ignore_dups
 setopt hist_find_no_dups
-
-# Aliases
-alias nvim='nvim.sh'
-alias cat='bat'
+# 
+# # Aliases
+# alias nvim='nvim.sh'
+# alias cat='bat'
 alias ls='eza'
 alias tree='eza --tree'
 alias c='clear'
 alias vim='nvim'
 alias gs='git status'
-alias python='python3.12'
-alias py='python'
-
-alias pbcopy='xclip -selection clipboard'
-alias pbpaste='xclip -selection clipboard -o'
-
-# Exports
-export COLORTERM=truecolor
-export EDITOR=nvim
-export PAGER=nvimpager
+# alias python='python3.12'
+# alias py='python'
+# 
+# alias pbcopy='xclip -selection clipboard'
+# alias pbpaste='xclip -selection clipboard -o'
+# 
+# # Exports
+# export COLORTERM=truecolor
+# export EDITOR=nvim
+# export PAGER=nvimpager
 export FZF_DEFAULT_OPTS=" \
     --color=bg+:#313244,bg:#1e1e2e,spinner:#f5e0dc,hl:#f38ba8 \
     --color=fg:#cdd6f4,header:#f38ba8,info:#cba6f7,pointer:#f5e0dc \
     --color=marker:#f5e0dc,fg+:#cdd6f4,prompt:#cba6f7,hl+:#f38ba8"
 
-export GOPATH="$HOME/go"
-export PATH="$GOPATH/bin:$PATH"
-export PATH="$HOME/scripts:$PATH"
-
-# pnpm
-export PNPM_HOME="/home/kyren/.local/share/pnpm"
-case ":$PATH:" in
-  *":$PNPM_HOME:"*) ;;
-  *) export PATH="$PNPM_HOME:$PATH" ;;
-esac
-# pnpm end
+# export GOPATH="$HOME/go"
+# export PATH="$GOPATH/bin:$PATH"
+# export PATH="$HOME/scripts:$PATH"
+# 
+# # pnpm
+# export PNPM_HOME="/home/kyren/.local/share/pnpm"
+# case ":$PATH:" in
+#   *":$PNPM_HOME:"*) ;;
+#   *) export PATH="$PNPM_HOME:$PATH" ;;
+# esac
+# # pnpm end
+# 
+# # Start ssh-agent if not running
+# eval $(keychain --quiet --eval --timeout 180 ~/.ssh/id_ed25519)
 
-# Start ssh-agent if not running
-eval $(keychain --quiet --eval --timeout 180 ~/.ssh/id_ed25519)
-
-# Open tmux if it's not open
-if [ -z "$TMUX" ]; then
-    tmux a || tmux
-fi
+# # Open tmux if it's not open
+# if [ -z "$TMUX" ]; then
+#     tmux a || tmux
+# fi
 
-END_TIME=$(date +%s.%3N)
-# echo "Zsh startup time: $(echo "${END_TIME} - ${START_TIME}" | bc) seconds"
+END_TIME=$(date +%s.%4N)
+echo "Zsh startup time: $(echo "${END_TIME} - ${START_TIME}" | bc) seconds"
diff --git a/nixos/hosts/default/configuration.nix b/nixos/hosts/default/configuration.nix
index f349b2c..e623c0a 100644
--- a/nixos/hosts/default/configuration.nix
+++ b/nixos/hosts/default/configuration.nix
@@ -74,6 +74,7 @@
     isNormalUser = true;
     description = "Kyren";
     extraGroups = [ "networkmanager" "wheel" ];
+    shell = pkgs.zsh;
     packages = with pkgs; [
       kdePackages.kate
     #  thunderbird
@@ -92,6 +93,9 @@
   # Install firefox.
   programs.firefox.enable = true;
 
+  programs.zsh.enable = true;
+  users.defaultUserShell = pkgs.zsh;
+
   # Allow unfree packages
   nixpkgs.config.allowUnfree = true;
 
diff --git a/nixos/hosts/default/home.nix b/nixos/hosts/default/home.nix
index 834752e..574012a 100644
--- a/nixos/hosts/default/home.nix
+++ b/nixos/hosts/default/home.nix
@@ -22,12 +22,22 @@
     discord
     git
     gh
+    delta
+    nh
+    stow
+    eza
+    oh-my-posh
+    neovim
+    fzf
+    zoxide
+    tmux
+    bc
 
     # # It is sometimes useful to fine-tune packages, for example, by applying
     # # overrides. You can do that directly here, just don't forget the
     # # parentheses. Maybe you want to install Nerd Fonts with a limited number of
     # # fonts?
-    # (pkgs.nerdfonts.override { fonts = [ "FantasqueSansMono" ]; })
+    (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
 
     # # You can also create simple shell scripts directly inside your
     # # configuration. For example, this adds a command 'my-hello' to your