diff options
| -rw-r--r-- | config/guix/channels.scm | 17 | ||||
| -rwxr-xr-x | install | 2 | ||||
| -rw-r--r-- | profile | 8 |
3 files changed, 17 insertions, 10 deletions
diff --git a/config/guix/channels.scm b/config/guix/channels.scm index a56d8b6..6340814 100644 --- a/config/guix/channels.scm +++ b/config/guix/channels.scm @@ -1,10 +1,17 @@ (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")))) + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + (channel + (name 'elektroline) + (url "https://gitlab.com/elektroline-predator/guix-channel.git") + (introduction + (make-channel-introduction + "3fd9ac5fc2fb5b2c77b0fee16163beee419ae353" + (openpgp-fingerprint + "981B 17E8 E82C 8C25 4319 3517 DCEF 0A0E 5D03 79F3")))) %default-channels) @@ -43,7 +43,7 @@ if hascmd guix && ask "guix" "Install Guix configuration"; then inst guile ~/.guile inst config/guix/channels.scm ~/.config/guix/channels.scm guix_install \ - guix guile guile-colorized guile-readline guile-lsp-server + guile-colorized guile-readline guile-lsp-server fi if ask "cliutils" "Install configurations for various CLI utility tools"; then @@ -20,10 +20,10 @@ for profile in "$HOME"/.nix-profile/etc/profile.d/*; do done # Guix -export GUIX_PROFILE="/home/cynerd/.guix-profile" -if [[ -d "$GUIX_PROFILE" ]]; then - source "$GUIX_PROFILE/etc/profile" -fi +GUIX_PROFILE="$HOME/.config/guix/current" +! [[ -d "$GUIX_PROFILE" ]] || source "$GUIX_PROFILE/etc/profile" +GUIX_PROFILE="$HOME/.guix-profile" +! [[ -d "$GUIX_PROFILE" ]] || source "$GUIX_PROFILE/etc/profile" # Rest of the profile run only if login is from linux console [[ "$(tty)" != /dev/tty* ]] && return |