forked from javif89/nix
replaced instances of javi with blaine
This commit is contained in:
parent
065a363242
commit
b6737fcb9a
@ -109,9 +109,9 @@
|
||||
};
|
||||
};
|
||||
|
||||
users.users.javi = {
|
||||
users.users.blaine = {
|
||||
isNormalUser = true;
|
||||
description = "javi";
|
||||
description = "blaine";
|
||||
shell = pkgs.zsh;
|
||||
useDefaultShell = true;
|
||||
extraGroups = [
|
||||
@ -124,7 +124,7 @@
|
||||
stateVersion = "25.05"; # Did you read the comment?
|
||||
activationScripts.avatar = ''
|
||||
mkdir -p /var/lib/AccountsService/icons
|
||||
ln -sf /etc/avatars/javi.png /var/lib/AccountsService/icons/javi
|
||||
ln -sf /etc/avatars/javi.png /var/lib/AccountsService/icons/blaine
|
||||
'';
|
||||
};
|
||||
|
||||
@ -169,7 +169,7 @@
|
||||
stylix = {
|
||||
enable = true;
|
||||
base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark.yaml";
|
||||
# image = "/home/javi/Documents/wallpapers/Fantasy-Mountain.png";
|
||||
# image = "/home/blaine/Documents/wallpapers/Fantasy-Mountain.png";
|
||||
polarity = "dark";
|
||||
};
|
||||
|
||||
@ -180,7 +180,7 @@
|
||||
assets = assets;
|
||||
};
|
||||
users = {
|
||||
"javi" = {
|
||||
"blaine" = {
|
||||
imports = [
|
||||
../modules/home/home.nix
|
||||
];
|
||||
|
@ -28,8 +28,8 @@
|
||||
# };
|
||||
|
||||
home = {
|
||||
username = "javi";
|
||||
homeDirectory = "/home/javi";
|
||||
username = "blaine";
|
||||
homeDirectory = "/home/blaine";
|
||||
stateVersion = "25.05"; # Home manager version. Do not update carelessly
|
||||
packages = with pkgs; [
|
||||
# Basics
|
||||
|
@ -18,11 +18,11 @@
|
||||
ipc = "on";
|
||||
splash = false;
|
||||
preload = [
|
||||
"/home/javi/.config/wallpaper.png"
|
||||
"/home/blaine/.config/wallpaper.png"
|
||||
];
|
||||
|
||||
wallpaper = [
|
||||
", /home/javi/.config/wallpaper.png"
|
||||
", /home/blaine/.config/wallpaper.png"
|
||||
];
|
||||
};
|
||||
};
|
||||
|
@ -23,7 +23,7 @@
|
||||
};
|
||||
};
|
||||
|
||||
users.users.javi.extraGroups = [
|
||||
users.users.blaine.extraGroups = [
|
||||
"input"
|
||||
"plugdev"
|
||||
];
|
||||
|
@ -6,7 +6,7 @@
|
||||
...
|
||||
}:
|
||||
let
|
||||
basePath = "/home/javi/Documents/wallpapers";
|
||||
basePath = "/home/blaine/Documents/wallpapers";
|
||||
wallpaper = "Fantasy-Mountain.png";
|
||||
in
|
||||
{
|
||||
|
@ -6,7 +6,7 @@ let
|
||||
shares = [
|
||||
"backups"
|
||||
"container-data"
|
||||
"javi"
|
||||
"blaine"
|
||||
];
|
||||
|
||||
configureShare = share: {
|
||||
|
@ -49,10 +49,10 @@ in
|
||||
# Enable PHP-FPM
|
||||
phpfpm = {
|
||||
pools.www = {
|
||||
user = "javi";
|
||||
user = "blaine";
|
||||
group = "users";
|
||||
settings = {
|
||||
"listen.owner" = "javi";
|
||||
"listen.owner" = "blaine";
|
||||
"listen.group" = "users";
|
||||
"listen.mode" = "0660";
|
||||
"pm" = "dynamic";
|
||||
@ -83,7 +83,7 @@ in
|
||||
|
||||
# Wildcard for other .test domains
|
||||
http://*.test {
|
||||
root * /home/javi/projects/{labels.1}/public
|
||||
root * /home/blaine/projects/{labels.1}/public
|
||||
php_server
|
||||
}
|
||||
'';
|
||||
@ -125,12 +125,12 @@ in
|
||||
|
||||
# Create a dedicated caddy config directory
|
||||
systemd.tmpfiles.rules = [
|
||||
"d /var/lib/caddy 0755 javi users -"
|
||||
"d /var/lib/caddy 0755 blaine users -"
|
||||
];
|
||||
|
||||
systemd.services.caddy = {
|
||||
serviceConfig = {
|
||||
User = lib.mkForce "javi";
|
||||
User = lib.mkForce "blaine";
|
||||
Group = lib.mkForce "users";
|
||||
# More comprehensive capabilities
|
||||
AmbientCapabilities = [
|
||||
@ -151,7 +151,7 @@ in
|
||||
};
|
||||
|
||||
# And make sure your user is in the caddy group
|
||||
users.users.javi = {
|
||||
users.users.blaine = {
|
||||
extraGroups = [
|
||||
"users"
|
||||
];
|
||||
|
Loading…
x
Reference in New Issue
Block a user