diff options
Diffstat (limited to '')
-rwxr-xr-x | .bashrc | 24 | ||||
-rw-r--r-- | .config/gpg-agent.conf | 1 | ||||
-rw-r--r-- | .config/guix/channels.scm | 10 | ||||
-rwxr-xr-x | .profile | 13 | ||||
-rw-r--r-- | home-configuration.scm | 39 |
5 files changed, 74 insertions, 13 deletions
@@ -40,10 +40,26 @@ then . /usr/share/bash-completion/bash_completion fi -for f in "$HOME"/.local/share/bash-completion/* -do - . "$f" -done +if [ -f "$HOME/.guix-home/profile/share/bash-completion/bash_completion" ] +then + . "$HOME/.guix-home/profile/share/bash-completion/bash_completion" +fi + +if [ -d "$HOME/.local/share/bash-completion/" ] +then + for f in "$HOME"/.local/share/bash-completion/* + do + . "$f" + done +fi + +if [ -d "$HOME/.guix-home/profile/etc/bash-completion.d" ] +then + for f in "$HOME"/.guix-home/profile/etc/bash-completion.d/* + do + . "$f" + done +fi GPG_TTY="$(tty)" export GPG_TTY diff --git a/.config/gpg-agent.conf b/.config/gpg-agent.conf deleted file mode 100644 index f361780..0000000 --- a/.config/gpg-agent.conf +++ /dev/null @@ -1 +0,0 @@ -pinentry-program pinentry-curses diff --git a/.config/guix/channels.scm b/.config/guix/channels.scm new file mode 100644 index 0000000..0554922 --- /dev/null +++ b/.config/guix/channels.scm @@ -0,0 +1,10 @@ +(cons* (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + ;; Enable signature verification: + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + %default-channels) @@ -81,3 +81,16 @@ fi export PATH +if [ -d "$HOME/.guix-profile/etc/ssl/certs" ] +then + SSL_CERT_DIR="$HOME/.guix-profile/etc/ssl/certs" + SSL_CERT_FILE="$SSL_CERT_DIR/ca-certificates.crt" + CURL_CA_BUNDLE="$SSL_CERT_FILE" + GIT_SSL_CAINFO="$SSL_CERT_FILE" + + export SSL_CERT_DIR + export SSL_CERT_FILE + export GIT_SSL_CAINFO + export CURL_CA_BUNDLE +fi + diff --git a/home-configuration.scm b/home-configuration.scm index 82e77b2..1bb9267 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -3,8 +3,10 @@ ;; specifies package names. To reproduce the exact same profile, you also ;; need to capture the channels being used, as returned by "guix describe". ;; See the "Replicating Guix" section in the manual. -(use-modules (gnu home services shells) - (gnu home services) +(use-modules (gnu home services) + (gnu home services fontutils) + (gnu home services gnupg) + (gnu home services shells) (gnu home) (gnu packages admin) (gnu packages algebra) @@ -14,7 +16,10 @@ (gnu packages bittorrent) (gnu packages calendar) (gnu packages ccache) + (gnu packages certs) + (gnu packages chromium) (gnu packages cmake) + (gnu packages commencement) (gnu packages compression) (gnu packages compton) (gnu packages containers) @@ -25,9 +30,10 @@ (gnu packages fediverse) (gnu packages file) (gnu packages freedesktop) - (gnu packages gcc) (gnu packages gimp) (gnu packages gnome) + (gnu packages gnupg) + (gnu packages gnuzilla) (gnu packages golang) (gnu packages image) (gnu packages image-viewers) @@ -61,6 +67,7 @@ (gnu packages video) (gnu packages vim) (gnu packages virtualization) + (gnu packages vnc) (gnu packages w3m) (gnu packages web) (gnu packages wm) @@ -81,19 +88,21 @@ ;; Below is the list of packages that will show up in your ;; Home profile, under ~/.guix-home/profile. ;; Can't find - ;; chathistorysync chromium firefox k9s kubectl steam turnstile wayvnc + ;; firefox k9s kubectl steam turnstile ;; Won't build ;; avidemux ;; Unknown ;; which (packages (list adb bash + bash-completion bat bc binutils blueman bluez ccache + chathistorysync chrony clang cmake @@ -109,18 +118,19 @@ flatpak foot gajim - gajim-omemo gammastep - gcc + gcc-toolchain gimp git git-delta + glibc-locales go gparted greetd grim htop hut + icecat imagemagick imv jq @@ -133,17 +143,20 @@ neomutt neovim network-manager + network-manager-applet newsboat nmap + nss-certs + offlineimap3 obs passt password-store patchelf pavucontrol picom + pinentry pipewire podman - podman profanity python-virtualenv qemu @@ -157,7 +170,10 @@ swappy sway swayidle - swaylock + ;; Must be installed system-wide, as it relies on PAM/suid + ;; swaylock + swaysome + swayrbar swayr thunar tmux @@ -181,9 +197,11 @@ tree-sitter-rust tree-sitter-scheme tree-sitter-typescript + ungoogled-chromium unzip vim w3m + wayvnc weechat wl-clipboard wofi @@ -203,6 +221,11 @@ ;; TODO: Is it correct to use .profile as .bash_profile? (bash-profile (list (local-file ".profile" "profile"))) (bash-logout (list (local-file ".bash_logout" "bash_logout"))))) + (simple-service 'additional-fonts-service + home-fontconfig-service-type + (list "~/.local/share/fonts")) + (service home-gpg-agent-service-type + (home-gpg-agent-configuration (ssh-support? #t))) (service home-files-service-type ;; Go through all relevant files in this repo and add them as symlinks individually ;; This is not done using local-file's recurse option in particular because |