Update rofi, zellij layout, packages.el, changes for NixOS

config/.config/rofi/config.rasi

@@ -1,5 +1,5 @@
 configuration{
-    modi: "drun,filebrowser,window,Bookmarks:/home/jas/.config/rofi/rofi-json.sh /home/jas/Nextcloud/documents/bookmarks.json,Emoji:/usr/bin/rofimoji -a copy";
+    modi: "drun,filebrowser,window,Bookmarks:/home/jas/.config/rofi/rofi-json.sh /home/jas/Nextcloud/documents/bookmarks.json,Emoji:/home/jas/.nix-profile/bin/rofimoji -a copy";
     lines: 5;
     font: "JetBrainsMono Nerd Font Mono 14";
     show-icons: true;

config/.config/rofi/rofi-json.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 user_file="$(eval echo ${1})"
 
@@ -45,4 +45,4 @@ if [ $# -eq 2 ]; then
   coproc bash -c "$command"
   exit
 
-fi
+fi

doom/.doom.d/packages.el

@@ -25,6 +25,7 @@
 (package! justl)
 (package! go-complete)
 (package! nov)
+(package! nix-mode)
 
 ;; To install a package directly from a remote git repo, you must specify a
 ;; `:recipe'. You'll find documentation on what `:recipe' accepts here:

zsh/.zpath

@@ -3,10 +3,6 @@
 # already there.
 typeset -U PATH path
 
-# Add /usr/local dirs to PATH
-path=("/usr/local/bin" "/usr/local/sbin")
-path+=("/bin" "/sbin" "/usr/bin" "/usr/sbin")
-
 # Set Go path if it exists
 [ -d "${HOME}/go" ] && GOPATH="${HOME}/go" && path+=("${GOPATH}/bin")
 
@@ -19,6 +15,13 @@ path+=("/bin" "/sbin" "/usr/bin" "/usr/sbin")
 # Add ~/.local/bin to PATH
 [ -d "${HOME}/.local/bin" ] && path+=("${HOME}/.local/bin")
 
+# Add nixos paths
+path+=("/run/current-system/sw/bin")
+path+=("/run/current-system/sw/sbin")
+path+=("/home/jas/.nix-profile/bin")
+path+=("/home/jas/.nix-profile/sbin")
+path+=("/home/jas/.npm-global/bin")
+
 export PATH
 
 # Automatically remove duplicates from these arrays

zsh/.zshrc

@@ -144,9 +144,6 @@ HISTFILE=~/.zsh_history
 # for them.
 REPORTTIME=10
 
-# reply-to email address
-export REPLYTO="hyperreal@fedoraproject.org"
-
 # Language
 export LANG="en_US.UTF-8"
 
@@ -163,5 +160,3 @@ export BAT_THEME="Catppuccin-mocha"
 # Automatically remove duplicates from these arrays
 typeset -gU path cdpath manpath fpath
 
-# ChatGPT/OpenAI
-export OPENAI_API_KEY=$(pass show openai_api_key)

zsh/.zshrc.d/functions.zsh

@@ -1,3 +1,10 @@
+# Commit, lock, and nixos-rebuild
+function flake-rebuild() {
+    sudo git -C /etc/nixos commit -asm "$1" ;
+    sudo nix flake update --commit-lock-file "git+file:///etc/nixos" --extra-experimental-features nix-command --extra-experimental-features flakes ;
+    sudo nixos-rebuild --flake /etc/nixos/#moonshadow switch
+}
+
 # Create a bookmark.
 function mark() {