This commit is contained in:
2026-01-04 20:09:46 +00:00
parent 0c6c138da5
commit ac004a0e8e
14 changed files with 205 additions and 213 deletions

View File

@@ -1,6 +1,6 @@
{
inputs,
pkgs,
inputs,
user,
hostname,
...
@@ -20,7 +20,6 @@
home-manager.users.${user} = {
imports = [
inputs.nixvim.homeModules.nixvim
../../profiles/atuin.nix
../../profiles/bash.nix
../../profiles/bat.nix
@@ -44,6 +43,7 @@
../../profiles/zk.nix
../../profiles/zoxide.nix
../../profiles/zsh.nix
inputs.nixvim.homeModules.nixvim
];
fonts.fontconfig.enable = true;
programs.git.settings.user.email = "christoph@tuist.dev";

View File

@@ -19,7 +19,6 @@
home-manager.users.${user} = {
imports = [
inputs.nixvim.homeModules.nixvim
../../profiles/atuin.nix
../../profiles/bash.nix
../../profiles/bat.nix
@@ -43,6 +42,7 @@
../../profiles/zk.nix
../../profiles/zoxide.nix
../../profiles/zsh.nix
inputs.nixvim.homeModules.nixvim
];
fonts.fontconfig.enable = true;
programs.git.settings.user.email = "christoph@schmatzler.com";

View File

@@ -1,9 +1,9 @@
{
modulesPath,
hostname,
inputs,
config,
inputs,
user,
hostname,
modulesPath,
...
}: {
imports = [
@@ -14,9 +14,9 @@
./secrets.nix
../../modules/gitea.nix
../../profiles/core.nix
../../profiles/openssh.nix
../../profiles/fail2ban.nix
../../profiles/nixos.nix
../../profiles/openssh.nix
../../profiles/tailscale.nix
inputs.disko.nixosModules.disko
inputs.sops-nix.nixosModules.sops
@@ -35,9 +35,10 @@
};
};
networking.hostName = hostname;
home-manager.users.${user} = {
imports = [
inputs.nixvim.homeModules.nixvim
../../profiles/bash.nix
../../profiles/bat.nix
../../profiles/direnv.nix
@@ -54,8 +55,7 @@
../../profiles/ssh.nix
../../profiles/starship.nix
../../profiles/zoxide.nix
inputs.nixvim.homeModules.nixvim
];
};
networking.hostName = hostname;
}

View File

@@ -1,22 +1,22 @@
{...}: {
sops.secrets.michael-gitea-litestream = {
sopsFile = ../../secrets/michael-gitea-litestream;
format = "binary";
owner = "gitea";
group = "gitea";
};
sops.secrets.michael-gitea-restic-password = {
sopsFile = ../../secrets/michael-gitea-restic-password;
format = "binary";
owner = "gitea";
group = "gitea";
};
sops.secrets.michael-gitea-restic-env = {
sopsFile = ../../secrets/michael-gitea-restic-env;
format = "binary";
owner = "gitea";
group = "gitea";
sops.secrets = {
michael-gitea-litestream = {
sopsFile = ../../secrets/michael-gitea-litestream;
format = "binary";
owner = "gitea";
group = "gitea";
};
michael-gitea-restic-password = {
sopsFile = ../../secrets/michael-gitea-restic-password;
format = "binary";
owner = "gitea";
group = "gitea";
};
michael-gitea-restic-env = {
sopsFile = ../../secrets/michael-gitea-restic-env;
format = "binary";
owner = "gitea";
group = "gitea";
};
};
}

View File

@@ -10,15 +10,16 @@
./paperless.nix
./secrets.nix
../../profiles/core.nix
../../profiles/openssh.nix
../../profiles/nixos.nix
../../profiles/openssh.nix
../../profiles/tailscale.nix
inputs.sops-nix.nixosModules.sops
];
networking.hostName = hostname;
home-manager.users.${user} = {
imports = [
inputs.nixvim.homeModules.nixvim
../../profiles/atuin.nix
../../profiles/bash.nix
../../profiles/bat.nix
@@ -41,6 +42,7 @@
../../profiles/zk.nix
../../profiles/zoxide.nix
../../profiles/zsh.nix
inputs.nixvim.homeModules.nixvim
];
programs.git.settings.user.email = "christoph@schmatzler.com";
@@ -54,6 +56,4 @@
size = 16 * 1024;
}
];
networking.hostName = hostname;
}

View File

@@ -1,10 +1,5 @@
{
config,
hostname,
...
}: {
{config, ...}: {
networking = {
hostName = hostname;
useDHCP = false;
interfaces.eno1.ipv4.addresses = [
{