From 4c4a8324ec5b410ed83abf9906d92b1ea5417dad Mon Sep 17 00:00:00 2001 From: Robby Zambito Date: Sun, 8 Mar 2026 17:58:11 -0400 Subject: add z, fzf, and replace docker with podman --- config/packages.scm | 4 +++- home.bashrc | 3 +++ home.scm | 3 ++- system.scm | 13 ++++++++----- 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/config/packages.scm b/config/packages.scm index b7992fd..c37242e 100644 --- a/config/packages.scm +++ b/config/packages.scm @@ -16,6 +16,7 @@ "ffmpeg" "file" "flatpak" + "fzf" "gcc-toolchain" "ghc-tldr" "git" @@ -40,7 +41,8 @@ "tree" "unzip" "zig" - "zip")) + "zip" + "zoxide")) ;; "emacs-cape" diff --git a/home.bashrc b/home.bashrc index 2306b39..1ab25a0 100644 --- a/home.bashrc +++ b/home.bashrc @@ -39,5 +39,8 @@ export PATH=/home/robby/go/bin:$PATH export PATH=/home/robby/.local/bin:/home/robby/.cargo/bin:/home/robby/.vnode/bin:$PATH source <(jj util completion bash) source <(nsc completion bash) +source $HOME/.config/user-dirs.dirs alias nats='LD_LIBRARY_PATH="/gnu/store/9p1z62lff9czkr95n3sal97rjw5lm7wl-gcc-toolchain-14.2.0/lib:$LD_LIBRARY_PATH" nats' + +eval "$(zoxide init bash)" diff --git a/home.scm b/home.scm index 6580a5e..7f49514 100644 --- a/home.scm +++ b/home.scm @@ -530,7 +530,8 @@ visit otherwise." "XDG_DOCUMENTS_DIR=\"$HOME/documents\"\n" "XDG_MUSIC_DIR=\"$HOME/music\"\n" "XDG_PICTURES_DIR=\"$HOME/pictures\"\n" - "XDG_VIDEOS_DIR=\"$HOME/videos\"\n")) + "XDG_VIDEOS_DIR=\"$HOME/videos\"\n" + "XDG_DATA_DIRS=\"/var/lib/flatpak/exports/share:$XDG_DATA_HOME/flatpak/exports/share:$XDG_DATA_DIRS\"\n")) (define log-dir (or (getenv "XDG_LOG_HOME") "/home/robby/.local/var/log")) diff --git a/system.scm b/system.scm index 968bbed..f18e432 100644 --- a/system.scm +++ b/system.scm @@ -14,10 +14,11 @@ (gnu system setuid)) (use-service-modules avahi + containers cups dbus desktop - docker + ;; docker linux ; for kernel-module-loader-service-type messaging networking @@ -111,13 +112,14 @@ "spice" "plugdev" "lp" - "docker"))) + ;; "docker" + ))) %base-user-accounts)) (packages (append (specifications->packages (list "amdgpu-firmware" "bluez" "bluez-alsa" "dbus" - "docker-compose" + ;; "docker-compose" "emacs" "ffmpeg" "gvfs" @@ -176,8 +178,9 @@ (cups-configuration (web-interface? #t))) (service dbus-root-service-type) - (service containerd-service-type) - (service docker-service-type) + ;; (service containerd-service-type) + ;; (service docker-service-type) + (service rootless-podman-service-type) (service elogind-service-type) ;; (service sddm-service-type ;; (sddm-configuration -- cgit