diff --git a/hosts/servers/alexandria.nix b/hosts/servers/alexandria.nix index 2ed7fcc..34b2fc5 100644 --- a/hosts/servers/alexandria.nix +++ b/hosts/servers/alexandria.nix @@ -10,8 +10,6 @@ ./alexandria ]; - users.users.user.extraGroups = [ "docker" ]; - nix.nixPath = [ "nixos-config=${./alexandria.nix}" ]; swapDevices = [ { device = "/swapfile"; size = 8192; } ]; diff --git a/hosts/servers/alexandria/default.nix b/hosts/servers/alexandria/default.nix index 7930ab3..efa1868 100644 --- a/hosts/servers/alexandria/default.nix +++ b/hosts/servers/alexandria/default.nix @@ -5,6 +5,7 @@ ./hardware-configuration.nix ./hosted-services.nix ./security.nix + ./system.nix ./users.nix ]; } diff --git a/hosts/servers/alexandria/system.nix b/hosts/servers/alexandria/system.nix new file mode 100644 index 0000000..a9b7a5b --- /dev/null +++ b/hosts/servers/alexandria/system.nix @@ -0,0 +1,9 @@ +{ inputs, config, pkgs, libs, ... }: + +{ + system.activationScripts.shiori.text = '' + mkdir -p /data/shiori + chown shiori:hosted /data/shiori + ln -sfn /var/lib/shiori/* /data/shiori/ + ''; +} diff --git a/hosts/servers/alexandria/users.nix b/hosts/servers/alexandria/users.nix index a8b746d..971d114 100644 --- a/hosts/servers/alexandria/users.nix +++ b/hosts/servers/alexandria/users.nix @@ -2,7 +2,10 @@ { users = { - users.nginx.extraGroups = [ "acme" ]; + users = { + nginx.extraGroups = [ "acme" ]; + user.extraGroups = [ "docker" ]; + }; groups = { hosted = { gid = 1005; diff --git a/users/common/programs.nix b/users/common/programs.nix index 0994885..c852403 100644 --- a/users/common/programs.nix +++ b/users/common/programs.nix @@ -40,6 +40,7 @@ set -g theme_avoid_ambiguous_glyphs yes set -g theme_color_scheme dark set -g theme_nerd_fonts yes + set -g theme_title_display_user yes set -g theme_display_git_default_branch yes set -g -x FONTCONFIG_FILE ${pkgs.fontconfig.out}/etc/fonts/fonts.conf '';