Run fastfetch on both home servers for new shells
Some checks are pending
/ check (push) Waiting to run

This commit is contained in:
Oliver Davies 2025-11-21 16:40:47 +00:00
parent 19edb2b4c0
commit dd466c291c
2 changed files with 148 additions and 130 deletions

View file

@ -1,67 +1,76 @@
{ inputs, ... }: { inputs, lib, ... }:
{ {
flake.modules.nixos."nixosConfigurations/home01" = { flake.modules.nixos."nixosConfigurations/home01" =
imports = with inputs.self.modules.nixos; [ { pkgs, ... }:
]; {
imports = with inputs.self.modules.nixos; [
nix.settings = {
auto-optimise-store = true;
experimental-features = [
"nix-command"
"flakes"
]; ];
warn-dirty = false; nix.settings = {
auto-optimise-store = true;
experimental-features = [
"nix-command"
"flakes"
];
warn-dirty = false;
};
networking.hostName = "home01";
system.stateVersion = "25.05";
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = true;
networking.networkmanager.enable = true;
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_GB.UTF-8";
LC_IDENTIFICATION = "en_GB.UTF-8";
LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
services.xserver.xkb = {
layout = "gb";
variant = "";
};
console.keyMap = "uk";
users.users.opdavies = {
isNormalUser = true;
description = "Oliver Davies";
extraGroups = [
"networkmanager"
"wheel"
];
packages = [ ];
shell = pkgs.zsh;
};
nixpkgs.config.allowUnfree = true;
services.openssh.enable = true;
security.sudo.wheelNeedsPassword = false;
programs.zsh.enable = true;
programs.zsh.interactiveShellInit = ''
clear
${lib.getExe pkgs.fastfetch}
'';
}; };
networking.hostName = "home01";
system.stateVersion = "25.05";
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = true;
networking.networkmanager.enable = true;
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_GB.UTF-8";
LC_IDENTIFICATION = "en_GB.UTF-8";
LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
services.xserver.xkb = {
layout = "gb";
variant = "";
};
console.keyMap = "uk";
users.users.opdavies = {
isNormalUser = true;
description = "Oliver Davies";
extraGroups = [
"networkmanager"
"wheel"
];
packages = [ ];
};
nixpkgs.config.allowUnfree = true;
services.openssh.enable = true;
security.sudo.wheelNeedsPassword = false;
};
} }

View file

@ -1,76 +1,85 @@
{ inputs, ... }: { inputs, lib, ... }:
{ {
flake.modules.nixos."nixosConfigurations/home02" = { flake.modules.nixos."nixosConfigurations/home02" =
imports = with inputs.self.modules.nixos; [ { pkgs, ... }:
inputs.agenix.nixosModules.default {
imports = with inputs.self.modules.nixos; [
inputs.agenix.nixosModules.default
nginx-oliverdavies-uk nginx-oliverdavies-uk
nginx-ponthir-taekwondo nginx-ponthir-taekwondo
];
nix.settings = {
auto-optimise-store = true;
experimental-features = [
"nix-command"
"flakes"
]; ];
warn-dirty = false; nix.settings = {
auto-optimise-store = true;
experimental-features = [
"nix-command"
"flakes"
];
warn-dirty = false;
};
age.secrets = {
cloudflare.file = ../../../../secrets/cloudflare.age;
cloudflared.file = ../../../../secrets/cloudflared-credentials2.age;
};
networking.hostName = "home02";
system.stateVersion = "25.05";
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = true;
networking.networkmanager.enable = true;
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_GB.UTF-8";
LC_IDENTIFICATION = "en_GB.UTF-8";
LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
services.xserver.xkb = {
layout = "gb";
variant = "";
};
console.keyMap = "uk";
users.users.opdavies = {
isNormalUser = true;
description = "Oliver Davies";
extraGroups = [
"networkmanager"
"wheel"
];
packages = [ ];
shell= pkgs.zsh;
};
nixpkgs.config.allowUnfree = true;
services.openssh.enable = true;
security.sudo.wheelNeedsPassword = false;
programs.zsh.enable = true;
programs.zsh.interactiveShellInit = ''
clear
${lib.getExe pkgs.fastfetch}
'';
}; };
age.secrets = {
cloudflare.file = ../../../../secrets/cloudflare.age;
cloudflared.file = ../../../../secrets/cloudflared-credentials2.age;
};
networking.hostName = "home02";
system.stateVersion = "25.05";
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.systemd-boot.enable = true;
networking.networkmanager.enable = true;
time.timeZone = "Europe/London";
i18n.defaultLocale = "en_GB.UTF-8";
i18n.extraLocaleSettings = {
LC_ADDRESS = "en_GB.UTF-8";
LC_IDENTIFICATION = "en_GB.UTF-8";
LC_MEASUREMENT = "en_GB.UTF-8";
LC_MONETARY = "en_GB.UTF-8";
LC_NAME = "en_GB.UTF-8";
LC_NUMERIC = "en_GB.UTF-8";
LC_PAPER = "en_GB.UTF-8";
LC_TELEPHONE = "en_GB.UTF-8";
LC_TIME = "en_GB.UTF-8";
};
services.xserver.xkb = {
layout = "gb";
variant = "";
};
console.keyMap = "uk";
users.users.opdavies = {
isNormalUser = true;
description = "Oliver Davies";
extraGroups = [
"networkmanager"
"wheel"
];
packages = [ ];
};
nixpkgs.config.allowUnfree = true;
services.openssh.enable = true;
security.sudo.wheelNeedsPassword = false;
};
} }