aboutsummaryrefslogtreecommitdiff
path: root/nixos
diff options
context:
space:
mode:
authorEuAndreh <eu@euandre.org>2019-05-17 22:51:41 -0300
committerEuAndreh <eu@euandre.org>2019-05-17 22:55:40 -0300
commit5e9efb6478e7ef38ee2fcf2921634db0c27f5d05 (patch)
tree460673dc44e8530a41ff5e5d7fd9b092a8274826 /nixos
parentRevert "Remove mentat from $SRHT_REPOS." (diff)
downloaddotfiles-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.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/configuration.nix64
1 files changed, 8 insertions, 56 deletions
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;
};
};