diff options
author | EuAndreh <eu@euandre.org> | 2019-05-17 22:51:41 -0300 |
---|---|---|
committer | EuAndreh <eu@euandre.org> | 2019-05-17 22:55:40 -0300 |
commit | 5e9efb6478e7ef38ee2fcf2921634db0c27f5d05 (patch) | |
tree | 460673dc44e8530a41ff5e5d7fd9b092a8274826 | |
parent | Revert "Remove mentat from $SRHT_REPOS." (diff) | |
download | dotfiles-5e9efb6478e7ef38ee2fcf2921634db0c27f5d05.tar.gz dotfiles-5e9efb6478e7ef38ee2fcf2921634db0c27f5d05.tar.xz |
Remove Guix compatibility code.
Remove:
- systemd definition;
- guixbuilder users;
- guixbuild groud;
- guix binary symlink;
- mr repository configurations;
- gc.sh instructions;
- Emacs configuration;
- environment variables.
-rw-r--r-- | bash/env.sh | 15 | ||||
-rw-r--r-- | git/mrconfig.ini | bin | 10931 -> 9635 bytes | |||
-rw-r--r-- | nixos/configuration.nix | 64 | ||||
-rwxr-xr-x | scripts/gc.sh | 5 | ||||
l--------- | scripts/guix | 1 | ||||
-rw-r--r-- | spacemacs.el | 4 |
6 files changed, 8 insertions, 81 deletions
diff --git a/bash/env.sh b/bash/env.sh index fd15a0f..e18f2e7 100644 --- a/bash/env.sh +++ b/bash/env.sh @@ -66,21 +66,6 @@ isLinux && { # -# Guix -# - -# export GUIX_PROFILE="$HOME/.guix-profile/etc/profile" -# isLinux && { -# source "$GUIX_PROFILE" -# } -export PATH="$HOME/.guix-profile/bin${PATH:+:}$PATH" -export PATH="$HOME/.config/guix/current/bin${PATH:+:}$PATH" -export GUIX_LOCPATH="$HOME/.guix-profile/lib/locale" # after running guix package -i glibc-utf8-locales -# https://git.savannah.gnu.org/cgit/guix.git/tree/doc/guix.texi?id=cd6ae1cee95644b9aa712a7192bc9677a04c146b#n1287 -export NIX_BUILD_CORES=0 - - -# # Go # diff --git a/git/mrconfig.ini b/git/mrconfig.ini Binary files differindex 141417f..744b1bb 100644 --- a/git/mrconfig.ini +++ b/git/mrconfig.ini diff --git a/nixos/configuration.nix b/nixos/configuration.nix index a7a3006..036a3da 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -424,62 +424,14 @@ in users = { mutableUsers = false; - extraUsers = - let - andrehUser = { - andreh = { - isNormalUser = true; - uid = 1000; - description = "EuAndreh"; - extraGroups = [ "wheel" "networkmanager" "docker" ]; - # Generated with: - # mkpasswd -m sha-512 > password-file.txt - passwordFile = localConfiguration.passwordFile; - }; - }; - # From the Guix manual: - # https://www.gnu.org/software/guix/manual/en/html_node/Build-Environment-Setup.html#Build-Environment-Setup - buildUser = (i: - { - "guixbuilder${i}" = { # guixbuilder$i - group = "guixbuild"; # -g guixbuild - extraGroups = ["guixbuild"]; # -G guixbuild - home = "/var/empty"; # -d /var/empty - shell = pkgs.nologin; # -s `which nologin` - description = "Guix build user ${i}"; # -c "Guix buid user $i" - isSystemUser = true; # --system - }; - } - ); - in - # merge all users - pkgs.lib.fold (str: acc: acc // buildUser str) - andrehUser - # for i in `seq -w 1 10` - (map (pkgs.lib.fixedWidthNumber 2) (builtins.genList (n: n+1) 10)); - - extraGroups.guixbuild = { - name = "guixbuild"; - }; - }; - - systemd = { - services = { - # Derived from Guix guix-daemon.service.in - # https://git.savannah.gnu.org/cgit/guix.git/tree/etc/guix-daemon.service.in?id=00c86a888488b16ce30634d3a3a9d871ed6734a2 - guix-daemon = { - enable = false; - description = "Build daemon for GNU Guix"; - serviceConfig = { - ExecStart = "/var/guix/profiles/per-user/root/guix-profile/bin/guix-daemon --build-users-group=guixbuild"; - Environment="GUIX_LOCPATH=/root/.guix-profile/lib/locale"; - RemainAfterExit="yes"; - StandardOutput="syslog"; - StandardError="syslog"; - TaskMax= "8192"; - }; - wantedBy = [ "multi-user.target" ]; - }; + extraUsers.andreh = { + isNormalUser = true; + uid = 1000; + description = "EuAndreh"; + extraGroups = [ "wheel" "networkmanager" "docker" ]; + # Generated with: + # mkpasswd -m sha-512 > password-file.txt + passwordFile = localConfiguration.passwordFile; }; }; diff --git a/scripts/gc.sh b/scripts/gc.sh index c93c948..e094476 100755 --- a/scripts/gc.sh +++ b/scripts/gc.sh @@ -21,11 +21,6 @@ nix-store --gc nix-collect-garbage -d -yellow "Cleaning up Guix store" - -guix gc - - yellow "Cleaning up up the Trash and /tmp folders" sudo rm -rf ~/.local/share/Trash/files/* diff --git a/scripts/guix b/scripts/guix deleted file mode 120000 index 96901ae..0000000 --- a/scripts/guix +++ /dev/null @@ -1 +0,0 @@ -/var/guix/profiles/per-user/root/guix-profile/bin/guix
\ No newline at end of file diff --git a/spacemacs.el b/spacemacs.el index a115c8a..bc21ca5 100644 --- a/spacemacs.el +++ b/spacemacs.el @@ -760,10 +760,6 @@ This is the place where most of your configurations should be done. Unless it is filename commit start))) - - ;; (require 'geiser-guile) - ;; (with-eval-after-load 'geiser-guile - ;; (add-to-list 'geiser-guile-load-path "~/dev/guix/guix")) t) (defun dotspacemacs/emacs-custom-settings () |