Still doesn't work yet

This commit is contained in:
Hoang Nguyen 2024-03-03 00:00:00 +07:00
parent cecee86c85
commit e91b48f908
Signed by: folliehiyuki
GPG Key ID: B0567C20730E9B11
5 changed files with 15 additions and 8 deletions

View File

@ -63,11 +63,6 @@ in
createDirectories = true;
};
xdg.portal = {
enable = true;
xdgOpenUsePortal = true;
};
xdg.mimeApps.enable = true;
})

View File

@ -6,8 +6,14 @@ let
"packages.el" = { source = ./packages.el; };
"config.el" = {
text = builtins.replaceStrings
[ "@userEmail@" "@userFullName@" ]
[ "${config.programs.git.userEmail}" "${osConfig.users.users.${config.home.username}.description}" ]
[
"@userEmail@"
"@userFullName@"
]
[
"${if (config.programs.git.userEmail != null) then config.programs.git.userEmail else ""}"
"${osConfig.users.users.${config.home.username}.description}"
]
(builtins.readFile ./config.el);
};
};

View File

@ -1,5 +1,8 @@
{ osConfig, config, ... }: {
{ osConfig, config, lib, ... }: {
programs.git = {
# Placeholders, since other modules use it
signing.key = lib.mkDefaul null;
userName = "${osConfig.users.users.${config.home.username}.description}";
aliases = {
l = "log --all --graph --pretty=format:'%C(yellow)%h%Creset %C(bold)<%an>%Creset -%C(bold)%C(green)%d%Creset %C(blue)%s%Creset (%cr)'";

View File

@ -193,6 +193,7 @@
];
programs.dconf.enable = true;
programs.xwayland.enable = true;
xdg.portal.xdgOpenUsePortal = true;
# Sound
security.rtkit.enable = true;

View File

@ -22,6 +22,7 @@ lib.mkMerge [
users.users = {
follie = {
isNormalUser = true;
description = "Hoang Nguyen";
extraGroups = [ "wheel" "networkmanager" "libvirtd" ];
shell = pkgs.fish;
@ -31,6 +32,7 @@ lib.mkMerge [
gema = {
isNormalUser = true;
description = "The ordinary gamer";
extraGroups = [ "networkmanager" ];
shell = pkgs.zsh;