This commit is contained in:
albert 2024-04-29 12:28:40 +09:00
parent cfe8335e1e
commit c58c8db4c4
No known key found for this signature in database
GPG key ID: 64F6C4EB46C4543A
4 changed files with 28 additions and 22 deletions

View file

@ -1,30 +1,32 @@
{ inputs, lib, pkgs, hostname, stateVersion, username, desktop, system, ... }: { { inputs, lib, pkgs, hostname, stateVersion, username, desktop, system, ... }: {
imports = [ imports = [
# Modules # Modules
inputs.disko.nixosModules.disko inputs.disko.nixosModules.disko
# Services # Services
./common/services/openssh.nix ./common/services/openssh.nix
./common/services/promtail.nix ./common/services/promtail.nix
./common/services/fail2ban.nix ./common/services/fail2ban.nix
./common/services/telegraf.nix ./common/services/telegraf.nix
./common/services/tailscale.nix ./common/services/tailscale.nix
./common/services/gnupg-agent.nix ./common/services/gnupg-agent.nix
./common/services/opensnitch.nix ./common/services/opensnitch.nix
# Software # Software
./common/software/cli/weechat.nix ./common/software/cli/weechat.nix
./common/software/packages.nix ./common/software/packages.nix
# NixOS Modules # NixOS Modules
./common/modules/fonts.nix # Font Configs ./common/modules/fonts.nix # Font Configs
./common/modules/networking.nix # Initial Networking configs ./common/modules/networking.nix # Initial Networking configs
./common/modules/nixos.nix # NixOS related items ./common/modules/nixos.nix # NixOS related items
./common/modules/remote-builders.nix # Add remote builders ./common/modules/remote-builders.nix # Add remote builders
./users/${username} ./users/${username}
./hosts/${hostname} ./hosts/${hostname}
] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop}; ] ++ lib.optional (builtins.isString desktop) ./common/desktops/${desktop};
programs.fish.enable = true;
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";

View file

@ -46,6 +46,8 @@
fish fish
]; ];
programs.fish.enable = true;
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {

View file

@ -39,6 +39,8 @@
fish fish
]; ];
programs.fish.enable = true;
# Select internationalisation properties. # Select internationalisation properties.
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
i18n.extraLocaleSettings = { i18n.extraLocaleSettings = {

View file

@ -17,7 +17,7 @@ in {
++ ifExists [ "docker" ] ++ ifExists [ "docker" ]
++ ifExists [ "podman" ] ++ ifExists [ "podman" ]
++ ifExists [ "syncthing" ]; ++ ifExists [ "syncthing" ];
# shell = pkgs.fish; shell = pkgs.fish;
# mkpasswd -m sha-512 # mkpasswd -m sha-512
hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6"; hashedPassword = "$y$j9T$wKLsIWaA4Gf63RvjedwLJ0$EHKL6BBJV0CAxEKcHHjaBqW085KJ/MGvmbyWzmcWOy6";
packages = [ pkgs.home-manager ]; packages = [ pkgs.home-manager ];