move stuff into common config

This commit is contained in:
uku 2024-02-14 15:59:20 +01:00
parent 1c50282114
commit 71312d55b9
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
5 changed files with 34 additions and 61 deletions

View file

@ -37,8 +37,6 @@
catppuccin.nixosModules.catppuccin
]
++ nixos;
server = nixos ++ [../configs/server.nix];
in {
flake.nixosConfigurations = mapNixOS {
fuji = {
@ -63,7 +61,7 @@ in {
etna = {
system = "x86_64-linux";
modules =
server
nixos
++ (with inputs; [
api-rs.nixosModules.default
ukubot-rs.nixosModules.default

View file

@ -27,6 +27,8 @@
reposilite.enable = true;
tailscale.extraUpFlags = ["--advertise-exit-node"];
vaultwarden = {
enable = true;
config = {

View file

@ -1,30 +1,6 @@
{
lib,
pkgs,
config,
...
}: let
username = "leo";
in {
imports = [
(lib.mkAliasOptionModule ["hm"] ["home-manager" "users" username])
../../programs/fish.nix
../../programs/git.nix
../../programs/starship
];
hm.home.stateVersion = "23.11";
wsl = {
enable = true;
defaultUser = username;
};
users.users."${username}" = {
isNormalUser = true;
shell = pkgs.fish;
extraGroups = ["wheel"];
hashedPasswordFile = config.age.secrets.userPassword.path;
defaultUser = "leo";
};
}