Changeset dc74d32 in dotfiles

Timestamp:

Jul 3, 2022, 8:18:15 PM (2 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

4526283

Parents:

c53d99e

git-author:

Mikhail Kirillov <w96k@…> (07/03/22 20:17:20)

git-committer:

Mikhail Kirillov <w96k@…> (07/03/22 20:18:15)

Message:

Update guix config

Location:

guix

Files:

• .bash_profile (modified) (4 diffs)
• .bashrc (modified) (1 diff)
• .guix-packages/docker.scm (modified) (1 diff)
• config.scm (modified) (2 diffs)
• etc/guix/machines.scm (modified) (1 diff)

guix/.bash_profile

@@ -1 @@
-GUIX_PROFILE="/home/w96k/.guix-profile"
-     . "$GUIX_PROFILE/etc/profile"
-source "$HOME/.config/guix/current/etc/profile"
-
-#export GUIX_PACKAGE_PATH=$HOME/projects/dotfiles/guix-channel/non-gnu/packages/
-export GUIX_PACKAGE_PATH=$HOME/.guix-packages/
-
-export PATH=$HOME/.config/guix/current/bin:$PATH:$HOME/.bin:~/.local/bin:/bin
+export PATH=$PATH:$HOME/.bin:~/.local/bin:/bin:$HOME/.nix-profile/bin
 #:$HOME/.nix-profile/bin
 
@@ -12 +5 @@
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/.guix-profile/lib/
 
-export XENVIRONMENT="${HOME}/.Xresources"
+export XENVIRONMENT=$HOME/.Xresources
 
 export MOZ_X11_EGL=1
@@ -20 +13 @@
 alias firefox='x11docker -c -I --share $HOME/Downloads -- --tmpfs /dev/shm -- jess/firefox'
 
+export LIBVA_DRIVER_NAME=i965
+export MOZ_X11_EGL=1
+
 GUIX_EXTRA_PROFILES=$HOME/.guix-extra-profiles
+
 for i in $GUIX_EXTRA_PROFILES/*; do
     profile=$i/$(basename "$i")
@@ -30 +27 @@
 done
 
+export PHPENV_ROOT="/home/w96k/.phpenv"
+if [ -d "${PHPENV_ROOT}" ]; then
+  export PATH="${PHPENV_ROOT}/bin:${PATH}"
+  eval "$(phpenv init -)"
+fi
+
 # Honor per-interactive-shell startup file
 # if [ -f ~/.bashrc ]; then . ~/.bashrc; fi

guix/.bashrc

@@ -3 +3 @@
 # Source the system-wide file.
 source /etc/bashrc    
-
 
 # Adjust the prompt depending on whether we're in 'guix environment'.

guix/.guix-packages/docker.scm

@@ -1 @@
-(define-module (docker)
-  #:use-module (guix packages)
-  #:use-module (guix utils)
-  #:use-module (gnu packages docker)
-  #:use-module (gnu packages python))
+;; (define-module (docker)
+;;   #:use-module (guix packages)
+;;   #:use-module (guix utils)
+;;   #:use-module (gnu packages docker)
+;;   #:use-module (gnu packages python))
 
-(define-public my-docker-compose
-  (package
-   (inherit docker-compose)
-   (name "docker-compose")
-   (version "1.29.2")
-   (arguments
-    '(#:tests? #f
-      #:phases
-      (modify-phases %standard-phases
-                     (delete 'sanity-check))))))
+;; (define-public my-docker-compose
+;;   (package
+;;    (inherit docker-compose)
+;;    (name "docker-compose")
+;;    (version "1.29.2")
+;;    (arguments
+;;     '(#:tests? #f
+;;       #:phases
+;;       (modify-phases %standard-phases
+;;                   (delete 'sanity-check))))))

guix/config.scm

@@ -118 +118 @@
    '("grp:shifts_toggle"
      "caps:ctrl_modifier")))
- (kernel linux-libre-5.15)
+ (kernel linux-libre-5.18)
  (kernel-loadable-modules '())
  (kernel-arguments
@@ -213 +213 @@
             (tor-configuration
              (config-file (plain-file "tor-config"
-                                      "HTTPTunnelPort 127.0.0.1:9250"))))
+                                      "HTTPTunnelPort 127.0.0.1:9250")))
+            )
 
    ;;Wacom tablet support

guix/etc/guix/machines.scm

@@ -2 +2 @@
        (name "Yunohost")
        (systems (list "x86_64-linux" "i686-linux"))
-       (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHeon4e9iK9HWicDp2lwoBmbTXQPB4dofNaBubGflhJN")
+       (host-key "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHeon4e9iK9HWicDp2lwoBmbTXQPB4dofNaBubGflhJN root@yunohost")
        (user "root")
        (private-key