From dd466c291c44b4e1c914b4b73097095e8bcbcf38 Mon Sep 17 00:00:00 2001 From: Oliver Davies Date: Fri, 21 Nov 2025 16:40:47 +0000 Subject: [PATCH] Run fastfetch on both home servers for new shells --- .../hosts/homelab/home01/configuration.nix | 131 ++++++++-------- .../hosts/homelab/home02/configuration.nix | 147 ++++++++++-------- 2 files changed, 148 insertions(+), 130 deletions(-) diff --git a/modules/hosts/homelab/home01/configuration.nix b/modules/hosts/homelab/home01/configuration.nix index 5c97ce69..c181c41f 100644 --- a/modules/hosts/homelab/home01/configuration.nix +++ b/modules/hosts/homelab/home01/configuration.nix @@ -1,67 +1,76 @@ -{ inputs, ... }: +{ inputs, lib, ... }: { - flake.modules.nixos."nixosConfigurations/home01" = { - imports = with inputs.self.modules.nixos; [ - ]; - - nix.settings = { - auto-optimise-store = true; - - experimental-features = [ - "nix-command" - "flakes" + flake.modules.nixos."nixosConfigurations/home01" = + { pkgs, ... }: + { + imports = with inputs.self.modules.nixos; [ ]; - 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; - }; } diff --git a/modules/hosts/homelab/home02/configuration.nix b/modules/hosts/homelab/home02/configuration.nix index 72e1c213..5e7503dc 100644 --- a/modules/hosts/homelab/home02/configuration.nix +++ b/modules/hosts/homelab/home02/configuration.nix @@ -1,76 +1,85 @@ -{ inputs, ... }: +{ inputs, lib, ... }: { - flake.modules.nixos."nixosConfigurations/home02" = { - imports = with inputs.self.modules.nixos; [ - inputs.agenix.nixosModules.default + flake.modules.nixos."nixosConfigurations/home02" = + { pkgs, ... }: + { + imports = with inputs.self.modules.nixos; [ + inputs.agenix.nixosModules.default - nginx-oliverdavies-uk - nginx-ponthir-taekwondo - ]; - - nix.settings = { - auto-optimise-store = true; - - experimental-features = [ - "nix-command" - "flakes" + nginx-oliverdavies-uk + nginx-ponthir-taekwondo ]; - 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; - }; }