Changed files
| File | Changes | |
|---|---|---|
| users/ryan/linux.nix | +1 −1 | raw |
| users/ryan/linux/guix.nix | +27 −1 | raw |
Should be good, need to clean slop still
397af8b5b8bf…
· Ryan Schanzenbacher ·
@@ -1,4 +1,4 @@
-{ config, pkgs, lib, inputs, ... }:
+{ pkgs, lib, inputs, ... }:
{
imports = [
@@ -1,4 +1,4 @@
-{ pkgs, lib, inputs, ... }:
+{ config, pkgs, lib, inputs, ... }:
{
systemd.user.startServices = false;
@@ -10,6 +10,17 @@
"$HOME_ENVIRONMENT/on-first-login"
unset HOME_ENVIRONMENT
fi
+
+ # /etc/profile normally puts ~/.config/guix/current (the guix pull
+ # profile with our actual channels: nonguix, rosenthal, ...) ahead of
+ # /run/current-system/profile on PATH, but that only happens for bash
+ # login shells -- zsh never sources /etc/profile. Without this, `guix`
+ # resolves to the bare system profile's guix, which doesn't know about
+ # our channels.
+ if [ -d "$HOME/.config/guix/current" ]; then
+ export PATH="$HOME/.config/guix/current/bin:$PATH"
+ export INFOPATH="$HOME/.config/guix/current/share/info''${INFOPATH:+:}$INFOPATH"
+ fi
'';
dconf.enable = false;
@@ -20,6 +31,21 @@
programs.gpg.scdaemonSettings.disable-ccid = true;
+ # Guix needs a special fonts.conf file in the user env since it doesn't
+ # have one in /etc/fonts/fonts.conf from nixos
+ xdg.configFile."fontconfig-nix/fonts.conf".text = ''
+ <?xml version='1.0'?>
+ <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+ <fontconfig>
+ <include ignore_missing="yes">${pkgs.fontconfig.out}/etc/fonts/conf.d</include>
+ <include ignore_missing="yes">${config.home.homeDirectory}/.config/fontconfig/conf.d</include>
+ <dir>${config.home.homeDirectory}/.guix-home/profile/share/fonts</dir>
+ <cachedir>${config.home.homeDirectory}/.cache/fontconfig</cachedir>
+ </fontconfig>
+ '';
+
+ home.sessionVariables.FONTCONFIG_FILE = "${config.home.homeDirectory}/.config/fontconfig-nix/fonts.conf";
+
home.packages = [
(pkgs.writeScriptBin "hyprlock" ''
#! ${pkgs.bash}/bin/bash