From 8a82e99355509ce05f878f360af93eabf53a15d2 Mon Sep 17 00:00:00 2001 From: Adrien Bourmault Date: Tue, 10 Jan 2023 20:42:10 +0100 Subject: [PATCH] Retour du channels.scm --- .bash_profile | 9 +++++++++ .bashrc | 35 +++++++++++++++++++++++++++++++++++ channels.scm | 9 +++++++++ home-configuration.scm | 17 ++++++++++------- 4 files changed, 63 insertions(+), 7 deletions(-) create mode 100644 channels.scm diff --git a/.bash_profile b/.bash_profile index cfd2034..f2fd72d 100755 --- a/.bash_profile +++ b/.bash_profile @@ -3,6 +3,14 @@ # Set up the home environment profile. if [ -f ~/.profile ]; then source ~/.profile; fi +# Honor per-interactive-shell startup file +if [ -f ~/.bashrc ]; then source ~/.bashrc; fi +PS1='\u@\h \w${GUIX_ENVIRONMENT:+ [env]}\$ ' +# Set up the system, user profile, and related variables. +# /etc/profile will be sourced by bash automatically +# Set up the home environment profile. +if [ -f ~/.profile ]; then source ~/.profile; fi + # Honor per-interactive-shell startup file if [ -f ~/.bashrc ]; then source ~/.bashrc; fi PS1='\u@\h \w${GUIX_ENVIRONMENT:+ [env]}\$ ' @@ -10,3 +18,4 @@ PS1='\u@\h \w${GUIX_ENVIRONMENT:+ [env]}\$ ' if [ -f ~/.bashrc ]; then . ~/.bashrc; fi + diff --git a/.bashrc b/.bashrc index c3ec5f4..2650c76 100755 --- a/.bashrc +++ b/.bashrc @@ -1,3 +1,37 @@ +alias clear="printf "\033c"" +alias dir="dir --color=auto" +alias egrep="egrep --color=auto" +alias fgrep="fgrep --color=auto" +alias grep="grep --color=auto" +alias l="ls -CF" +alias la="ls -A" +alias ll="ls -l" +alias ls="ls -p --color=auto" +alias vdir="vdir --color=auto" +# Bash initialization for interactive non-login shells and +# for remote shells (info "(bash) Bash Startup Files"). + +# Export 'SHELL' to child processes. Programs such as 'screen' +# honor it and otherwise use /bin/sh. +export SHELL + +if [[ $- != *i* ]] +then + # We are being invoked from a non-interactive shell. If this + # is an SSH session (as in "ssh host command"), source + # /etc/profile so we get PATH and other essential variables. + [[ -n "$SSH_CLIENT" ]] && source /etc/profile + + # Don't do anything else. + return +fi + +# Source the system-wide file. +[ -f /etc/bashrc ] && source /etc/bashrc + +alias ls='ls -p --color=auto' +alias ll='ls -l' +alias grep='grep --color=auto' # Bash initialization for interactive non-login shells and # for remote shells (info "(bash) Bash Startup Files"). @@ -88,3 +122,4 @@ if [ ! -d /srv/neox ]; then fi + diff --git a/channels.scm b/channels.scm new file mode 100644 index 0000000..6265bae --- /dev/null +++ b/channels.scm @@ -0,0 +1,9 @@ +(cons* (channel + (name 'nonguix) + (url "https://gitlab.com/nonguix/nonguix") + (introduction + (make-channel-introduction + "897c1a470da759236cc11798f4e0a5f7d4d59fbc" + (openpgp-fingerprint + "2A39 3FFF 68F4 EF7A 3D29 12AF 6F51 20A0 22FB B2D5")))) + %default-channels) diff --git a/home-configuration.scm b/home-configuration.scm index 20d47f3..e1988ad 100644 --- a/home-configuration.scm +++ b/home-configuration.scm @@ -13,10 +13,18 @@ (home-environment ;; Ci-dessous se trouve la liste des paquets qui seront disponibles dans votre ;; profil personnel, dans ~/.guix-home/profile. - (packages (specifications->packages (list "testdisk" + (packages (specifications->packages (list "python-distro" + "hplip" + "gimp" + "sameboy" + "transmission" + "gnome-tweaks" + "gnome-builder" + "gtk" + "0ad" + "testdisk" "gajim" "virt-viewer" - "cups" "kdenlive" "grub" "parted" @@ -26,19 +34,14 @@ "glfw" "glew" "hexchat" - "transmission" - "gnome-tweaks" "xdg-desktop-portal" - "gnome-builder" "dino" - "gtk" "r-openssl" "vlc" "linux-libre-headers" "libxml2" "yt-dlp" "musescore" - "0ad" "libreoffice" "qbittorrent" "xournalpp"